Migrate Network Firewall Policy Association (global and region) resou…

…rce from DCL to MMv1 (#11366) (#19976) [upstream:9a1402bf3fa39860cad1fb258010cbf01450e8d8] Signed-off-by: Modular Magician <[email protected]>
hashicorp · Oct 23, 2024 · 6271874 · 6271874
1 parent d99ec20
commit 6271874
Show file tree

Hide file tree

Showing 12 changed files with 823 additions and 460 deletions.
diff --git a/.changelog/11366.txt b/.changelog/11366.txt
@@ -0,0 +1,6 @@
+```release-note:enhancement
+compute: `google_compute_network_firewall_policy_association` now uses MMv1 engine instead of DCL.
+```
+```release-note:enhancement
+compute: `google_compute_region_network_firewall_policy_association` now uses MMv1 engine instead of DCL.
+```
diff --git a/google/provider/provider_dcl_resources.go b/google/provider/provider_dcl_resources.go
@@ -36,30 +36,28 @@ import (
 )
 
 var dclResources = map[string]*schema.Resource{
-	"google_apikeys_key":                                        apikeys.ResourceApikeysKey(),
-	"google_assured_workloads_workload":                         assuredworkloads.ResourceAssuredWorkloadsWorkload(),
-	"google_cloudbuild_worker_pool":                             cloudbuild.ResourceCloudbuildWorkerPool(),
-	"google_clouddeploy_delivery_pipeline":                      clouddeploy.ResourceClouddeployDeliveryPipeline(),
-	"google_clouddeploy_target":                                 clouddeploy.ResourceClouddeployTarget(),
-	"google_compute_firewall_policy":                            compute.ResourceComputeFirewallPolicy(),
-	"google_compute_firewall_policy_association":                compute.ResourceComputeFirewallPolicyAssociation(),
-	"google_compute_firewall_policy_rule":                       compute.ResourceComputeFirewallPolicyRule(),
-	"google_compute_network_firewall_policy_association":        compute.ResourceComputeNetworkFirewallPolicyAssociation(),
-	"google_compute_region_network_firewall_policy_association": compute.ResourceComputeRegionNetworkFirewallPolicyAssociation(),
-	"google_container_aws_cluster":                              containeraws.ResourceContainerAwsCluster(),
-	"google_container_aws_node_pool":                            containeraws.ResourceContainerAwsNodePool(),
-	"google_container_azure_client":                             containerazure.ResourceContainerAzureClient(),
-	"google_container_azure_cluster":                            containerazure.ResourceContainerAzureCluster(),
-	"google_container_azure_node_pool":                          containerazure.ResourceContainerAzureNodePool(),
-	"google_dataplex_asset":                                     dataplex.ResourceDataplexAsset(),
-	"google_dataplex_lake":                                      dataplex.ResourceDataplexLake(),
-	"google_dataplex_zone":                                      dataplex.ResourceDataplexZone(),
-	"google_dataproc_workflow_template":                         dataproc.ResourceDataprocWorkflowTemplate(),
-	"google_eventarc_channel":                                   eventarc.ResourceEventarcChannel(),
-	"google_eventarc_google_channel_config":                     eventarc.ResourceEventarcGoogleChannelConfig(),
-	"google_eventarc_trigger":                                   eventarc.ResourceEventarcTrigger(),
-	"google_firebaserules_release":                              firebaserules.ResourceFirebaserulesRelease(),
-	"google_firebaserules_ruleset":                              firebaserules.ResourceFirebaserulesRuleset(),
-	"google_gke_hub_feature_membership":                         gkehub.ResourceGkeHubFeatureMembership(),
-	"google_recaptcha_enterprise_key":                           recaptchaenterprise.ResourceRecaptchaEnterpriseKey(),
+	"google_apikeys_key":                         apikeys.ResourceApikeysKey(),
+	"google_assured_workloads_workload":          assuredworkloads.ResourceAssuredWorkloadsWorkload(),
+	"google_cloudbuild_worker_pool":              cloudbuild.ResourceCloudbuildWorkerPool(),
+	"google_clouddeploy_delivery_pipeline":       clouddeploy.ResourceClouddeployDeliveryPipeline(),
+	"google_clouddeploy_target":                  clouddeploy.ResourceClouddeployTarget(),
+	"google_compute_firewall_policy":             compute.ResourceComputeFirewallPolicy(),
+	"google_compute_firewall_policy_association": compute.ResourceComputeFirewallPolicyAssociation(),
+	"google_compute_firewall_policy_rule":        compute.ResourceComputeFirewallPolicyRule(),
+	"google_container_aws_cluster":               containeraws.ResourceContainerAwsCluster(),
+	"google_container_aws_node_pool":             containeraws.ResourceContainerAwsNodePool(),
+	"google_container_azure_client":              containerazure.ResourceContainerAzureClient(),
+	"google_container_azure_cluster":             containerazure.ResourceContainerAzureCluster(),
+	"google_container_azure_node_pool":           containerazure.ResourceContainerAzureNodePool(),
+	"google_dataplex_asset":                      dataplex.ResourceDataplexAsset(),
+	"google_dataplex_lake":                       dataplex.ResourceDataplexLake(),
+	"google_dataplex_zone":                       dataplex.ResourceDataplexZone(),
+	"google_dataproc_workflow_template":          dataproc.ResourceDataprocWorkflowTemplate(),
+	"google_eventarc_channel":                    eventarc.ResourceEventarcChannel(),
+	"google_eventarc_google_channel_config":      eventarc.ResourceEventarcGoogleChannelConfig(),
+	"google_eventarc_trigger":                    eventarc.ResourceEventarcTrigger(),
+	"google_firebaserules_release":               firebaserules.ResourceFirebaserulesRelease(),
+	"google_firebaserules_ruleset":               firebaserules.ResourceFirebaserulesRuleset(),
+	"google_gke_hub_feature_membership":          gkehub.ResourceGkeHubFeatureMembership(),
+	"google_recaptcha_enterprise_key":            recaptchaenterprise.ResourceRecaptchaEnterpriseKey(),
 }
diff --git a/google/provider/provider_mmv1_resources.go b/google/provider/provider_mmv1_resources.go
@@ -447,9 +447,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 479
+// Generated resources: 481
 // Generated IAM resources: 261
-// Total generated resources: 740
+// Total generated resources: 742
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                                     accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                               accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -655,6 +655,7 @@ var generatedResources = map[string]*schema.Resource{
 	"google_compute_network_endpoint_group":                                      compute.ResourceComputeNetworkEndpointGroup(),
 	"google_compute_network_endpoints":                                           compute.ResourceComputeNetworkEndpoints(),
 	"google_compute_network_firewall_policy":                                     compute.ResourceComputeNetworkFirewallPolicy(),
+	"google_compute_network_firewall_policy_association":                         compute.ResourceComputeNetworkFirewallPolicyAssociation(),
 	"google_compute_network_firewall_policy_rule":                                compute.ResourceComputeNetworkFirewallPolicyRule(),
 	"google_compute_network_peering_routes_config":                               compute.ResourceComputeNetworkPeeringRoutesConfig(),
 	"google_compute_node_group":                                                  compute.ResourceComputeNodeGroup(),
@@ -676,6 +677,7 @@ var generatedResources = map[string]*schema.Resource{
 	"google_compute_region_network_endpoint":                                     compute.ResourceComputeRegionNetworkEndpoint(),
 	"google_compute_region_network_endpoint_group":                               compute.ResourceComputeRegionNetworkEndpointGroup(),
 	"google_compute_region_network_firewall_policy":                              compute.ResourceComputeRegionNetworkFirewallPolicy(),
+	"google_compute_region_network_firewall_policy_association":                  compute.ResourceComputeRegionNetworkFirewallPolicyAssociation(),
 	"google_compute_region_network_firewall_policy_rule":                         compute.ResourceComputeRegionNetworkFirewallPolicyRule(),
 	"google_compute_region_per_instance_config":                                  compute.ResourceComputeRegionPerInstanceConfig(),
 	"google_compute_region_ssl_certificate":                                      compute.ResourceComputeRegionSslCertificate(),