handle legacy network deprecation (#2508)

GoogleCloudPlatform · Oct 24, 2019 · 1c26baa · 1c26baa
1 parent bfac07f
commit 1c26baa
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -918,7 +918,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       post_create: templates/terraform/post_create/compute_network_delete_default_route.erb
       extra_schema_entry: templates/terraform/extra_schema_entry/network.erb
-      encoder: templates/terraform/encoders/network.erb
   NetworkEndpoint: !ruby/object:Overrides::Terraform::ResourceOverride
     id_format: "{{project}}/{{zone}}/{{network_endpoint_group}}/{{instance}}/{{ip_address}}/{{port}}"
     mutex: networkEndpoint/{{project}}/{{zone}}/{{network_endpoint_group}}

diff --git a/templates/terraform/encoders/network.erb b/templates/terraform/encoders/network.erb
diff --git a/templates/terraform/extra_schema_entry/network.erb b/templates/terraform/extra_schema_entry/network.erb
@@ -14,6 +14,6 @@
 -%>
 "ipv4_range": {
 	Type:       schema.TypeString,
-	Optional:   true,
+	Computed:   true,
 	Removed:    "Legacy Networks are deprecated and you will no longer be able to create them using this field from Feb 1, 2020 onwards.",
 },
diff --git a/third_party/terraform/website/docs/version_3_upgrade.html.markdown b/third_party/terraform/website/docs/version_3_upgrade.html.markdown
@@ -170,7 +170,7 @@ monitoring_service = "monitoring.googleapis.com/kubernetes"
 
 ### `ipv4_range` is now removed
 
-Legacy Networks are deprecated and you will no longer be able to create them
+Legacy Networks are removed and you will no longer be able to create them
 using this field from Feb 1, 2020 onwards.
 
 ## Resource: `google_compute_network_peering`