Skip to content

added headers in error logs #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
uibm wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

added headers in error logs #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cabd99d
added headers in error logs
uibm Nov 9, 2023
623df05
debug logs and correlation id
uibm Nov 14, 2023
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
90 changes: 70 additions & 20 deletions builder/ibmcloud/vpc/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,14 @@ func (client IBMCloudClient) isResourceDown(resourceID string, resourceType stri
if resourceType == "instances" {
options := &vpcv1.GetInstanceOptions{}
options.SetID(resourceID)
instance, _, err := vpcService.GetInstance(options)
instance, response, err := vpcService.GetInstance(options)
if err != nil {
err := fmt.Errorf("[ERROR] Failed retrieving resource information. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Failed retrieving resource information. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return false, err
Expand All @@ -236,9 +241,14 @@ func (client IBMCloudClient) manageInstance(resourceID string, action string, st
options := &vpcv1.CreateInstanceActionOptions{}
options.SetInstanceID(resourceID)
options.SetType(action)
response, _, err := vpcService.CreateInstanceAction(options)
response, res, err := vpcService.CreateInstanceAction(options)
if err != nil {
err := fmt.Errorf("[ERROR] Failed to perform %s action over instance. Error: %s", action, err)
xRequestId := res.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(res.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", res.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Failed to perform %s action over instance. Error: %s \n X-Request-Id : %s %s", action, err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return "", err
Expand All @@ -259,10 +269,15 @@ func (client IBMCloudClient) retrieveResource(resourceID string, state multistep
}
options := &vpcv1.GetInstanceOptions{}
options.SetID(resourceID)
instance, _, err := vpcService.GetInstance(options)
instance, response, err := vpcService.GetInstance(options)

if err != nil {
err := fmt.Errorf("[ERROR] Failed retrieving resource information. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Failed retrieving resource information. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return nil, err
Expand Down Expand Up @@ -297,9 +312,14 @@ func (client IBMCloudClient) createFloatingIP(state multistep.StateBag) (*vpcv1.
ID: &instanceResourceGroupID,
},
})
floatingIP, _, err := vpcService.CreateFloatingIP(options)
floatingIP, response, err := vpcService.CreateFloatingIP(options)
if err != nil {
err := fmt.Errorf("[ERROR] Failed creating Floating IP Request. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Failed creating Floating IP Request. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return nil, err
Expand All @@ -316,9 +336,14 @@ func (client IBMCloudClient) GrabCredentials(instanceID string, state multistep.
options := &vpcv1.GetInstanceInitializationOptions{
ID: &instanceID,
}
instanceCredentials, _, err := vpcService.GetInstanceInitialization(options)
instanceCredentials, response, err := vpcService.GetInstanceInitialization(options)
if err != nil {
err := fmt.Errorf("[ERROR] Failed getting instance initialization data. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Failed getting instance initialization data. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return "", "", err
Expand Down Expand Up @@ -400,9 +425,14 @@ func (client IBMCloudClient) createSSHKeyVPC(state multistep.StateBag) (*vpcv1.K
vpcService = state.Get("vpcService").(*vpcv1.VpcV1)
}

key, _, err := vpcService.CreateKey(options)
key, response, err := vpcService.CreateKey(options)
if err != nil {
err := fmt.Errorf("[ERROR] Error sending the HTTP request that creates the SSH Key for VPC. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Error sending the HTTP request that creates the SSH Key for VPC. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return nil, err
Expand All @@ -417,9 +447,14 @@ func (client IBMCloudClient) getSecurityGroup(state multistep.StateBag, security
vpcService = state.Get("vpcService").(*vpcv1.VpcV1)
}

securityGroup, _, err := vpcService.GetSecurityGroup(&securityGroupData)
securityGroup, response, err := vpcService.GetSecurityGroup(&securityGroupData)
if err != nil {
err := fmt.Errorf("[ERROR] Error getting the Security Group. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Error getting the Security Group. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return nil, err
Expand All @@ -434,9 +469,14 @@ func (client IBMCloudClient) createSecurityGroup(state multistep.StateBag, secur
vpcService = state.Get("vpcService").(*vpcv1.VpcV1)
}

securityGroup, _, err := vpcService.CreateSecurityGroup(&securityGroupData)
securityGroup, response, err := vpcService.CreateSecurityGroup(&securityGroupData)
if err != nil {
err := fmt.Errorf("[ERROR] Error creating the Security Group. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Error creating the Security Group. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return nil, err
Expand All @@ -452,11 +492,16 @@ func (client IBMCloudClient) createRule(rule vpcv1.CreateSecurityGroupRuleOption
vpcService = state.Get("vpcService").(*vpcv1.VpcV1)
}

securityGroupRuleIntf, _, err := vpcService.CreateSecurityGroupRule(&rule)
securityGroupRuleIntf, response, err := vpcService.CreateSecurityGroupRule(&rule)
securityGroupRule := securityGroupRuleIntf.(*vpcv1.SecurityGroupRuleSecurityGroupRuleProtocolTcpudp)

if err != nil {
err := fmt.Errorf("[ERROR] Error sending the HTTP request that creates a Security Group's rule. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Error sending the HTTP request that creates a Security Group's rule. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return nil, err
Expand All @@ -474,9 +519,14 @@ func (client IBMCloudClient) addNetworkInterfaceToSecurityGroup(securityGroupID
securityGroupID,
networkInterfaceID,
)
securityGroupTargetReferenceIntf, _, err := vpcService.CreateSecurityGroupTargetBinding(options)
securityGroupTargetReferenceIntf, response, err := vpcService.CreateSecurityGroupTargetBinding(options)
if err != nil {
err := fmt.Errorf("[ERROR] Error sending the HTTP request that Add the VSI's network interface to the Security Group. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Error sending the HTTP request that Add the VSI's network interface to the Security Group. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return nil, err
Expand Down
1 change: 1 addition & 0 deletions builder/ibmcloud/vpc/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ type Config struct {
VSIInterface string `mapstructure:"vsi_interface"`
VSIUserDataFile string `mapstructure:"vsi_user_data_file"`
VSIUserDataString string `mapstructure:"vsi_user_data"`
VPCDebugLogs string `mapstructure:"vpc_log"`

ImageName string `mapstructure:"image_name"`
ImageTags []string `mapstructure:"tags"`
Expand Down
2 changes: 2 additions & 0 deletions builder/ibmcloud/vpc/config.hcl2spec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions builder/ibmcloud/vpc/step_capture_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,27 @@ func (s *stepCaptureImage) Run(_ context.Context, state multistep.StateBag) mult

options.SetImagePrototype(imagePrototype)

imageData, _, err := vpcService.CreateImage(options)
imageData, response, err := vpcService.CreateImage(options)

if err != nil {
err := fmt.Errorf("[ERROR] Error sending the HTTP request that creates the image. Error: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Error sending the HTTP request that creates the image. Error: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
ui.Error(err.Error())
log.Println(err.Error())
return multistep.ActionHalt
}

if err != nil {
err := fmt.Errorf("[ERROR] Error creating the Image: %s", err)
xRequestId := response.Headers["X-Request-Id"][0]
xCorrelationId := ""
if len(response.Headers["X-Correlation-Id"]) != 0 {
xCorrelationId = fmt.Sprintf("\n X-Correlation-Id : %s", response.Headers["X-Correlation-Id"][0])
}
err := fmt.Errorf("[ERROR] Error creating the Image: %s \n X-Request-Id : %s %s", err, xRequestId, xCorrelationId)
state.Put("error", err)
ui.Error(err.Error())
// log.Fatalf(err.Error())
Expand Down
Loading