Rebased against master branch

Signed-off-by: Brad Wadsworth <brad.wadsworth@mavenwave.com>
crossplane-contrib · Sep 23, 2022 · 884ac1f · 884ac1f
1 parent 458f205
commit 884ac1f
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/pkg/clients/gcp.go b/pkg/clients/gcp.go
@@ -109,17 +109,19 @@ func UseProviderConfig(ctx context.Context, c client.Client, mg resource.Managed
 			return "", nil, errors.Wrap(err, "cannot get credentials")
 		}
 		if isJSON(data) {
-			return pc.Spec.ProjectID, option.WithCredentialsJSON(data), nil
+			opts = append(opts, option.WithCredentialsJSON(data))
+		} else {
+			t := oauth2.Token{
+				AccessToken: string(data),
+			}
+			if ok := t.Valid(); !ok {
+				return pc.Spec.ProjectID, opts, errors.New("Access token invalid")
+			}
+			ts := oauth2.StaticTokenSource(&t)
+			opts = append(opts, option.WithTokenSource(ts))
 		}
-		t := oauth2.Token{
-			AccessToken: string(data),
-		}
-		if ok := t.Valid(); !ok {
-			return pc.Spec.ProjectID, opts, errors.New("Access token invalid")
-		}
-		ts := oauth2.StaticTokenSource(&t)
-		return pc.Spec.ProjectID, option.WithTokenSource(ts), nil
 	}
+	return pc.Spec.ProjectID, opts, nil
 }
 
 func isJSON(b []byte) bool {