Remove Removed fields (#2391)

GoogleCloudPlatform · Nov 13, 2019 · 0a27c9c · 0a27c9c
1 parent dddf2b3
commit 0a27c9c
Show file tree

Hide file tree

Showing 16 changed files with 3 additions and 386 deletions.
diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -435,7 +435,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       pre_delete: templates/terraform/pre_delete/detach_disk.erb
       constants: templates/terraform/constants/disk.erb
       encoder: templates/terraform/encoders/disk.erb
-      extra_schema_entry: templates/terraform/extra_schema_entry/disk.erb
       decoder: templates/terraform/decoders/disk.erb
       resource_definition: templates/terraform/resource_definition/disk.erb
     docs: !ruby/object:Provider::Terraform::Docs

diff --git a/templates/terraform/extra_schema_entry/backend_service.erb b/templates/terraform/extra_schema_entry/backend_service.erb
diff --git a/templates/terraform/extra_schema_entry/disk.erb b/templates/terraform/extra_schema_entry/disk.erb
diff --git a/templates/terraform/extra_schema_entry/snapshot.erb b/templates/terraform/extra_schema_entry/snapshot.erb
@@ -16,29 +16,3 @@
 	Type:       schema.TypeString,
 	Computed:   true,
 },
-
-"snapshot_encryption_key_raw": {
-        Type:      schema.TypeString,
-        Optional:  true,
-        Sensitive: true,
-        Removed:   "Use snapshot_encryption_key.raw_key instead.",
-},
-
-"snapshot_encryption_key_sha256": {
-	Type:     schema.TypeString,
-	Computed: true,
-	Removed:  "Use snapshot_encryption_key.sha256 instead.",
-},
-
-"source_disk_encryption_key_raw": {
-        Type:      schema.TypeString,
-        Optional:  true,
-        Sensitive: true,
-        Removed:   "Use source_disk_encryption_key.raw_key instead.",
-},
-
-"source_disk_encryption_key_sha256": {
-	Type:     schema.TypeString,
-	Computed: true,
-	Removed:  "Use source_disk_encryption_key.sha256 instead.",
-},
diff --git a/third_party/terraform/data_sources/data_source_google_service_account_key.go b/third_party/terraform/data_sources/data_source_google_service_account_key.go
@@ -36,12 +36,6 @@ func dataSourceGoogleServiceAccountKey() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"service_account_id": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				Removed:  "Please use name to specify full service account key path projects/{project}/serviceAccounts/{serviceAccount}/keys/{keyId}",
-			},
 		},
 	}
 }

diff --git a/third_party/terraform/resources/resource_bigtable_instance.go b/third_party/terraform/resources/resource_bigtable_instance.go
@@ -87,34 +87,6 @@ func resourceBigtableInstance() *schema.Resource {
 				Computed: true,
 				ForceNew: true,
 			},
-
-			"cluster_id": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				Removed:  "Use cluster instead.",
-			},
-
-			"zone": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				Removed:  "Use cluster instead.",
-			},
-
-			"num_nodes": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Computed: true,
-				Removed:  "Use cluster instead.",
-			},
-
-			"storage_type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				Removed:  "Use cluster instead.",
-			},
 		},
 	}
 }

diff --git a/third_party/terraform/resources/resource_cloudfunctions_function.go b/third_party/terraform/resources/resource_cloudfunctions_function.go
@@ -212,27 +212,10 @@ func resourceCloudFunctionsFunction() *schema.Resource {
 				Optional: true,
 			},
 
-			"trigger_bucket": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Computed:      true,
-				Removed:       "This field is removed. Use `event_trigger` instead.",
-				ConflictsWith: []string{"trigger_http", "trigger_topic"},
-			},
-
 			"trigger_http": {
-				Type:          schema.TypeBool,
-				Optional:      true,
-				ForceNew:      true,
-				ConflictsWith: []string{"trigger_bucket", "trigger_topic"},
-			},
-
-			"trigger_topic": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				Computed:      true,
-				Removed:       "This field is removed. Use `event_trigger` instead.",
-				ConflictsWith: []string{"trigger_http", "trigger_bucket"},
+				Type:     schema.TypeBool,
+				Optional: true,
+				ForceNew: true,
 			},
 
 			"event_trigger": {

diff --git a/third_party/terraform/resources/resource_compute_instance.go b/third_party/terraform/resources/resource_compute_instance.go
@@ -216,12 +216,6 @@ func resourceComputeInstance() *schema.Resource {
 										ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD"}, false),
 									},
 
-									"assigned_nat_ip": {
-										Type:     schema.TypeString,
-										Computed: true,
-										Removed:  "Use network_interface.access_config.nat_ip instead.",
-									},
-
 									"public_ptr_domain_name": {
 										Type:     schema.TypeString,
 										Optional: true,
@@ -247,14 +241,6 @@ func resourceComputeInstance() *schema.Resource {
 								},
 							},
 						},
-
-						"address": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-							Computed: true,
-							Removed:  "Please use network_ip",
-						},
 					},
 				},
 			},
@@ -328,72 +314,6 @@ func resourceComputeInstance() *schema.Resource {
 				Default:  false,
 			},
 
-			"disk": {
-				Type:     schema.TypeList,
-				Optional: true,
-				ForceNew: true,
-				Removed:  "Use boot_disk, scratch_disk, and attached_disk instead",
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						// TODO(mitchellh): one of image or disk is required
-
-						"disk": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-						},
-
-						"image": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-						},
-
-						"type": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-						},
-
-						"scratch": {
-							Type:     schema.TypeBool,
-							Optional: true,
-							ForceNew: true,
-						},
-
-						"auto_delete": {
-							Type:     schema.TypeBool,
-							Optional: true,
-							Default:  true,
-							ForceNew: true,
-						},
-
-						"size": {
-							Type:     schema.TypeInt,
-							Optional: true,
-							ForceNew: true,
-						},
-
-						"device_name": {
-							Type:     schema.TypeString,
-							Optional: true,
-						},
-
-						"disk_encryption_key_raw": {
-							Type:      schema.TypeString,
-							Optional:  true,
-							ForceNew:  true,
-							Sensitive: true,
-						},
-
-						"disk_encryption_key_sha256": {
-							Type:     schema.TypeString,
-							Computed: true,
-						},
-					},
-				},
-			},
-
 			"enable_display": {
 				Type:     schema.TypeBool,
 				Optional: true,

diff --git a/third_party/terraform/resources/resource_compute_instance_template.go b/third_party/terraform/resources/resource_compute_instance_template.go
@@ -168,13 +168,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 				ForceNew: true,
 			},
 
-			"automatic_restart": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				ForceNew: true,
-				Removed:  "Use 'scheduling.automatic_restart' instead.",
-			},
-
 			"can_ip_forward": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -270,11 +263,6 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 										Computed:     true,
 										ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD"}, false),
 									},
-									"assigned_nat_ip": {
-										Type:     schema.TypeString,
-										Computed: true,
-										Removed:  "Use network_interface.access_config.nat_ip instead.",
-									},
 								},
 							},
 						},
@@ -299,24 +287,10 @@ func resourceComputeInstanceTemplate() *schema.Resource {
 								},
 							},
 						},
-
-						"address": {
-							Type:     schema.TypeString,
-							Computed: true,
-							Optional: true,
-							Removed:  "Please use network_ip",
-						},
 					},
 				},
 			},
 
-			"on_host_maintenance": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ForceNew: true,
-				Removed:  "Use 'scheduling.on_host_maintenance' instead.",
-			},
-
 			"project": {
 				Type:     schema.TypeString,
 				Optional: true,

diff --git a/third_party/terraform/resources/resource_dataproc_cluster.go.erb b/third_party/terraform/resources/resource_dataproc_cluster.go.erb
@@ -91,14 +91,6 @@ func resourceDataprocCluster() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 
-						"delete_autogen_bucket": {
-							Type:     schema.TypeBool,
-							Optional: true,
-							Default:  false,
-							Removed: "If you need a bucket that can be deleted, please create" +
-								"a new one and set the `staging_bucket` field",
-						},
-
 						"staging_bucket": {
 							Type:     schema.TypeString,
 							Optional: true,

diff --git a/third_party/terraform/resources/resource_endpoints_service.go b/third_party/terraform/resources/resource_endpoints_service.go
@@ -35,12 +35,6 @@ func resourceEndpointsService() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
-			"protoc_output": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				Removed:  "Please use protoc_output_base64 instead.",
-			},
 			"protoc_output_base64": {
 				Type:     schema.TypeString,
 				Optional: true,