Skip to content

Commit 8628570

Browse files
Migrate google_eventarc_channel resource from DCL to MMv1 (#13026) (#21728)
[upstream:b5b16acae11517af094a5b70d7f12f0d55bfe809] Signed-off-by: Modular Magician <[email protected]>
1 parent 55f053a commit 8628570

13 files changed

+699
-455
lines changed

.changelog/13026.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:note
2+
eventarc: `google_eventarc_channel` now uses MMv1 engine instead of DCL.
3+
```

google/provider/provider_dcl_resources.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"github.com/hashicorp/terraform-provider-google/google/services/containerazure"
3030
"github.com/hashicorp/terraform-provider-google/google/services/dataplex"
3131
"github.com/hashicorp/terraform-provider-google/google/services/dataproc"
32-
"github.com/hashicorp/terraform-provider-google/google/services/eventarc"
3332
"github.com/hashicorp/terraform-provider-google/google/services/firebaserules"
3433
"github.com/hashicorp/terraform-provider-google/google/services/gkehub"
3534
"github.com/hashicorp/terraform-provider-google/google/services/recaptchaenterprise"
@@ -51,7 +50,6 @@ var dclResources = map[string]*schema.Resource{
5150
"google_dataplex_lake": dataplex.ResourceDataplexLake(),
5251
"google_dataplex_zone": dataplex.ResourceDataplexZone(),
5352
"google_dataproc_workflow_template": dataproc.ResourceDataprocWorkflowTemplate(),
54-
"google_eventarc_channel": eventarc.ResourceEventarcChannel(),
5553
"google_firebaserules_release": firebaserules.ResourceFirebaserulesRelease(),
5654
"google_firebaserules_ruleset": firebaserules.ResourceFirebaserulesRuleset(),
5755
"google_gke_hub_feature_membership": gkehub.ResourceGkeHubFeatureMembership(),

google/provider/provider_mmv1_resources.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
486486
}
487487

488488
// Resources
489-
// Generated resources: 544
489+
// Generated resources: 545
490490
// Generated IAM resources: 276
491-
// Total generated resources: 820
491+
// Total generated resources: 821
492492
var generatedResources = map[string]*schema.Resource{
493493
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
494494
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -912,6 +912,7 @@ var generatedResources = map[string]*schema.Resource{
912912
"google_edgenetwork_network": edgenetwork.ResourceEdgenetworkNetwork(),
913913
"google_edgenetwork_subnet": edgenetwork.ResourceEdgenetworkSubnet(),
914914
"google_essential_contacts_contact": essentialcontacts.ResourceEssentialContactsContact(),
915+
"google_eventarc_channel": eventarc.ResourceEventarcChannel(),
915916
"google_eventarc_google_channel_config": eventarc.ResourceEventarcGoogleChannelConfig(),
916917
"google_eventarc_message_bus": eventarc.ResourceEventarcMessageBus(),
917918
"google_eventarc_trigger": eventarc.ResourceEventarcTrigger(),

google/services/eventarc/eventarc_operation.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@ func (w *EventarcOperationWaiter) QueryOp() (interface{}, error) {
4242
url := fmt.Sprintf("%s%s", w.Config.EventarcBasePath, w.CommonOperationWaiter.Op.Name)
4343

4444
return transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
45-
Config: w.Config,
46-
Method: "GET",
47-
Project: w.Project,
48-
RawURL: url,
49-
UserAgent: w.UserAgent,
45+
Config: w.Config,
46+
Method: "GET",
47+
Project: w.Project,
48+
RawURL: url,
49+
UserAgent: w.UserAgent,
50+
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.EventarcChannel403Retry},
5051
})
5152
}
5253

0 commit comments

Comments
 (0)