Skip to content

Commit 3cfb128

Browse files
Upgrade dcl (#5762) (#4090)
* upgrade dcl * Fix go.sum Signed-off-by: Modular Magician <[email protected]>
1 parent 28c17be commit 3cfb128

File tree

8 files changed

+1292
-706
lines changed

8 files changed

+1292
-706
lines changed

.changelog/5762.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/hashicorp/terraform-provider-google-beta
22
require (
33
cloud.google.com/go/bigtable v1.10.1
44
cloud.google.com/go/iam v0.1.1 // indirect
5-
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220125025424-6dfdf699127c
5+
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220225200700-e76d50f1e637
66
github.com/apparentlymart/go-cidr v1.1.0
77
github.com/client9/misspell v0.3.4
88
github.com/davecgh/go-spew v1.1.1

go.sum

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,4 +1502,6 @@ rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
15021502
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
15031503
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
15041504
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1505-
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
1505+
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
1506+
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220225200700-e76d50f1e637 h1:+s2wWcAciNo96AT+Ci9pwXuWm9qlY/ubLFWRaqE0tZg=
1507+
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220225200700-e76d50f1e637/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=

google-beta/resource_cloudbuild_worker_pool.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ func CloudbuildWorkerPoolWorkerConfigSchema() *schema.Resource {
163163

164164
"no_external_ip": {
165165
Type: schema.TypeBool,
166+
Computed: true,
166167
Optional: true,
167168
Description: "If true, workers are created without any public address, which prevents network egress to public IPs.",
168169
},

google-beta/resource_dataproc_workflow_template.go

Lines changed: 1274 additions & 696 deletions
Large diffs are not rendered by default.

google-beta/resource_eventarc_trigger.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ func resourceEventarcTrigger() *schema.Resource {
7171
"name": {
7272
Type: schema.TypeString,
7373
Required: true,
74-
Description: "Required. The resource name of the trigger. Must be unique within the location on the project and must be in `projects/{project}/locations/{location}/triggers/{trigger}` format.",
74+
ForceNew: true,
75+
Description: "Required. The resource name of the trigger. Must be unique within the location on the project.",
7576
},
7677

7778
"labels": {
@@ -141,7 +142,7 @@ func EventarcTriggerDestinationSchema() *schema.Resource {
141142
Type: schema.TypeString,
142143
Optional: true,
143144
DiffSuppressFunc: compareSelfLinkOrResourceName,
144-
Description: "The Cloud Function resource name. Only Cloud Functions V2 is supported. Format: projects/{project}/locations/{location}/functions/{function}",
145+
Description: "[WARNING] Configuring a Cloud Function in Trigger is not supported as of today. The Cloud Function resource name. Format: projects/{project}/locations/{location}/functions/{function}",
145146
},
146147

147148
"cloud_run_service": {
@@ -222,7 +223,7 @@ func EventarcTriggerTransportPubsubSchema() *schema.Resource {
222223
Optional: true,
223224
ForceNew: true,
224225
DiffSuppressFunc: compareSelfLinkOrResourceName,
225-
Description: "Optional. The name of the Pub/Sub topic created and managed by Eventarc system as a transport for the event delivery. Format: `projects/{PROJECT_ID}/topics/{TOPIC_NAME You may set an existing topic for triggers of the type google.cloud.pubsub.topic.v1.messagePublished` only. The topic you provide here will not be deleted by Eventarc at trigger deletion.",
226+
Description: "Optional. The name of the Pub/Sub topic created and managed by Eventarc system as a transport for the event delivery. Format: `projects/{PROJECT_ID}/topics/{TOPIC_NAME}. You may set an existing topic for triggers of the type google.cloud.pubsub.topic.v1.messagePublished` only. The topic you provide here will not be deleted by Eventarc at trigger deletion.",
226227
},
227228

228229
"subscription": {

google-beta/resource_gke_hub_feature_membership.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ func GkeHubFeatureMembershipConfigmanagementSchema() *schema.Resource {
125125

126126
"version": {
127127
Type: schema.TypeString,
128+
Computed: true,
128129
Optional: true,
129-
Description: "Version of ACM installed.",
130+
Description: "Optional. Version of ACM to install. Defaults to the latest version.",
130131
},
131132
},
132133
}
@@ -533,7 +534,7 @@ func expandGkeHubFeatureMembershipConfigmanagement(o interface{}) *gkehub.Featur
533534
ConfigSync: expandGkeHubFeatureMembershipConfigmanagementConfigSync(obj["config_sync"]),
534535
HierarchyController: expandGkeHubFeatureMembershipConfigmanagementHierarchyController(obj["hierarchy_controller"]),
535536
PolicyController: expandGkeHubFeatureMembershipConfigmanagementPolicyController(obj["policy_controller"]),
536-
Version: dcl.String(obj["version"].(string)),
537+
Version: dcl.StringOrNil(obj["version"].(string)),
537538
}
538539
}
539540

website/docs/r/eventarc_trigger.html.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ The following arguments are supported:
9292

9393
* `name` -
9494
(Required)
95-
Required. The resource name of the trigger. Must be unique within the location on the project and must be in `projects/{project}/locations/{location}/triggers/{trigger}` format.
95+
Required. The resource name of the trigger. Must be unique within the location on the project.
9696

9797

9898

9999
The `destination` block supports:
100100

101101
* `cloud_function` -
102102
(Optional)
103-
The Cloud Function resource name. Only Cloud Functions V2 is supported. Format: projects/{project}/locations/{location}/functions/{function}
103+
[WARNING] Configuring a Cloud Function in Trigger is not supported as of today. The Cloud Function resource name. Format: projects/{project}/locations/{location}/functions/{function}
104104

105105
* `cloud_run_service` -
106106
(Optional)
@@ -163,7 +163,7 @@ The `pubsub` block supports:
163163

164164
* `topic` -
165165
(Optional)
166-
Optional. The name of the Pub/Sub topic created and managed by Eventarc system as a transport for the event delivery. Format: `projects/{PROJECT_ID}/topics/{TOPIC_NAME You may set an existing topic for triggers of the type google.cloud.pubsub.topic.v1.messagePublished` only. The topic you provide here will not be deleted by Eventarc at trigger deletion.
166+
Optional. The name of the Pub/Sub topic created and managed by Eventarc system as a transport for the event delivery. Format: `projects/{PROJECT_ID}/topics/{TOPIC_NAME}. You may set an existing topic for triggers of the type google.cloud.pubsub.topic.v1.messagePublished` only. The topic you provide here will not be deleted by Eventarc at trigger deletion.
167167

168168
## Attributes Reference
169169

0 commit comments

Comments
 (0)