WIP: Add deprecation message for generated beta fields.

hashicorp · Oct 3, 2018 · b6f7a24 · b6f7a24
1 parent 1f76d44
commit b6f7a24
Show file tree

Hide file tree

Showing 28 changed files with 89 additions and 48 deletions.
diff --git a/google/resource_binaryauthorization_attestor.go b/google/resource_binaryauthorization_attestor.go
@@ -33,6 +33,9 @@ func resourceBinaryAuthorizationAttestor() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceBinaryAuthorizationAttestorImport,
 		},
+		DeprecationMessage: `This resource is in beta and will be removed from this provider.
+Use the BinaryAuthorizationAttestor resource in terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`,
 
 		Schema: map[string]*schema.Schema{
 			"attestation_authority_note": {

diff --git a/google/resource_binaryauthorization_policy.go b/google/resource_binaryauthorization_policy.go
@@ -51,6 +51,9 @@ func resourceBinaryAuthorizationPolicy() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceBinaryAuthorizationPolicyImport,
 		},
+		DeprecationMessage: `This resource is in beta and will be removed from this provider.
+Use the BinaryAuthorizationPolicy resource in terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`,
 
 		Schema: map[string]*schema.Schema{
 			"default_admission_rule": {

diff --git a/google/resource_compute_address.go b/google/resource_compute_address.go
@@ -35,7 +35,6 @@ func resourceComputeAddress() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeAddressImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),
@@ -70,13 +69,19 @@ func resourceComputeAddress() *schema.Resource {
 			"labels": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
+				Elem: &schema.Schema{Type: schema.TypeString},
 			},
 			"network_tier": {
-				Type:         schema.TypeString,
-				Computed:     true,
-				Optional:     true,
-				ForceNew:     true,
+				Type:     schema.TypeString,
+				Computed: true,
+				Optional: true,
+				ForceNew: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 				ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD", ""}, false),
 			},
 			"region": {
@@ -100,6 +105,9 @@ func resourceComputeAddress() *schema.Resource {
 			"label_fingerprint": {
 				Type:     schema.TypeString,
 				Computed: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 			},
 			"users": {
 				Type:     schema.TypeList,

diff --git a/google/resource_compute_autoscaler.go b/google/resource_compute_autoscaler.go
@@ -36,7 +36,6 @@ func resourceComputeAutoscaler() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeAutoscalerImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_backend_bucket.go b/google/resource_compute_backend_bucket.go
@@ -34,7 +34,6 @@ func resourceComputeBackendBucket() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeBackendBucketImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_disk.go b/google/resource_compute_disk.go
@@ -262,7 +262,6 @@ func resourceComputeDisk() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeDiskImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(300 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_firewall.go b/google/resource_compute_firewall.go
@@ -58,7 +58,6 @@ func resourceComputeFirewall() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeFirewallImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),
@@ -144,10 +143,16 @@ func resourceComputeFirewall() *schema.Resource {
 			"disabled": {
 				Type:     schema.TypeBool,
 				Optional: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 			},
 			"enable_logging": {
 				Type:     schema.TypeBool,
 				Optional: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 			},
 			"priority": {
 				Type:         schema.TypeInt,

diff --git a/google/resource_compute_forwarding_rule.go b/google/resource_compute_forwarding_rule.go
@@ -36,7 +36,6 @@ func resourceComputeForwardingRule() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeForwardingRuleImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),
@@ -83,7 +82,10 @@ func resourceComputeForwardingRule() *schema.Resource {
 			"labels": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
+				Elem: &schema.Schema{Type: schema.TypeString},
 			},
 			"load_balancing_scheme": {
 				Type:         schema.TypeString,
@@ -100,10 +102,13 @@ func resourceComputeForwardingRule() *schema.Resource {
 				DiffSuppressFunc: compareSelfLinkOrResourceName,
 			},
 			"network_tier": {
-				Type:         schema.TypeString,
-				Computed:     true,
-				Optional:     true,
-				ForceNew:     true,
+				Type:     schema.TypeString,
+				Computed: true,
+				Optional: true,
+				ForceNew: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 				ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD", ""}, false),
 			},
 			"port_range": {
@@ -130,9 +135,12 @@ func resourceComputeForwardingRule() *schema.Resource {
 				DiffSuppressFunc: compareSelfLinkOrResourceName,
 			},
 			"service_label": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ForceNew:     true,
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 				ValidateFunc: validateGCPName,
 			},
 			"subnetwork": {
@@ -158,6 +166,9 @@ func resourceComputeForwardingRule() *schema.Resource {
 			"service_name": {
 				Type:     schema.TypeString,
 				Computed: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 			},
 			"project": {
 				Type:     schema.TypeString,

diff --git a/google/resource_compute_global_address.go b/google/resource_compute_global_address.go
@@ -36,7 +36,6 @@ func resourceComputeGlobalAddress() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeGlobalAddressImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),
@@ -50,9 +49,12 @@ func resourceComputeGlobalAddress() *schema.Resource {
 				ForceNew: true,
 			},
 			"address_type": {
-				Type:             schema.TypeString,
-				Optional:         true,
-				ForceNew:         true,
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 				ValidateFunc:     validation.StringInSlice([]string{"EXTERNAL", "INTERNAL", ""}, false),
 				DiffSuppressFunc: emptyOrDefaultStringSuppress("EXTERNAL"),
 				Default:          "EXTERNAL",
@@ -72,23 +74,35 @@ func resourceComputeGlobalAddress() *schema.Resource {
 			"labels": {
 				Type:     schema.TypeMap,
 				Optional: true,
-				Elem:     &schema.Schema{Type: schema.TypeString},
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
+				Elem: &schema.Schema{Type: schema.TypeString},
 			},
 			"network": {
-				Type:             schema.TypeString,
-				Optional:         true,
-				ForceNew:         true,
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 				DiffSuppressFunc: compareSelfLinkOrResourceName,
 			},
 			"prefix_length": {
 				Type:     schema.TypeInt,
 				Optional: true,
 				ForceNew: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 			},
 			"purpose": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				ForceNew:     true,
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 				ValidateFunc: validation.StringInSlice([]string{"VPC_PEERING", ""}, false),
 			},
 			"address": {

diff --git a/google/resource_compute_health_check.go b/google/resource_compute_health_check.go
@@ -36,7 +36,6 @@ func resourceComputeHealthCheck() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeHealthCheckImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_http_health_check.go b/google/resource_compute_http_health_check.go
@@ -35,7 +35,6 @@ func resourceComputeHttpHealthCheck() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeHttpHealthCheckImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_https_health_check.go b/google/resource_compute_https_health_check.go
@@ -35,7 +35,6 @@ func resourceComputeHttpsHealthCheck() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeHttpsHealthCheckImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_region_autoscaler.go b/google/resource_compute_region_autoscaler.go
@@ -36,7 +36,6 @@ func resourceComputeRegionAutoscaler() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeRegionAutoscalerImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_region_disk.go b/google/resource_compute_region_disk.go
@@ -38,7 +38,9 @@ func resourceComputeRegionDisk() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeRegionDiskImport,
 		},
-
+		DeprecationMessage: `This resource is in beta and will be removed from this provider.
+Use the ComputeRegionDisk resource in terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`,
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(300 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_route.go b/google/resource_compute_route.go
@@ -34,7 +34,6 @@ func resourceComputeRoute() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeRouteImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Delete: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_router.go b/google/resource_compute_router.go
@@ -36,7 +36,6 @@ func resourceComputeRouter() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeRouterImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_ssl_certificate.go b/google/resource_compute_ssl_certificate.go
@@ -35,7 +35,6 @@ func resourceComputeSslCertificate() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeSslCertificateImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Delete: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_ssl_policy.go b/google/resource_compute_ssl_policy.go
@@ -56,7 +56,6 @@ func resourceComputeSslPolicy() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeSslPolicyImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_subnetwork.go b/google/resource_compute_subnetwork.go
@@ -65,7 +65,6 @@ func resourceComputeSubnetwork() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeSubnetworkImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(360 * time.Second),
 			Update: schema.DefaultTimeout(360 * time.Second),
@@ -102,6 +101,9 @@ func resourceComputeSubnetwork() *schema.Resource {
 			"enable_flow_logs": {
 				Type:     schema.TypeBool,
 				Optional: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 			},
 			"private_ip_google_access": {
 				Type:     schema.TypeBool,
@@ -118,6 +120,9 @@ func resourceComputeSubnetwork() *schema.Resource {
 				Type:     schema.TypeList,
 				Computed: true,
 				Optional: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"ip_cidr_range": {
@@ -140,6 +145,9 @@ func resourceComputeSubnetwork() *schema.Resource {
 			"fingerprint": {
 				Type:     schema.TypeString,
 				Computed: true,
+				Deprecated: `This field is in beta and will be removed from this provider.
+Use the terraform-provider-google-beta provider to continue using it.
+See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
 			},
 			"gateway_address": {
 				Type:     schema.TypeString,

diff --git a/google/resource_compute_target_http_proxy.go b/google/resource_compute_target_http_proxy.go
@@ -35,7 +35,6 @@ func resourceComputeTargetHttpProxy() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeTargetHttpProxyImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_target_https_proxy.go b/google/resource_compute_target_https_proxy.go
@@ -36,7 +36,6 @@ func resourceComputeTargetHttpsProxy() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeTargetHttpsProxyImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_target_ssl_proxy.go b/google/resource_compute_target_ssl_proxy.go
@@ -36,7 +36,6 @@ func resourceComputeTargetSslProxy() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeTargetSslProxyImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_target_tcp_proxy.go b/google/resource_compute_target_tcp_proxy.go
@@ -36,7 +36,6 @@ func resourceComputeTargetTcpProxy() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeTargetTcpProxyImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Update: schema.DefaultTimeout(240 * time.Second),

diff --git a/google/resource_compute_vpn_gateway.go b/google/resource_compute_vpn_gateway.go
@@ -33,7 +33,6 @@ func resourceComputeVpnGateway() *schema.Resource {
 		Importer: &schema.ResourceImporter{
 			State: resourceComputeVpnGatewayImport,
 		},
-
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(240 * time.Second),
 			Delete: schema.DefaultTimeout(240 * time.Second),