From cefa88567f1abd9e7e075df684433998322bd038 Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Fri, 2 Nov 2018 16:10:11 -0700 Subject: [PATCH] Also remove iam_compute_subnetwork.go --- .../terraform/utils/iam_compute_subnetwork.go.erb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/provider/terraform/utils/iam_compute_subnetwork.go.erb b/provider/terraform/utils/iam_compute_subnetwork.go.erb index 7c19b6676080..03b7ef2bfa4a 100644 --- a/provider/terraform/utils/iam_compute_subnetwork.go.erb +++ b/provider/terraform/utils/iam_compute_subnetwork.go.erb @@ -1,5 +1,6 @@ <% autogen_exception -%> package google +<% unless version.nil? || version == 'ga' -%> import ( "fmt" @@ -13,18 +14,12 @@ import ( var IamComputeSubnetworkSchema = map[string]*schema.Schema{ "subnetwork": { -<% if version.nil? || version == 'ga' -%> - Deprecated: "This field is in beta and will be removed from this provider. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.", -<% end -%> Type: schema.TypeString, Required: true, ForceNew: true, }, "project": { -<% if version.nil? || version == 'ga' -%> - Deprecated: "This field is in beta and will be removed from this provider. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.", -<% end -%> Type: schema.TypeString, Optional: true, Computed: true, @@ -32,9 +27,6 @@ var IamComputeSubnetworkSchema = map[string]*schema.Schema{ }, "region": { -<% if version.nil? || version == 'ga' -%> - Deprecated: "This field is in beta and will be removed from this provider. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.", -<% end -%> Type: schema.TypeString, Optional: true, Computed: true, @@ -172,3 +164,6 @@ func computeBetaToResourceManagerPolicy(p *computeBeta.Policy) (*cloudresourcema } return out, nil } +<% else %> +// Magic Modules doesn't let us remove files - blank out beta-only common-compile files for now. +<% end -%>