return false if auto provisioning oauth scopes is nil

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Dec 2, 2019 · 8f5ac60 · 8f5ac60
1 parent b11c43f
commit 8f5ac60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go
@@ -2171,6 +2171,9 @@ func cidrOrSizeDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
 // removable by disabling those features.
 func containerClusterAddedScopesSuppress(k, old, new string, d *schema.ResourceData) bool {
 	o, n := d.GetChange("cluster_autoscaling.0.auto_provisioning_defaults.0.oauth_scopes")
+	if o == nil || n == nil {
+		return false
+	}
 
 	addedScopes := []string{
 		"https://www.googleapis.com/auth/monitoring.write",

diff --git a/google/resource_sql_database_instance_test.go b/google/resource_sql_database_instance_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )