Skip to content

Commit

Permalink
Revert "Upgraded Eventarc trigger (#5704)" (#5733) (#11150)
Browse files Browse the repository at this point in the history
This reverts commit 2f178a5.

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Feb 23, 2022
1 parent 46a837a commit 8670cf0
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .changelog/5733.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/hashicorp/terraform-provider-google
require (
cloud.google.com/go/bigtable v1.10.1
cloud.google.com/go/iam v0.1.1 // indirect
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220210182700-d907d9756c56
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220125025424-6dfdf699127c
github.com/apparentlymart/go-cidr v1.1.0
github.com/client9/misspell v0.3.4
github.com/davecgh/go-spew v1.1.1
Expand Down
4 changes: 1 addition & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,4 @@ rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220210182700-d907d9756c56 h1:nLSqClKErKCpuI/k+kU88PWB0E8cr08fyD7hCjdsirk=
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220210182700-d907d9756c56/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
7 changes: 3 additions & 4 deletions google/resource_eventarc_trigger.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ func resourceEventarcTrigger() *schema.Resource {
"name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The resource name of the trigger. Must be unique within the location on the project.",
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.",
},

"labels": {
Expand Down Expand Up @@ -142,7 +141,7 @@ func EventarcTriggerDestinationSchema() *schema.Resource {
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: compareSelfLinkOrResourceName,
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}",
Description: "The Cloud Function resource name. Only Cloud Functions V2 is supported. Format: projects/{project}/locations/{location}/functions/{function}",
},

"cloud_run_service": {
Expand Down Expand Up @@ -223,7 +222,7 @@ func EventarcTriggerTransportPubsubSchema() *schema.Resource {
Optional: true,
ForceNew: true,
DiffSuppressFunc: compareSelfLinkOrResourceName,
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.",
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.",
},

"subscription": {
Expand Down
6 changes: 3 additions & 3 deletions website/docs/r/eventarc_trigger.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ The following arguments are supported:

* `name` -
(Required)
Required. The resource name of the trigger. Must be unique within the location on the project.
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.



The `destination` block supports:

* `cloud_function` -
(Optional)
[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}
The Cloud Function resource name. Only Cloud Functions V2 is supported. Format: projects/{project}/locations/{location}/functions/{function}

* `cloud_run_service` -
(Optional)
Expand Down Expand Up @@ -163,7 +163,7 @@ The `pubsub` block supports:

* `topic` -
(Optional)
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.
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.

## Attributes Reference

Expand Down

0 comments on commit 8670cf0

Please sign in to comment.