Skip to content

Commit b3cf0f2

Browse files
Migrate google_compute_firewall_policy_association resource from DCL to MMv1 (#11358) (#8645)
[upstream:3850a583f7d4839598b5bd5e73bbb3163df398c8] Signed-off-by: Modular Magician <[email protected]>
1 parent 20bd8d5 commit b3cf0f2

7 files changed

+278
-136
lines changed

.changelog/11358.txt

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

google-beta/provider/provider_dcl_resources.go

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,26 @@ import (
3636
)
3737

3838
var dclResources = map[string]*schema.Resource{
39-
"google_apikeys_key": apikeys.ResourceApikeysKey(),
40-
"google_assured_workloads_workload": assuredworkloads.ResourceAssuredWorkloadsWorkload(),
41-
"google_cloudbuild_worker_pool": cloudbuild.ResourceCloudbuildWorkerPool(),
42-
"google_clouddeploy_delivery_pipeline": clouddeploy.ResourceClouddeployDeliveryPipeline(),
43-
"google_clouddeploy_target": clouddeploy.ResourceClouddeployTarget(),
44-
"google_compute_firewall_policy": compute.ResourceComputeFirewallPolicy(),
45-
"google_compute_firewall_policy_association": compute.ResourceComputeFirewallPolicyAssociation(),
46-
"google_container_aws_cluster": containeraws.ResourceContainerAwsCluster(),
47-
"google_container_aws_node_pool": containeraws.ResourceContainerAwsNodePool(),
48-
"google_container_azure_client": containerazure.ResourceContainerAzureClient(),
49-
"google_container_azure_cluster": containerazure.ResourceContainerAzureCluster(),
50-
"google_container_azure_node_pool": containerazure.ResourceContainerAzureNodePool(),
51-
"google_dataplex_asset": dataplex.ResourceDataplexAsset(),
52-
"google_dataplex_lake": dataplex.ResourceDataplexLake(),
53-
"google_dataplex_zone": dataplex.ResourceDataplexZone(),
54-
"google_dataproc_workflow_template": dataproc.ResourceDataprocWorkflowTemplate(),
55-
"google_eventarc_channel": eventarc.ResourceEventarcChannel(),
56-
"google_eventarc_google_channel_config": eventarc.ResourceEventarcGoogleChannelConfig(),
57-
"google_eventarc_trigger": eventarc.ResourceEventarcTrigger(),
58-
"google_firebaserules_release": firebaserules.ResourceFirebaserulesRelease(),
59-
"google_firebaserules_ruleset": firebaserules.ResourceFirebaserulesRuleset(),
60-
"google_gke_hub_feature_membership": gkehub.ResourceGkeHubFeatureMembership(),
61-
"google_recaptcha_enterprise_key": recaptchaenterprise.ResourceRecaptchaEnterpriseKey(),
39+
"google_apikeys_key": apikeys.ResourceApikeysKey(),
40+
"google_assured_workloads_workload": assuredworkloads.ResourceAssuredWorkloadsWorkload(),
41+
"google_cloudbuild_worker_pool": cloudbuild.ResourceCloudbuildWorkerPool(),
42+
"google_clouddeploy_delivery_pipeline": clouddeploy.ResourceClouddeployDeliveryPipeline(),
43+
"google_clouddeploy_target": clouddeploy.ResourceClouddeployTarget(),
44+
"google_compute_firewall_policy": compute.ResourceComputeFirewallPolicy(),
45+
"google_container_aws_cluster": containeraws.ResourceContainerAwsCluster(),
46+
"google_container_aws_node_pool": containeraws.ResourceContainerAwsNodePool(),
47+
"google_container_azure_client": containerazure.ResourceContainerAzureClient(),
48+
"google_container_azure_cluster": containerazure.ResourceContainerAzureCluster(),
49+
"google_container_azure_node_pool": containerazure.ResourceContainerAzureNodePool(),
50+
"google_dataplex_asset": dataplex.ResourceDataplexAsset(),
51+
"google_dataplex_lake": dataplex.ResourceDataplexLake(),
52+
"google_dataplex_zone": dataplex.ResourceDataplexZone(),
53+
"google_dataproc_workflow_template": dataproc.ResourceDataprocWorkflowTemplate(),
54+
"google_eventarc_channel": eventarc.ResourceEventarcChannel(),
55+
"google_eventarc_google_channel_config": eventarc.ResourceEventarcGoogleChannelConfig(),
56+
"google_eventarc_trigger": eventarc.ResourceEventarcTrigger(),
57+
"google_firebaserules_release": firebaserules.ResourceFirebaserulesRelease(),
58+
"google_firebaserules_ruleset": firebaserules.ResourceFirebaserulesRuleset(),
59+
"google_gke_hub_feature_membership": gkehub.ResourceGkeHubFeatureMembership(),
60+
"google_recaptcha_enterprise_key": recaptchaenterprise.ResourceRecaptchaEnterpriseKey(),
6261
}

google-beta/provider/provider_mmv1_resources.go

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

506506
// Resources
507-
// Generated resources: 553
507+
// Generated resources: 554
508508
// Generated IAM resources: 291
509-
// Total generated resources: 844
509+
// Total generated resources: 845
510510
var generatedResources = map[string]*schema.Resource{
511511
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
512512
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -709,6 +709,7 @@ var generatedResources = map[string]*schema.Resource{
709709
"google_compute_disk_resource_policy_attachment": compute.ResourceComputeDiskResourcePolicyAttachment(),
710710
"google_compute_external_vpn_gateway": compute.ResourceComputeExternalVpnGateway(),
711711
"google_compute_firewall": compute.ResourceComputeFirewall(),
712+
"google_compute_firewall_policy_association": compute.ResourceComputeFirewallPolicyAssociation(),
712713
"google_compute_firewall_policy_rule": compute.ResourceComputeFirewallPolicyRule(),
713714
"google_compute_firewall_policy_with_rules": compute.ResourceComputeFirewallPolicyWithRules(),
714715
"google_compute_forwarding_rule": compute.ResourceComputeForwardingRule(),

0 commit comments

Comments
 (0)