Revert "Add support for network_firewall_policy and region_network_fi…

…rewall_policy (#6693) (#12969)" This reverts commit e54d603.
hashicorp · Nov 11, 2022 · 2de3066 · 2de3066
1 parent 6c2af02
commit 2de3066
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 1,320 deletions.
diff --git a/.changelog/6693.txt b/.changelog/6693.txt
diff --git a/google/provider_dcl_resources.go b/google/provider_dcl_resources.go
@@ -20,35 +20,33 @@ import (
 )
 
 var dclResources = map[string]*schema.Resource{
-	"google_apikeys_key":                            resourceApikeysKey(),
-	"google_assured_workloads_workload":             resourceAssuredWorkloadsWorkload(),
-	"google_bigquery_reservation_assignment":        resourceBigqueryReservationAssignment(),
-	"google_cloudbuild_worker_pool":                 resourceCloudbuildWorkerPool(),
-	"google_clouddeploy_delivery_pipeline":          resourceClouddeployDeliveryPipeline(),
-	"google_clouddeploy_target":                     resourceClouddeployTarget(),
-	"google_compute_firewall_policy":                resourceComputeFirewallPolicy(),
-	"google_compute_firewall_policy_association":    resourceComputeFirewallPolicyAssociation(),
-	"google_compute_firewall_policy_rule":           resourceComputeFirewallPolicyRule(),
-	"google_compute_region_network_firewall_policy": resourceComputeRegionNetworkFirewallPolicy(),
-	"google_compute_network_firewall_policy":        resourceComputeNetworkFirewallPolicy(),
-	"google_container_aws_cluster":                  resourceContainerAwsCluster(),
-	"google_container_aws_node_pool":                resourceContainerAwsNodePool(),
-	"google_container_azure_client":                 resourceContainerAzureClient(),
-	"google_container_azure_cluster":                resourceContainerAzureCluster(),
-	"google_container_azure_node_pool":              resourceContainerAzureNodePool(),
-	"google_dataplex_asset":                         resourceDataplexAsset(),
-	"google_dataplex_lake":                          resourceDataplexLake(),
-	"google_dataplex_zone":                          resourceDataplexZone(),
-	"google_dataproc_workflow_template":             resourceDataprocWorkflowTemplate(),
-	"google_eventarc_trigger":                       resourceEventarcTrigger(),
-	"google_firebaserules_release":                  resourceFirebaserulesRelease(),
-	"google_firebaserules_ruleset":                  resourceFirebaserulesRuleset(),
-	"google_logging_log_view":                       resourceLoggingLogView(),
-	"google_monitoring_monitored_project":           resourceMonitoringMonitoredProject(),
-	"google_network_connectivity_hub":               resourceNetworkConnectivityHub(),
-	"google_network_connectivity_spoke":             resourceNetworkConnectivitySpoke(),
-	"google_org_policy_policy":                      resourceOrgPolicyPolicy(),
-	"google_os_config_os_policy_assignment":         resourceOsConfigOsPolicyAssignment(),
-	"google_privateca_certificate_template":         resourcePrivatecaCertificateTemplate(),
-	"google_recaptcha_enterprise_key":               resourceRecaptchaEnterpriseKey(),
+	"google_apikeys_key":                         resourceApikeysKey(),
+	"google_assured_workloads_workload":          resourceAssuredWorkloadsWorkload(),
+	"google_bigquery_reservation_assignment":     resourceBigqueryReservationAssignment(),
+	"google_cloudbuild_worker_pool":              resourceCloudbuildWorkerPool(),
+	"google_clouddeploy_delivery_pipeline":       resourceClouddeployDeliveryPipeline(),
+	"google_clouddeploy_target":                  resourceClouddeployTarget(),
+	"google_compute_firewall_policy":             resourceComputeFirewallPolicy(),
+	"google_compute_firewall_policy_association": resourceComputeFirewallPolicyAssociation(),
+	"google_compute_firewall_policy_rule":        resourceComputeFirewallPolicyRule(),
+	"google_container_aws_cluster":               resourceContainerAwsCluster(),
+	"google_container_aws_node_pool":             resourceContainerAwsNodePool(),
+	"google_container_azure_client":              resourceContainerAzureClient(),
+	"google_container_azure_cluster":             resourceContainerAzureCluster(),
+	"google_container_azure_node_pool":           resourceContainerAzureNodePool(),
+	"google_dataplex_asset":                      resourceDataplexAsset(),
+	"google_dataplex_lake":                       resourceDataplexLake(),
+	"google_dataplex_zone":                       resourceDataplexZone(),
+	"google_dataproc_workflow_template":          resourceDataprocWorkflowTemplate(),
+	"google_eventarc_trigger":                    resourceEventarcTrigger(),
+	"google_firebaserules_release":               resourceFirebaserulesRelease(),
+	"google_firebaserules_ruleset":               resourceFirebaserulesRuleset(),
+	"google_logging_log_view":                    resourceLoggingLogView(),
+	"google_monitoring_monitored_project":        resourceMonitoringMonitoredProject(),
+	"google_network_connectivity_hub":            resourceNetworkConnectivityHub(),
+	"google_network_connectivity_spoke":          resourceNetworkConnectivitySpoke(),
+	"google_org_policy_policy":                   resourceOrgPolicyPolicy(),
+	"google_os_config_os_policy_assignment":      resourceOsConfigOsPolicyAssignment(),
+	"google_privateca_certificate_template":      resourcePrivatecaCertificateTemplate(),
+	"google_recaptcha_enterprise_key":            resourceRecaptchaEnterpriseKey(),
 }
diff --git a/google/resource_compute_network_firewall_policy.go b/google/resource_compute_network_firewall_policy.go