From d52edabc8d8bb0aa77e05f0659378ac08e95677a Mon Sep 17 00:00:00 2001 From: Yoshi Yamaguchi <145104+ymotongpoo@users.noreply.github.com> Date: Wed, 24 Feb 2021 09:52:34 +0900 Subject: [PATCH 1/2] Change scope name up-to-date --- mmv1/third_party/terraform/utils/service_scope.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mmv1/third_party/terraform/utils/service_scope.go b/mmv1/third_party/terraform/utils/service_scope.go index 4b0a69c4b8f3..3bd4a997ae8a 100644 --- a/mmv1/third_party/terraform/utils/service_scope.go +++ b/mmv1/third_party/terraform/utils/service_scope.go @@ -26,8 +26,7 @@ func canonicalizeServiceScope(scope string) string { "storage-ro": "https://www.googleapis.com/auth/devstorage.read_only", "storage-rw": "https://www.googleapis.com/auth/devstorage.read_write", "taskqueue": "https://www.googleapis.com/auth/taskqueue", - "trace-append": "https://www.googleapis.com/auth/trace.append", - "trace-ro": "https://www.googleapis.com/auth/trace.readonly", + "trace": "https://www.googleapis.com/auth/trace.append", "useraccounts-ro": "https://www.googleapis.com/auth/cloud.useraccounts.readonly", "useraccounts-rw": "https://www.googleapis.com/auth/cloud.useraccounts", "userinfo-email": "https://www.googleapis.com/auth/userinfo.email", From 37e22b018d309da7b5da785fe0183043f6cf3302 Mon Sep 17 00:00:00 2001 From: Yoshi Yamaguchi <145104+ymotongpoo@users.noreply.github.com> Date: Wed, 24 Feb 2021 13:49:00 +0900 Subject: [PATCH 2/2] Revert removed trace scope aliases --- mmv1/third_party/terraform/utils/service_scope.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mmv1/third_party/terraform/utils/service_scope.go b/mmv1/third_party/terraform/utils/service_scope.go index 3bd4a997ae8a..e911ed3b1dad 100644 --- a/mmv1/third_party/terraform/utils/service_scope.go +++ b/mmv1/third_party/terraform/utils/service_scope.go @@ -27,6 +27,8 @@ func canonicalizeServiceScope(scope string) string { "storage-rw": "https://www.googleapis.com/auth/devstorage.read_write", "taskqueue": "https://www.googleapis.com/auth/taskqueue", "trace": "https://www.googleapis.com/auth/trace.append", + "trace-append": "https://www.googleapis.com/auth/trace.append", + "trace-ro": "https://www.googleapis.com/auth/trace.readonly", "useraccounts-ro": "https://www.googleapis.com/auth/cloud.useraccounts.readonly", "useraccounts-rw": "https://www.googleapis.com/auth/cloud.useraccounts", "userinfo-email": "https://www.googleapis.com/auth/userinfo.email",