Extract Bigtable instance type from InstanceInfo instead of deriving …

…from clusters (GoogleCloudPlatform#2488) Merged PR GoogleCloudPlatform#2488.
JanMa · Oct 25, 2019 · c58df27 · c58df27
1 parent 57d4d13
commit c58df27
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/build/inspec b/build/inspec
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/resources/resource_bigtable_instance.go b/third_party/terraform/resources/resource_bigtable_instance.go
@@ -189,26 +189,21 @@ func resourceBigtableInstanceRead(d *schema.ResourceData, meta interface{}) erro
 
 	d.Set("project", project)
 
+	var instanceType string
+	if instance.InstanceType == bigtable.DEVELOPMENT {
+		instanceType = "DEVELOPMENT"
+	} else {
+		instanceType = "PRODUCTION"
+	}
+	d.Set("instance_type", instanceType)
+
 	clusters, err := c.Clusters(ctx, instance.Name)
 	if err != nil {
 		return fmt.Errorf("Error retrieving instance clusters. %s", err)
 	}
 
 	clustersNewState := []map[string]interface{}{}
-	for i, cluster := range clusters {
-		// DEVELOPMENT clusters have num_nodes = 0 on their first (and only)
-		// cluster while PRODUCTION clusters will have at least 3.
-		if i == 0 {
-			var instanceType string
-			if cluster.ServeNodes == 0 {
-				instanceType = "DEVELOPMENT"
-			} else {
-				instanceType = "PRODUCTION"
-			}
-
-			d.Set("instance_type", instanceType)
-		}
-
+	for _, cluster := range clusters {
 		clustersNewState = append(clustersNewState, flattenBigtableCluster(cluster))
 	}
+7 −2		CHANGELOG.md
+1 −1		VERSION
+1 −1		inspec.yml
+1 −1		libraries/google_dns_managed_zones.rb