Revert "Migrate google_compute_firewall_policy_association resource from DCL to MMv1" (#12308) (#8684)

[upstream:c17d907f806a1cc95bed520c2e905a967fe8a122]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/12308.txt

@@ -0,0 +1,3 @@
+```release-note:note
+Remove release note for migrating `google_compute_firewall_association` from DCL to mmv1.
+```

google-beta/provider/provider_dcl_resources.go

@@ -36,26 +36,27 @@ 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_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_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-beta/provider/provider_mmv1_resources.go

@@ -505,9 +505,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 557
+// Generated resources: 556
 // Generated IAM resources: 291
-// Total generated resources: 848
+// Total generated resources: 847
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                                     accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                               accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -710,7 +710,6 @@ var generatedResources = map[string]*schema.Resource{
 	"google_compute_disk_resource_policy_attachment":                             compute.ResourceComputeDiskResourcePolicyAttachment(),
 	"google_compute_external_vpn_gateway":                                        compute.ResourceComputeExternalVpnGateway(),
 	"google_compute_firewall":                                                    compute.ResourceComputeFirewall(),
-	"google_compute_firewall_policy_association":                                 compute.ResourceComputeFirewallPolicyAssociation(),
 	"google_compute_firewall_policy_rule":                                        compute.ResourceComputeFirewallPolicyRule(),
 	"google_compute_firewall_policy_with_rules":                                  compute.ResourceComputeFirewallPolicyWithRules(),
 	"google_compute_forwarding_rule":                                             compute.ResourceComputeForwardingRule(),