Skip to content

Commit a762792

Browse files
danawillowmodular-magician
danawillow
authored and
modular-magician
committed
WIP: Add deprecation message for generated beta fields.
1 parent ba088fa commit a762792

28 files changed

+89
-48
lines changed

‎google/resource_binaryauthorization_attestor.go

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ func resourceBinaryAuthorizationAttestor() *schema.Resource {
3333
Importer: &schema.ResourceImporter{
3434
State: resourceBinaryAuthorizationAttestorImport,
3535
},
36+
DeprecationMessage: `This resource is in beta and will be removed from this provider.
37+
Use the BinaryAuthorizationAttestor resource in terraform-provider-google-beta provider to continue using it.
38+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`,
3639

3740
Schema: map[string]*schema.Schema{
3841
"attestation_authority_note": {

‎google/resource_binaryauthorization_policy.go

+3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ func resourceBinaryAuthorizationPolicy() *schema.Resource {
5151
Importer: &schema.ResourceImporter{
5252
State: resourceBinaryAuthorizationPolicyImport,
5353
},
54+
DeprecationMessage: `This resource is in beta and will be removed from this provider.
55+
Use the BinaryAuthorizationPolicy resource in terraform-provider-google-beta provider to continue using it.
56+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`,
5457

5558
Schema: map[string]*schema.Schema{
5659
"default_admission_rule": {

‎google/resource_compute_address.go

+14-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ func resourceComputeAddress() *schema.Resource {
3535
Importer: &schema.ResourceImporter{
3636
State: resourceComputeAddressImport,
3737
},
38-
3938
Timeouts: &schema.ResourceTimeout{
4039
Create: schema.DefaultTimeout(240 * time.Second),
4140
Update: schema.DefaultTimeout(240 * time.Second),
@@ -70,13 +69,19 @@ func resourceComputeAddress() *schema.Resource {
7069
"labels": {
7170
Type: schema.TypeMap,
7271
Optional: true,
73-
Elem: &schema.Schema{Type: schema.TypeString},
72+
Deprecated: `This field is in beta and will be removed from this provider.
73+
Use the terraform-provider-google-beta provider to continue using it.
74+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
75+
Elem: &schema.Schema{Type: schema.TypeString},
7476
},
7577
"network_tier": {
76-
Type: schema.TypeString,
77-
Computed: true,
78-
Optional: true,
79-
ForceNew: true,
78+
Type: schema.TypeString,
79+
Computed: true,
80+
Optional: true,
81+
ForceNew: true,
82+
Deprecated: `This field is in beta and will be removed from this provider.
83+
Use the terraform-provider-google-beta provider to continue using it.
84+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
8085
ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD", ""}, false),
8186
},
8287
"region": {
@@ -100,6 +105,9 @@ func resourceComputeAddress() *schema.Resource {
100105
"label_fingerprint": {
101106
Type: schema.TypeString,
102107
Computed: true,
108+
Deprecated: `This field is in beta and will be removed from this provider.
109+
Use the terraform-provider-google-beta provider to continue using it.
110+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
103111
},
104112
"users": {
105113
Type: schema.TypeList,

‎google/resource_compute_autoscaler.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeAutoscaler() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeAutoscalerImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_backend_bucket.go

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ func resourceComputeBackendBucket() *schema.Resource {
3434
Importer: &schema.ResourceImporter{
3535
State: resourceComputeBackendBucketImport,
3636
},
37-
3837
Timeouts: &schema.ResourceTimeout{
3938
Create: schema.DefaultTimeout(240 * time.Second),
4039
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_disk.go

-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ func resourceComputeDisk() *schema.Resource {
262262
Importer: &schema.ResourceImporter{
263263
State: resourceComputeDiskImport,
264264
},
265-
266265
Timeouts: &schema.ResourceTimeout{
267266
Create: schema.DefaultTimeout(300 * time.Second),
268267
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_firewall.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func resourceComputeFirewall() *schema.Resource {
5858
Importer: &schema.ResourceImporter{
5959
State: resourceComputeFirewallImport,
6060
},
61-
6261
Timeouts: &schema.ResourceTimeout{
6362
Create: schema.DefaultTimeout(240 * time.Second),
6463
Update: schema.DefaultTimeout(240 * time.Second),
@@ -144,10 +143,16 @@ func resourceComputeFirewall() *schema.Resource {
144143
"disabled": {
145144
Type: schema.TypeBool,
146145
Optional: true,
146+
Deprecated: `This field is in beta and will be removed from this provider.
147+
Use the terraform-provider-google-beta provider to continue using it.
148+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
147149
},
148150
"enable_logging": {
149151
Type: schema.TypeBool,
150152
Optional: true,
153+
Deprecated: `This field is in beta and will be removed from this provider.
154+
Use the terraform-provider-google-beta provider to continue using it.
155+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
151156
},
152157
"priority": {
153158
Type: schema.TypeInt,

‎google/resource_compute_forwarding_rule.go

+20-9
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeForwardingRule() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeForwardingRuleImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),
@@ -83,7 +82,10 @@ func resourceComputeForwardingRule() *schema.Resource {
8382
"labels": {
8483
Type: schema.TypeMap,
8584
Optional: true,
86-
Elem: &schema.Schema{Type: schema.TypeString},
85+
Deprecated: `This field is in beta and will be removed from this provider.
86+
Use the terraform-provider-google-beta provider to continue using it.
87+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
88+
Elem: &schema.Schema{Type: schema.TypeString},
8789
},
8890
"load_balancing_scheme": {
8991
Type: schema.TypeString,
@@ -100,10 +102,13 @@ func resourceComputeForwardingRule() *schema.Resource {
100102
DiffSuppressFunc: compareSelfLinkOrResourceName,
101103
},
102104
"network_tier": {
103-
Type: schema.TypeString,
104-
Computed: true,
105-
Optional: true,
106-
ForceNew: true,
105+
Type: schema.TypeString,
106+
Computed: true,
107+
Optional: true,
108+
ForceNew: true,
109+
Deprecated: `This field is in beta and will be removed from this provider.
110+
Use the terraform-provider-google-beta provider to continue using it.
111+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
107112
ValidateFunc: validation.StringInSlice([]string{"PREMIUM", "STANDARD", ""}, false),
108113
},
109114
"port_range": {
@@ -130,9 +135,12 @@ func resourceComputeForwardingRule() *schema.Resource {
130135
DiffSuppressFunc: compareSelfLinkOrResourceName,
131136
},
132137
"service_label": {
133-
Type: schema.TypeString,
134-
Optional: true,
135-
ForceNew: true,
138+
Type: schema.TypeString,
139+
Optional: true,
140+
ForceNew: true,
141+
Deprecated: `This field is in beta and will be removed from this provider.
142+
Use the terraform-provider-google-beta provider to continue using it.
143+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
136144
ValidateFunc: validateGCPName,
137145
},
138146
"subnetwork": {
@@ -158,6 +166,9 @@ func resourceComputeForwardingRule() *schema.Resource {
158166
"service_name": {
159167
Type: schema.TypeString,
160168
Computed: true,
169+
Deprecated: `This field is in beta and will be removed from this provider.
170+
Use the terraform-provider-google-beta provider to continue using it.
171+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
161172
},
162173
"project": {
163174
Type: schema.TypeString,

‎google/resource_compute_global_address.go

+25-11
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeGlobalAddress() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeGlobalAddressImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),
@@ -50,9 +49,12 @@ func resourceComputeGlobalAddress() *schema.Resource {
5049
ForceNew: true,
5150
},
5251
"address_type": {
53-
Type: schema.TypeString,
54-
Optional: true,
55-
ForceNew: true,
52+
Type: schema.TypeString,
53+
Optional: true,
54+
ForceNew: true,
55+
Deprecated: `This field is in beta and will be removed from this provider.
56+
Use the terraform-provider-google-beta provider to continue using it.
57+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
5658
ValidateFunc: validation.StringInSlice([]string{"EXTERNAL", "INTERNAL", ""}, false),
5759
DiffSuppressFunc: emptyOrDefaultStringSuppress("EXTERNAL"),
5860
Default: "EXTERNAL",
@@ -72,23 +74,35 @@ func resourceComputeGlobalAddress() *schema.Resource {
7274
"labels": {
7375
Type: schema.TypeMap,
7476
Optional: true,
75-
Elem: &schema.Schema{Type: schema.TypeString},
77+
Deprecated: `This field is in beta and will be removed from this provider.
78+
Use the terraform-provider-google-beta provider to continue using it.
79+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
80+
Elem: &schema.Schema{Type: schema.TypeString},
7681
},
7782
"network": {
78-
Type: schema.TypeString,
79-
Optional: true,
80-
ForceNew: true,
83+
Type: schema.TypeString,
84+
Optional: true,
85+
ForceNew: true,
86+
Deprecated: `This field is in beta and will be removed from this provider.
87+
Use the terraform-provider-google-beta provider to continue using it.
88+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
8189
DiffSuppressFunc: compareSelfLinkOrResourceName,
8290
},
8391
"prefix_length": {
8492
Type: schema.TypeInt,
8593
Optional: true,
8694
ForceNew: true,
95+
Deprecated: `This field is in beta and will be removed from this provider.
96+
Use the terraform-provider-google-beta provider to continue using it.
97+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
8798
},
8899
"purpose": {
89-
Type: schema.TypeString,
90-
Optional: true,
91-
ForceNew: true,
100+
Type: schema.TypeString,
101+
Optional: true,
102+
ForceNew: true,
103+
Deprecated: `This field is in beta and will be removed from this provider.
104+
Use the terraform-provider-google-beta provider to continue using it.
105+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
92106
ValidateFunc: validation.StringInSlice([]string{"VPC_PEERING", ""}, false),
93107
},
94108
"address": {

‎google/resource_compute_health_check.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeHealthCheck() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeHealthCheckImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_http_health_check.go

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ func resourceComputeHttpHealthCheck() *schema.Resource {
3535
Importer: &schema.ResourceImporter{
3636
State: resourceComputeHttpHealthCheckImport,
3737
},
38-
3938
Timeouts: &schema.ResourceTimeout{
4039
Create: schema.DefaultTimeout(240 * time.Second),
4140
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_https_health_check.go

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ func resourceComputeHttpsHealthCheck() *schema.Resource {
3535
Importer: &schema.ResourceImporter{
3636
State: resourceComputeHttpsHealthCheckImport,
3737
},
38-
3938
Timeouts: &schema.ResourceTimeout{
4039
Create: schema.DefaultTimeout(240 * time.Second),
4140
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_region_autoscaler.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeRegionAutoscaler() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeRegionAutoscalerImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_region_disk.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ func resourceComputeRegionDisk() *schema.Resource {
3838
Importer: &schema.ResourceImporter{
3939
State: resourceComputeRegionDiskImport,
4040
},
41-
41+
DeprecationMessage: `This resource is in beta and will be removed from this provider.
42+
Use the ComputeRegionDisk resource in terraform-provider-google-beta provider to continue using it.
43+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta resources.`,
4244
Timeouts: &schema.ResourceTimeout{
4345
Create: schema.DefaultTimeout(300 * time.Second),
4446
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_route.go

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ func resourceComputeRoute() *schema.Resource {
3434
Importer: &schema.ResourceImporter{
3535
State: resourceComputeRouteImport,
3636
},
37-
3837
Timeouts: &schema.ResourceTimeout{
3938
Create: schema.DefaultTimeout(240 * time.Second),
4039
Delete: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_router.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeRouter() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeRouterImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_ssl_certificate.go

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ func resourceComputeSslCertificate() *schema.Resource {
3535
Importer: &schema.ResourceImporter{
3636
State: resourceComputeSslCertificateImport,
3737
},
38-
3938
Timeouts: &schema.ResourceTimeout{
4039
Create: schema.DefaultTimeout(240 * time.Second),
4140
Delete: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_ssl_policy.go

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ func resourceComputeSslPolicy() *schema.Resource {
5656
Importer: &schema.ResourceImporter{
5757
State: resourceComputeSslPolicyImport,
5858
},
59-
6059
Timeouts: &schema.ResourceTimeout{
6160
Create: schema.DefaultTimeout(240 * time.Second),
6261
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_subnetwork.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ func resourceComputeSubnetwork() *schema.Resource {
6565
Importer: &schema.ResourceImporter{
6666
State: resourceComputeSubnetworkImport,
6767
},
68-
6968
Timeouts: &schema.ResourceTimeout{
7069
Create: schema.DefaultTimeout(360 * time.Second),
7170
Update: schema.DefaultTimeout(360 * time.Second),
@@ -102,6 +101,9 @@ func resourceComputeSubnetwork() *schema.Resource {
102101
"enable_flow_logs": {
103102
Type: schema.TypeBool,
104103
Optional: true,
104+
Deprecated: `This field is in beta and will be removed from this provider.
105+
Use the terraform-provider-google-beta provider to continue using it.
106+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
105107
},
106108
"private_ip_google_access": {
107109
Type: schema.TypeBool,
@@ -118,6 +120,9 @@ func resourceComputeSubnetwork() *schema.Resource {
118120
Type: schema.TypeList,
119121
Computed: true,
120122
Optional: true,
123+
Deprecated: `This field is in beta and will be removed from this provider.
124+
Use the terraform-provider-google-beta provider to continue using it.
125+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
121126
Elem: &schema.Resource{
122127
Schema: map[string]*schema.Schema{
123128
"ip_cidr_range": {
@@ -140,6 +145,9 @@ func resourceComputeSubnetwork() *schema.Resource {
140145
"fingerprint": {
141146
Type: schema.TypeString,
142147
Computed: true,
148+
Deprecated: `This field is in beta and will be removed from this provider.
149+
Use the terraform-provider-google-beta provider to continue using it.
150+
See http://terraform.io/docs/provider/google/provider_versions.html for more details on beta fields.`,
143151
},
144152
"gateway_address": {
145153
Type: schema.TypeString,

‎google/resource_compute_target_http_proxy.go

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ func resourceComputeTargetHttpProxy() *schema.Resource {
3535
Importer: &schema.ResourceImporter{
3636
State: resourceComputeTargetHttpProxyImport,
3737
},
38-
3938
Timeouts: &schema.ResourceTimeout{
4039
Create: schema.DefaultTimeout(240 * time.Second),
4140
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_target_https_proxy.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeTargetHttpsProxy() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeTargetHttpsProxyImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_target_ssl_proxy.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeTargetSslProxy() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeTargetSslProxyImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_target_tcp_proxy.go

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ func resourceComputeTargetTcpProxy() *schema.Resource {
3636
Importer: &schema.ResourceImporter{
3737
State: resourceComputeTargetTcpProxyImport,
3838
},
39-
4039
Timeouts: &schema.ResourceTimeout{
4140
Create: schema.DefaultTimeout(240 * time.Second),
4241
Update: schema.DefaultTimeout(240 * time.Second),

‎google/resource_compute_vpn_gateway.go

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ func resourceComputeVpnGateway() *schema.Resource {
3333
Importer: &schema.ResourceImporter{
3434
State: resourceComputeVpnGatewayImport,
3535
},
36-
3736
Timeouts: &schema.ResourceTimeout{
3837
Create: schema.DefaultTimeout(240 * time.Second),
3938
Delete: schema.DefaultTimeout(240 * time.Second),

0 commit comments

Comments
 (0)