Merge pull request #107 from pp511/PWX-26383-update-cloudops-to-fix-unit-test-in-porx-when-vendoring-gce-drive-encryption-changes

pp511 · web-flow · commit f357e2907638 · 2022-08-19T11:24:28.000-07:00
PWX-26383: Only log warning when instance service account is not extr…
diff --git a/gce/gce.go b/gce/gce.go
@@ -1240,11 +1240,11 @@ func gceInfo(ctx context.Context, inst *instance) error {
 	if content["client_email"] != nil {
 		inst.serviceAccount = fmt.Sprintf("%s", content["client_email"])
 	} else {
-		serviceAccount, err := metadata.Email("")
+		inst.serviceAccount, err = metadata.Email("")
 		if err != nil {
-			return fmt.Errorf("unable to get gce instance service account")
+			// No need to error out for non-GKE compute instances
+			logrus.Warnf("unable to get gce instance service account")
 		}
-		inst.serviceAccount = serviceAccount
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1240,11 +1240,11 @@ func gceInfo(ctx context.Context, inst *instance) error {`
`1240`	`1240`	`if content["client_email"] != nil {`
`1241`	`1241`	`inst.serviceAccount = fmt.Sprintf("%s", content["client_email"])`
`1242`	`1242`	`} else {`
`1243`		`- serviceAccount, err := metadata.Email("")`
	`1243`	`+ inst.serviceAccount, err = metadata.Email("")`
`1244`	`1244`	`if err != nil {`
`1245`		`- return fmt.Errorf("unable to get gce instance service account")`
	`1245`	`+ // No need to error out for non-GKE compute instances`
	`1246`	`+ logrus.Warnf("unable to get gce instance service account")`
`1246`	`1247`	`}`
`1247`		`- inst.serviceAccount = serviceAccount`
`1248`	`1248`	`}`
`1249`	`1249`	`return nil`
`1250`	`1250`	`}`