Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions builder/ibmcloud/vpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ func (client IBMCloudClient) isResourceReady(resourceID string, resourceType str
instance, _, err := vpcService.GetInstance(options)
if err != nil {
err := fmt.Errorf("[ERROR] Error occurred while getting instance information. Error: %s", err)
return false, fmt.Errorf(err.Error())
return false, err
}
status := *instance.Status
if status == "failed" {
err := fmt.Errorf("[ERROR] Instance return with failed status. Status Reason - %s: %s", status, *instance.StatusReasons[0].Message)
return false, fmt.Errorf(err.Error())
return false, err
}
ready = status == "running"
return ready, err
Expand All @@ -111,7 +111,7 @@ func (client IBMCloudClient) isResourceReady(resourceID string, resourceType str
floatingIP, _, err := vpcService.GetFloatingIP(options)
if err != nil {
err := fmt.Errorf("[ERROR] Error occurred while getting floating ip information. Error: %s", err)
return false, fmt.Errorf(err.Error())
return false, err
}
status := *floatingIP.Status
ready = status == "available"
Expand All @@ -121,7 +121,7 @@ func (client IBMCloudClient) isResourceReady(resourceID string, resourceType str
subnet, _, err := vpcService.GetSubnet(options)
if err != nil {
err := fmt.Errorf("[ERROR] Error occurred while getting subnet information. Error: %s", err)
return false, fmt.Errorf(err.Error())
return false, err
}
status := *subnet.Status
ready = status == "available"
Expand All @@ -131,7 +131,7 @@ func (client IBMCloudClient) isResourceReady(resourceID string, resourceType str
image, _, err := vpcService.GetImage(options)
if err != nil {
err := fmt.Errorf("[ERROR] Error occurred while getting image information. Error: %s", err)
return false, fmt.Errorf(err.Error())
return false, err
}
status := *image.Status
ready = status == "available"
Expand Down
4 changes: 2 additions & 2 deletions builder/ibmcloud/vpc/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
err := fmt.Errorf("[ERROR] Error loading SSH Private Key: %s", err)
state.Put("error", err)
ui.Error(err.Error())
log.Fatalf(err.Error())
log.Fatalf("error loading ssh private key: %v", err)
return nil, err
}

Expand All @@ -36,7 +36,7 @@ func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
err := fmt.Errorf("[ERROR] Error setting up SSH config: %s", err)
state.Put("error", err)
ui.Error(err.Error())
log.Fatalf(err.Error())
log.Fatalf("error setting up ssh config: %v", err)
return nil, err
}

Expand Down