From 6ba64153c4d9319e9588ead5cd6828859bc4f4ae Mon Sep 17 00:00:00 2001 From: Megan Bang Date: Wed, 20 Oct 2021 11:37:54 -0500 Subject: [PATCH 1/2] remove trace-append and trace-ro --- mmv1/third_party/terraform/utils/service_scope.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/mmv1/third_party/terraform/utils/service_scope.go b/mmv1/third_party/terraform/utils/service_scope.go index e911ed3b1dad..3bd4a997ae8a 100644 --- a/mmv1/third_party/terraform/utils/service_scope.go +++ b/mmv1/third_party/terraform/utils/service_scope.go @@ -27,8 +27,6 @@ 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", From 7b607cc8bea6d6f9331dae61848358e771b5a1fb Mon Sep 17 00:00:00 2001 From: Megan Bang Date: Wed, 20 Oct 2021 14:41:10 -0500 Subject: [PATCH 2/2] update upgrade guide --- .../website/docs/guides/version_4_upgrade.html.markdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mmv1/third_party/terraform/website/docs/guides/version_4_upgrade.html.markdown b/mmv1/third_party/terraform/website/docs/guides/version_4_upgrade.html.markdown index 598db1a5cfd6..022dbdf38783 100644 --- a/mmv1/third_party/terraform/website/docs/guides/version_4_upgrade.html.markdown +++ b/mmv1/third_party/terraform/website/docs/guides/version_4_upgrade.html.markdown @@ -14,6 +14,7 @@ description: |- - [Provider](#provider) - [Redundant default scopes are removed](#redundant-default-scopes-are-removed) - [Runtime Configurator (`runtimeconfig`) resources have been removed from the GA provider](#runtime-configurator-runtimeconfig-resources-have-been-removed-from-the-ga-provider) + - [Service account scopes no longer accept `trace-append` or `trace-ro`, use `trace` instead](#service-account-scopes-no-longer-accept-trace-append-or-trace-ro-use-trace-instead) - [Datasource: `google_product_resource`](#datasource-google_product_resource) - [Datasource-level change example](#datasource-level-change-example) - [Resource: `google_bigquery_job`](#resource-google_bigquery_job) @@ -214,6 +215,11 @@ resource "google_runtimeconfig_config" "my-runtime-config" { } ``` +### Service account scopes no longer accept `trace-append` or `trace-ro`, use `trace` instead + +Previously users could specify `trace-append` or `trace-ro` as scopes for a given service account. +However, to better align with [Google documentation](https://cloud.google.com/sdk/gcloud/reference/alpha/compute/instances/set-scopes#--scopes), `trace` will now be the only valid scope, as it's an alias for `trace.append` and +`trace-ro` is no longer a documented option. ## Datasource: `google_product_resource`