Merge 9f99830 into 79af789

GoogleCloudPlatform · Nov 2, 2018 · 13e5afc · 13e5afc
2 parents 79af789 + 9f99830
commit 13e5afc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/...s/resource_compute_subnetwork_iam_test.go → ...source_compute_subnetwork_iam_test.go.erb b/...s/resource_compute_subnetwork_iam_test.go → ...source_compute_subnetwork_iam_test.go.erb
@@ -1,4 +1,6 @@
+<% autogen_exception -%>
 package google
+<% unless version.nil? || version == 'ga' -%>
 
 import (
 	"fmt"
@@ -245,3 +247,6 @@ resource "google_compute_subnetwork_iam_policy" "foo" {
 }
 `, account, subnetworkName, subnetworkName, region, roleId)
 }
+<% else %>
+// Magic Modules doesn't let us remove files - blank out beta-only common-compile files for now.
+<% end -%>
diff --git 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,28 +14,19 @@ 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,
 		ForceNew:   true,
 	},
 
 	"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 -%>
diff --git a/provider/terraform/utils/provider.go.erb b/provider/terraform/utils/provider.go.erb
@@ -156,9 +156,11 @@ func Provider() terraform.ResourceProvider {
 				"google_compute_ssl_certificate":               resourceComputeSslCertificate(),
 				"google_compute_ssl_policy":                    resourceComputeSslPolicy(),
 				"google_compute_subnetwork":                    resourceComputeSubnetwork(),
+<% unless version.nil? || version == 'ga' -%>
 				"google_compute_subnetwork_iam_binding":        ResourceIamBindingWithImport(IamComputeSubnetworkSchema, NewComputeSubnetworkIamUpdater, ComputeSubnetworkIdParseFunc),
 				"google_compute_subnetwork_iam_member":         ResourceIamMemberWithImport(IamComputeSubnetworkSchema, NewComputeSubnetworkIamUpdater, ComputeSubnetworkIdParseFunc),
 				"google_compute_subnetwork_iam_policy":         ResourceIamPolicyWithImport(IamComputeSubnetworkSchema, NewComputeSubnetworkIamUpdater, ComputeSubnetworkIdParseFunc),
+<% end -%>
 				"google_compute_target_https_proxy":            resourceComputeTargetHttpsProxy(),
 				"google_compute_target_tcp_proxy":              resourceComputeTargetTcpProxy(),
 				"google_compute_target_pool":                   resourceComputeTargetPool(),