Skip to content

Commit 73cefe4

Browse files
modular-magicianmodular-magician
authored
Upgrade DCL to v1.12.1 (#6179) (#12033)
Signed-off-by: Modular Magician <[email protected]>
1 parent ad94e17 commit 73cefe4

12 files changed

+31
-20
lines changed

‎.changelog/6179.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module github.com/hashicorp/terraform-provider-google
22
require (
33
cloud.google.com/go/bigtable v1.13.0
4-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.11.0
4+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.12.1
55
github.com/apparentlymart/go-cidr v1.1.0
66
github.com/client9/misspell v0.3.4
77
github.com/davecgh/go-spew v1.1.1

‎go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
368368
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
369369
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
370370
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
371+
github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932 h1:5/4TSDzpDnHQ8rKEEQBjRlYx77mHOvXu08oGchxej7o=
372+
github.com/google/go-cpy v0.0.0-20211218193943-a9c933c06932/go.mod h1:cC6EdPbj/17GFCPDK39NRarlMI+kt+O60S12cNB5J9Y=
371373
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
372374
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
373375
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -1515,3 +1517,5 @@ github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.3 h1:Ds
15151517
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.10.3/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
15161518
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.11.0 h1:ZGyOhpvdhu9P7KFR3GtqresK5WyCX5bRP3AwCsRTjqw=
15171519
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.11.0/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
1520+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.12.1 h1:/wOjQoExE9DuynQfCv6gNQyOLPYL2v1vUpbB8TRj/Ho=
1521+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.12.1/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=

‎google/resource_apikeys_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func resourceApikeysKey() *schema.Resource {
4949
Type: schema.TypeString,
5050
Required: true,
5151
ForceNew: true,
52-
Description: "The resource name of the key. The name must be unique within the project, must conform with RFC-1034, is restricted to lower-cased letters, and has a maximum length of 63 characters. In another word, the name must match the regular expression: [a-z]([a-z0-9-]{0,61}[a-z0-9])?.",
52+
Description: "The resource name of the key. The name must be unique within the project, must conform with RFC-1034, is restricted to lower-cased letters, and has a maximum length of 63 characters. In another word, the name must match the regular expression: `[a-z]([a-z0-9-]{0,61}[a-z0-9])?`.",
5353
},
5454

5555
"display_name": {

‎google/resource_clouddeploy_target.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ func resourceClouddeployTarget() *schema.Resource {
8383

8484
"execution_configs": {
8585
Type: schema.TypeList,
86+
Computed: true,
8687
Optional: true,
8788
Description: "Configurations for all execution that relates to this `Target`. Each `ExecutionEnvironmentUsage` value may only be used in a single configuration; using the same value multiple times is an error. When one or more configurations are specified, they must include the `RENDER` and `DEPLOY` `ExecutionEnvironmentUsage` values. When no configurations are specified, execution will use the default specified in `DefaultPool`.",
8889
Elem: ClouddeployTargetExecutionConfigsSchema(),
@@ -177,12 +178,14 @@ func ClouddeployTargetExecutionConfigsSchema() *schema.Resource {
177178

178179
"artifact_storage": {
179180
Type: schema.TypeString,
181+
Computed: true,
180182
Optional: true,
181183
Description: "Optional. Cloud Storage location in which to store execution outputs. This can either be a bucket (\"gs://my-bucket\") or a path within a bucket (\"gs://my-bucket/my-dir\"). If unspecified, a default bucket located in the same region will be used.",
182184
},
183185

184186
"service_account": {
185187
Type: schema.TypeString,
188+
Computed: true,
186189
Optional: true,
187190
Description: "Optional. Google service account to use for execution. If unspecified, the project execution service account ([email protected]) is used.",
188191
},
@@ -508,12 +511,12 @@ func flattenClouddeployTargetAnthosCluster(obj *clouddeploy.TargetAnthosCluster)
508511
}
509512
func expandClouddeployTargetExecutionConfigsArray(o interface{}) []clouddeploy.TargetExecutionConfigs {
510513
if o == nil {
511-
return make([]clouddeploy.TargetExecutionConfigs, 0)
514+
return nil
512515
}
513516

514517
objs := o.([]interface{})
515518
if len(objs) == 0 || objs[0] == nil {
516-
return make([]clouddeploy.TargetExecutionConfigs, 0)
519+
return nil
517520
}
518521

519522
items := make([]clouddeploy.TargetExecutionConfigs, 0, len(objs))
@@ -527,14 +530,14 @@ func expandClouddeployTargetExecutionConfigsArray(o interface{}) []clouddeploy.T
527530

528531
func expandClouddeployTargetExecutionConfigs(o interface{}) *clouddeploy.TargetExecutionConfigs {
529532
if o == nil {
530-
return clouddeploy.EmptyTargetExecutionConfigs
533+
return nil
531534
}
532535

533536
obj := o.(map[string]interface{})
534537
return &clouddeploy.TargetExecutionConfigs{
535538
Usages: expandClouddeployTargetExecutionConfigsUsagesArray(obj["usages"]),
536-
ArtifactStorage: dcl.String(obj["artifact_storage"].(string)),
537-
ServiceAccount: dcl.String(obj["service_account"].(string)),
539+
ArtifactStorage: dcl.StringOrNil(obj["artifact_storage"].(string)),
540+
ServiceAccount: dcl.StringOrNil(obj["service_account"].(string)),
538541
WorkerPool: dcl.String(obj["worker_pool"].(string)),
539542
}
540543
}

‎google/resource_container_aws_cluster.go

-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ func ContainerAwsClusterControlPlaneSchema() *schema.Resource {
230230
"iam_instance_profile": {
231231
Type: schema.TypeString,
232232
Required: true,
233-
ForceNew: true,
234233
Description: "The name of the AWS IAM instance pofile to assign to each control plane replica.",
235234
},
236235

‎google/resource_container_aws_node_pool.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
192192
"iam_instance_profile": {
193193
Type: schema.TypeString,
194194
Required: true,
195-
ForceNew: true,
196195
Description: "The name of the AWS IAM role assigned to nodes in the pool.",
197196
},
198197

199198
"instance_type": {
200199
Type: schema.TypeString,
201200
Computed: true,
202201
Optional: true,
202+
ForceNew: true,
203203
Description: "Optional. The AWS instance type. When unspecified, it defaults to `m5.large`.",
204204
},
205205

‎google/resource_container_azure_cluster.go

-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ func ContainerAzureClusterControlPlaneSchema() *schema.Resource {
220220
"ssh_config": {
221221
Type: schema.TypeList,
222222
Required: true,
223-
ForceNew: true,
224223
Description: "SSH configuration for how to access the underlying control plane machines.",
225224
MaxItems: 1,
226225
Elem: ContainerAzureClusterControlPlaneSshConfigSchema(),
@@ -309,7 +308,6 @@ func ContainerAzureClusterControlPlaneSshConfigSchema() *schema.Resource {
309308
"authorized_key": {
310309
Type: schema.TypeString,
311310
Required: true,
312-
ForceNew: true,
313311
Description: "The SSH public key data for VMs managed by Anthos. This accepts the authorized_keys file format used in OpenSSH according to the sshd(8) manual page.",
314312
},
315313
},

‎google/resource_firebaserules_release.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ func resourceFirebaserulesRelease() *schema.Resource {
4949
Type: schema.TypeString,
5050
Required: true,
5151
ForceNew: true,
52-
Description: "Format: `projects/{project_id}/releases/{release_id}`",
52+
Description: "Format: `projects/{project_id}/releases/{release_id}`\\Firestore Rules Releases will **always** have the name 'cloud.firestore'",
5353
},
5454

5555
"ruleset_name": {
5656
Type: schema.TypeString,
5757
Required: true,
5858
DiffSuppressFunc: compareSelfLinkOrResourceName,
59-
Description: "Name of the `Ruleset` referred to by this `Release`. The `Ruleset` must exist the `Release` to be created.",
59+
Description: "Name of the `Ruleset` referred to by this `Release`. The `Ruleset` must exist for the `Release` to be created.",
6060
},
6161

6262
"project": {

‎website/docs/r/apikeys_key.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ The following arguments are supported:
164164

165165
* `name` -
166166
(Required)
167-
The resource name of the key. The name must be unique within the project, must conform with RFC-1034, is restricted to lower-cased letters, and has a maximum length of 63 characters. In another word, the name must match the regular expression: [a-z]([a-z0-9-]{0,61}[a-z0-9])?.
167+
The resource name of the key. The name must be unique within the project, must conform with RFC-1034, is restricted to lower-cased letters, and has a maximum length of 63 characters. In another word, the name must match the regular expression: `[a-z]([a-z0-9-]{0,61}[a-z0-9])?`.
168168

169169

170170

‎website/docs/r/firebaserules_release.html.markdown

+6-4
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ layout: "google"
1818
page_title: "Google: google_firebaserules_release"
1919
sidebar_current: "docs-google-firebaserules-release"
2020
description: |-
21-
The Firebaserules Release resource
21+
2222
---
2323

2424
# google_firebaserules_release
2525

26-
The Firebaserules Release resource
2726

27+
28+
For more information, see:
29+
* [Get started with Firebase Security Rules](https://firebase.google.com/docs/rules/get-started)
2830
## Example Usage - basic_release
2931
Creates a basic Firebase Rules Release
3032
```hcl
@@ -90,11 +92,11 @@ The following arguments are supported:
9092

9193
* `name` -
9294
(Required)
93-
Format: `projects/{project_id}/releases/{release_id}`
95+
Format: `projects/{project_id}/releases/{release_id}`\Firestore Rules Releases will **always** have the name 'cloud.firestore'
9496

9597
* `ruleset_name` -
9698
(Required)
97-
Name of the `Ruleset` referred to by this `Release`. The `Ruleset` must exist the `Release` to be created.
99+
Name of the `Ruleset` referred to by this `Release`. The `Ruleset` must exist for the `Release` to be created.
98100

99101

100102

‎website/docs/r/firebaserules_ruleset.html.markdown

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ layout: "google"
1818
page_title: "Google: google_firebaserules_ruleset"
1919
sidebar_current: "docs-google-firebaserules-ruleset"
2020
description: |-
21-
The Firebaserules Ruleset resource
21+
2222
---
2323

2424
# google_firebaserules_ruleset
2525

26-
The Firebaserules Ruleset resource
2726

27+
28+
For more information, see:
29+
* [Get started with Firebase Security Rules](https://firebase.google.com/docs/rules/get-started)
2830
## Example Usage - basic_ruleset
2931
Creates a basic Firestore ruleset
3032
```hcl

0 commit comments

Comments
 (0)