iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small code improvements and fixes

This commit is contained in:
dedene 2018-11-26 09:10:17 +01:00
parent 0f3bfbf8e6
commit 6589bfaaab
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builder/hcloud/step_create_server.go
View File

@ -67,14 +67,14 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu
// Store the server id for later // Store the server id for later
state.Put("server_id", serverCreateResult.Server.ID) state.Put("server_id", serverCreateResult.Server.ID)
if err := waitForServerAction(context.TODO(), client, serverCreateResult.Action, serverCreateResult.Server); err != nil { if err := waitForAction(context.TODO(), client, serverCreateResult.Action); err != nil {
err := fmt.Errorf("Error creating server: %s", err) err := fmt.Errorf("Error creating server: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt
} }
for _, nextAction := range serverCreateResult.NextActions { for _, nextAction := range serverCreateResult.NextActions {
if err := waitForServerAction(context.TODO(), client, nextAction, serverCreateResult.Server); err != nil { if err := waitForAction(context.TODO(), client, nextAction); err != nil {
err := fmt.Errorf("Error creating server: %s", err) err := fmt.Errorf("Error creating server: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
@ -83,7 +83,7 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu
} }
if c.RescueMode != "" { if c.RescueMode != "" {
if err := setRescue(ctx, client, serverCreateResult.Server, c.RescueMode, sshKeys); err != nil { if err := setRescue(context.TODO(), client, serverCreateResult.Server, c.RescueMode, sshKeys); err != nil {
err := fmt.Errorf("Error enabling rescue mode: %s", err) err := fmt.Errorf("Error enabling rescue mode: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
@ -120,7 +120,7 @@ func setRescue(ctx context.Context, client *hcloud.Client, server *hcloud.Server
if err != nil { if err != nil {
return err return err
} }
if err := waitForServerAction(ctx, client, action, server); err != nil { if err := waitForAction(ctx, client, action); err != nil {
return err return err
} }
} }
@ -133,23 +133,23 @@ func setRescue(ctx context.Context, client *hcloud.Client, server *hcloud.Server
if err != nil { if err != nil {
return err return err
} }
if err := waitForServerAction(ctx, client, res.Action, server); err != nil { if err := waitForAction(ctx, client, res.Action); err != nil {
return err return err
} }
} }
if rescueChanged { if rescueChanged {
action, _, err := client.Server.Reset(ctx, server) action, _, err := client.Server.Reboot(ctx, server)
if err != nil { if err != nil {
return err return err
} }
if err := waitForServerAction(ctx, client, action, server); err != nil { if err := waitForAction(ctx, client, action); err != nil {
return err return err
} }
} }
return nil return nil
} }
func waitForServerAction(ctx context.Context, client *hcloud.Client, action *hcloud.Action, server *hcloud.Server) error { func waitForAction(ctx context.Context, client *hcloud.Client, action *hcloud.Action) error {
_, errCh := client.Action.WatchProgress(ctx, action) _, errCh := client.Action.WatchProgress(ctx, action)
if err := <-errCh; err != nil { if err := <-errCh; err != nil {
return err return err