remove trace-append and trace-ro (#5353) (#3759)

* remove trace-append and trace-ro * update upgrade guide Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Oct 22, 2021 · 09a52ca · 09a52ca
1 parent 6d18d35
commit 09a52ca
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.changelog/5353.txt b/.changelog/5353.txt
@@ -0,0 +1,3 @@
+```release-note:breaking-change
+compute: Fixed service account scope alias to be updated.
+```
diff --git a/google-beta/resource_compute_security_policy.go b/google-beta/resource_compute_security_policy.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"google.golang.org/api/compute/v0.beta"
+	compute "google.golang.org/api/compute/v0.beta"
 )
 
 func resourceComputeSecurityPolicy() *schema.Resource {

diff --git a/google-beta/resource_gke_hub_feature_membership_test.go b/google-beta/resource_gke_hub_feature_membership_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	dcl "github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
+	"github.com/GoogleCloudPlatform/declarative-resource-client-library/dcl"
 	gkehub "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/gkehub/beta"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"

diff --git a/google-beta/service_scope.go b/google-beta/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",

diff --git a/website/docs/guides/version_4_upgrade.html.markdown b/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`