Deprecate convenience fields in google_compute_snapshot (GoogleCloudP…

…latform#173)  /cc @rileykarson
modular-magician · Dec 5, 2018 · 1b05176 · 1b05176
1 parent 8cae2e8
commit 1b05176
Show file tree

Hide file tree

Showing 7 changed files with 1,344 additions and 188 deletions.
diff --git a/google-beta/provider.go b/google-beta/provider.go
@@ -131,7 +131,6 @@ func Provider() terraform.ResourceProvider {
 				"google_compute_attached_disk":                 resourceComputeAttachedDisk(),
 				"google_compute_backend_service":               resourceComputeBackendService(),
 				"google_compute_disk":                          resourceComputeDisk(),
-				"google_compute_snapshot":                      resourceComputeSnapshot(),
 				"google_compute_firewall":                      resourceComputeFirewall(),
 				"google_compute_forwarding_rule":               resourceComputeForwardingRule(),
 				"google_compute_global_forwarding_rule":        resourceComputeGlobalForwardingRule(),

diff --git a/google-beta/provider_compute_gen.go b/google-beta/provider_compute_gen.go
@@ -32,6 +32,7 @@ var GeneratedComputeResourcesMap = map[string]*schema.Resource{
 	"google_compute_region_disk":             resourceComputeRegionDisk(),
 	"google_compute_route":                   resourceComputeRoute(),
 	"google_compute_router":                  resourceComputeRouter(),
+	"google_compute_snapshot":                resourceComputeSnapshot(),
 	"google_compute_ssl_certificate":         resourceComputeSslCertificate(),
 	"google_compute_ssl_policy":              resourceComputeSslPolicy(),
 	"google_compute_subnetwork":              resourceComputeSubnetwork(),

diff --git a/google-beta/resource_bigtable_instance.go b/google-beta/resource_bigtable_instance.go
@@ -34,24 +34,20 @@ func resourceBigtableInstance() *schema.Resource {
 						"cluster_id": {
 							Type:     schema.TypeString,
 							Required: true,
-							ForceNew: true,
 						},
 						"zone": {
 							Type:     schema.TypeString,
 							Required: true,
-							ForceNew: true,
 						},
 						"num_nodes": {
 							Type:         schema.TypeInt,
 							Optional:     true,
-							ForceNew:     true,
 							ValidateFunc: validation.IntAtLeast(3),
 						},
 						"storage_type": {
 							Type:         schema.TypeString,
 							Optional:     true,
 							Default:      "SSD",
-							ForceNew:     true,
 							ValidateFunc: validation.StringInSlice([]string{"SSD", "HDD"}, false),
 						},
 					},

diff --git a/google-beta/resource_bigtable_instance_test.go b/google-beta/resource_bigtable_instance_test.go
@@ -21,14 +21,7 @@ func TestAccBigtableInstance_basic(t *testing.T) {
 		CheckDestroy: testAccCheckBigtableInstanceDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccBigtableInstance(instanceName, 3),
-				Check: resource.ComposeTestCheckFunc(
-					testAccBigtableInstanceExists(
-						"google_bigtable_instance.instance"),
-				),
-			},
-			{
-				Config: testAccBigtableInstance(instanceName, 4),
+				Config: testAccBigtableInstance(instanceName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccBigtableInstanceExists(
 						"google_bigtable_instance.instance"),
@@ -132,18 +125,18 @@ func testAccBigtableInstanceExists(n string) resource.TestCheckFunc {
 	}
 }
 
-func testAccBigtableInstance(instanceName string, numNodes int) string {
+func testAccBigtableInstance(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
 	name = "%s"
 	cluster {
 		cluster_id   = "%s"
 		zone         = "us-central1-b"
-		num_nodes    = %d
+		num_nodes    = 3
 		storage_type = "HDD"
 	}
 }
-`, instanceName, instanceName, numNodes)
+`, instanceName, instanceName)
 }
 
 func testAccBigtableInstance_cluster(instanceName string) string {