replalce TypeList by TypeSet

Author: Sébastien GLON

google/node_config.go

@@ -3,7 +3,7 @@ package google
 import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	"google.golang.org/api/container/v1"
+	container "google.golang.org/api/container/v1"
 )
 
 var schemaNodeConfig = &schema.Schema{
@@ -38,7 +38,7 @@ var schemaNodeConfig = &schema.Schema{
 			},
 
 			"oauth_scopes": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Optional: true,
 				Computed: true,
 				ForceNew: true,
@@ -48,6 +48,7 @@ var schemaNodeConfig = &schema.Schema{
 						return canonicalizeServiceScope(v.(string))
 					},
 				},
+				Set: stringScopeHashcode,
 			},
 
 			"service_account": {
@@ -113,11 +114,11 @@ func expandNodeConfig(v interface{}) *container.NodeConfig {
 		nc.LocalSsdCount = int64(v.(int))
 	}
 
-	if v, ok := nodeConfig["oauth_scopes"]; ok {
-		scopesList := v.([]interface{})
-		scopes := []string{}
-		for _, v := range scopesList {
-			scopes = append(scopes, canonicalizeServiceScope(v.(string)))
+	if scopes, ok := nodeConfig["oauth_scopes"]; ok {
+		scopesSet := scopes.(*schema.Set)
+		scopes := make([]string, scopesSet.Len())
+		for i, scope := range scopesSet.List() {
+			scopes[i] = canonicalizeServiceScope(scope.(string))
 		}
 
 		nc.OauthScopes = scopes
@@ -181,7 +182,7 @@ func flattenNodeConfig(c *container.NodeConfig) []map[string]interface{} {
 	})
 
 	if len(c.OauthScopes) > 0 {
-		config[0]["oauth_scopes"] = c.OauthScopes
+		config[0]["oauth_scopes"] = schema.NewSet(stringScopeHashcode, convertStringArrToInterface(c.OauthScopes))
 	}
 
 	return config

google/resource_container_cluster_test.go

@@ -232,6 +232,31 @@ func TestAccContainerCluster_withNodeConfig(t *testing.T) {
 	})
 }
 
+func TestAccContainerCluster_withNodeConfigNotSorted(t *testing.T) {
+	// Make an update with non sorted oauth_scopes
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckContainerClusterDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccContainerCluster_withNodeConfigNotsorted,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckContainerCluster(
+						"google_container_cluster.with_node_config_not_sorted"),
+				),
+			},
+			{
+				Config: testAccContainerCluster_withNodeConfigNotsorted,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckContainerCluster(
+						"google_container_cluster.with_node_config_not_sorted"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccContainerCluster_withNodeConfigScopeAlias(t *testing.T) {
 	t.Parallel()
 
@@ -535,7 +560,9 @@ func testAccCheckContainerClusterDestroy(s *terraform.State) error {
 }
 
 var setFields map[string]struct{} = map[string]struct{}{
-	"additional_zones": struct{}{},
+	"additional_zones":                       struct{}{},
+	"node_config.0.oauth_scopes":             struct{}{},
+	"node_pool.0.node_config.0.oauth_scopes": struct{}{},
 }
 
 func testAccCheckContainerCluster(n string) resource.TestCheckFunc {
@@ -975,6 +1002,40 @@ resource "google_container_cluster" "with_version" {
 }`, clusterName)
 }
 
+var testAccContainerCluster_withNodeConfigNotsorted = fmt.Sprintf(`
+resource "google_container_cluster" "with_node_config_not_sorted" {
+	name = "cluster-test-%s"
+	zone = "us-central1-f"
+	initial_node_count = 1
+
+	master_auth {
+		username = "mr.yoda"
+		password = "adoy.rm"
+	}
+
+	node_config {
+		machine_type = "n1-standard-1"
+		disk_size_gb = 15
+		local_ssd_count = 1
+		oauth_scopes = [
+			"https://www.googleapis.com/auth/compute",
+			"https://www.googleapis.com/auth/devstorage.read_only",
+			"https://www.googleapis.com/auth/logging.write",
+			"monitoring"
+		]
+		service_account = "default"
+		metadata {
+			foo = "bar"
+		}
+		image_type = "COS"
+		labels {
+			foo = "bar"
+		}
+		tags = ["foo", "bar"]
+		preemptible = true
+	}
+}`, acctest.RandString(10))
+
 var testAccContainerCluster_withNodeConfig = fmt.Sprintf(`
 resource "google_container_cluster" "with_node_config" {
 	name = "cluster-test-%s"