Merge pull request #916 from shiftstack/mbooth-trivia

k8s-ci-robot · web-flow · commit d73d150ffde5 · 2021-06-27T17:29:24.000-07:00
🐛 Don't log nil error when AuthInfo is not set
diff --git a/pkg/cloud/services/compute/service.go b/pkg/cloud/services/compute/service.go
@@ -70,7 +70,7 @@ func NewService(client *gophercloud.ProviderClient, clientOpts *clientconfig.Cli
 	}
 
 	if clientOpts.AuthInfo == nil {
-		return nil, fmt.Errorf("failed to get project id: authInfo must be set: %v", err)
+		return nil, fmt.Errorf("failed to get project id: authInfo must be set")
 	}
 
 	projectID := clientOpts.AuthInfo.ProjectID
diff --git a/pkg/cloud/services/networking/service.go b/pkg/cloud/services/networking/service.go
@@ -49,7 +49,7 @@ func NewService(client *gophercloud.ProviderClient, clientOpts *clientconfig.Cli
 	}
 
 	if clientOpts.AuthInfo == nil {
-		return nil, fmt.Errorf("failed to get project id: authInfo must be set: %v", err)
+		return nil, fmt.Errorf("failed to get project id: authInfo must be set")
 	}
 
 	projectID := clientOpts.AuthInfo.ProjectID

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func NewService(client gophercloud.ProviderClient, clientOpts clientconfig.Cli`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if clientOpts.AuthInfo == nil {`
`73`		`- return nil, fmt.Errorf("failed to get project id: authInfo must be set: %v", err)`
	`73`	`+ return nil, fmt.Errorf("failed to get project id: authInfo must be set")`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`projectID := clientOpts.AuthInfo.ProjectID`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func NewService(client gophercloud.ProviderClient, clientOpts clientconfig.Cli`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`if clientOpts.AuthInfo == nil {`
`52`		`- return nil, fmt.Errorf("failed to get project id: authInfo must be set: %v", err)`
	`52`	`+ return nil, fmt.Errorf("failed to get project id: authInfo must be set")`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`projectID := clientOpts.AuthInfo.ProjectID`