From def3279ec728e22ff1ab1cc211ac75cc90db730c Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Thu, 7 Sep 2017 13:55:49 +0200 Subject: [PATCH] backend/remote-state/gcloud: Use package provided OAuth scope. --- backend/remote-state/gcloud/backend.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/remote-state/gcloud/backend.go b/backend/remote-state/gcloud/backend.go index ac23ed0408..8941bebf66 100644 --- a/backend/remote-state/gcloud/backend.go +++ b/backend/remote-state/gcloud/backend.go @@ -57,8 +57,6 @@ func (b *Backend) configure(ctx context.Context) error { return nil } - storageOAuth2Scope := "https://www.googleapis.com/auth/devstorage.read_write" - data := schema.FromContextBackendConfig(ctx) b.bucketName = data.Get("bucket").(string) @@ -75,14 +73,14 @@ func (b *Backend) configure(ctx context.Context) error { return fmt.Errorf("Error loading credentials: %v", err) } - jwtConfig, err := google.JWTConfigFromJSON([]byte(credentialsJson), storageOAuth2Scope) + jwtConfig, err := google.JWTConfigFromJSON([]byte(credentialsJson), storage.ScopeReadWrite) if err != nil { return fmt.Errorf("Failed to get Google OAuth2 token: %v", err) } tokenSource = jwtConfig.TokenSource(b.storageContext) } else { - defaultTokenSource, err := google.DefaultTokenSource(b.storageContext, storageOAuth2Scope) + defaultTokenSource, err := google.DefaultTokenSource(b.storageContext, storage.ScopeReadWrite) if err != nil { return fmt.Errorf("Failed to get Google Application Default Credentials: %v", err) }