Merge pull request #917 from openshift-cherrypick-robot/cherry-pick-909-to-release-4.14

openshift-merge-robot · web-flow · commit b0ee859b641f · 2023-09-13T18:17:04.000+02:00
[release-4.14] OCPBUGS-18794: check if response is nil before using it
diff --git a/pkg/storage/ibmcos/ibmcos.go b/pkg/storage/ibmcos/ibmcos.go
@@ -804,7 +804,11 @@ func (d *driver) VolumeSecrets() (map[string]string, error) {
 		},
 	)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get resource key for service instance: %s with resp code: %d", err.Error(), resp.StatusCode)
+		respMsg := ""
+		if resp != nil {
+			respMsg = fmt.Sprintf(" with resp code: %d", resp.StatusCode)
+		}
+		return nil, fmt.Errorf("unable to get resource key for service instance: %s%s", err.Error(), respMsg)
 	}
 
 	var accessKey string

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,11 @@ func (d *driver) VolumeSecrets() (map[string]string, error) {`
`804`	`804`	`},`
`805`	`805`	`)`
`806`	`806`	`if err != nil {`
`807`		`- return nil, fmt.Errorf("unable to get resource key for service instance: %s with resp code: %d", err.Error(), resp.StatusCode)`
	`807`	`+ respMsg := ""`
	`808`	`+ if resp != nil {`
	`809`	`+ respMsg = fmt.Sprintf(" with resp code: %d", resp.StatusCode)`
	`810`	`+ }`
	`811`	`+ return nil, fmt.Errorf("unable to get resource key for service instance: %s%s", err.Error(), respMsg)`
`808`	`812`	`}`
`809`	`813`
`810`	`814`	`var accessKey string`