Migrate GA version of compute firewall policy (#13184) (#21854)

[upstream:94029cc11a1a92a9b6b0ed58fb843f8aff897b11]

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

Author: modular-magician

.changelog/13184.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google/provider/provider_dcl_resources.go

@@ -24,7 +24,6 @@ import (
 	"github.com/hashicorp/terraform-provider-google/google/services/assuredworkloads"
 	"github.com/hashicorp/terraform-provider-google/google/services/cloudbuild"
 	"github.com/hashicorp/terraform-provider-google/google/services/clouddeploy"
-	"github.com/hashicorp/terraform-provider-google/google/services/compute"
 	"github.com/hashicorp/terraform-provider-google/google/services/containeraws"
 	"github.com/hashicorp/terraform-provider-google/google/services/containerazure"
 	"github.com/hashicorp/terraform-provider-google/google/services/dataplex"
@@ -40,7 +39,6 @@ var dclResources = map[string]*schema.Resource{
 	"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/provider/provider_mmv1_resources.go

@@ -488,9 +488,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
 }
 
 // Resources
-// Generated resources: 553
+// Generated resources: 554
 // Generated IAM resources: 276
-// Total generated resources: 829
+// Total generated resources: 830
 var generatedResources = map[string]*schema.Resource{
 	"google_folder_access_approval_settings":                                     accessapproval.ResourceAccessApprovalFolderSettings(),
 	"google_organization_access_approval_settings":                               accessapproval.ResourceAccessApprovalOrganizationSettings(),
@@ -692,6 +692,7 @@ 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":                                             compute.ResourceComputeFirewallPolicy(),
 	"google_compute_firewall_policy_association":                                 compute.ResourceComputeFirewallPolicyAssociation(),
 	"google_compute_firewall_policy_rule":                                        compute.ResourceComputeFirewallPolicyRule(),
 	"google_compute_forwarding_rule":                                             compute.ResourceComputeForwardingRule(),

google/services/compute/resource_compute_firewall_policy.go

@@ -0,0 +1,18 @@
+resource: 'google_compute_firewall_policy'
+generation_type: 'mmv1'
+source_file: 'products/compute/FirewallPolicy.yaml'
+api_service_name: 'compute.googleapis.com'
+api_version: 'v1'
+api_resource_type_kind: 'FirewallPolicy'
+fields:
+  - field: 'creation_timestamp'
+  - field: 'description'
+  - field: 'fingerprint'
+  - field: 'firewall_policy_id'
+    api_field: 'id'
+  - field: 'name'
+  - field: 'parent'
+  - field: 'rule_tuple_count'
+  - field: 'self_link'
+  - field: 'self_link_with_id'
+  - field: 'short_name'

google/services/compute/resource_compute_firewall_policy_generated_meta.yaml

@@ -0,0 +1,106 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+// ----------------------------------------------------------------------------
+//
+//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
+//
+// ----------------------------------------------------------------------------
+//
+//     This file is automatically generated by Magic Modules and manual
+//     changes will be clobbered when the file is regenerated.
+//
+//     Please read more about how to change this file in
+//     .github/CONTRIBUTING.md.
+//
+// ----------------------------------------------------------------------------
+
+package compute_test
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
+	"github.com/hashicorp/terraform-provider-google/google/tpgresource"
+	transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
+)
+
+func TestAccComputeFirewallPolicy_firewallPolicyExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"org_id":        envvar.GetTestOrgFromEnv(t),
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeFirewallPolicyDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeFirewallPolicy_firewallPolicyExample(context),
+			},
+			{
+				ResourceName:      "google_compute_firewall_policy.default",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccComputeFirewallPolicy_firewallPolicyExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_firewall_policy" "default" {
+  parent      = "organizations/%{org_id}"
+  short_name  = "tf-test-my-policy%{random_suffix}"
+  description = "Example Resource"
+}
+`, context)
+}
+
+func testAccCheckComputeFirewallPolicyDestroyProducer(t *testing.T) func(s *terraform.State) error {
+	return func(s *terraform.State) error {
+		for name, rs := range s.RootModule().Resources {
+			if rs.Type != "google_compute_firewall_policy" {
+				continue
+			}
+			if strings.HasPrefix(name, "data.") {
+				continue
+			}
+
+			config := acctest.GoogleProviderConfig(t)
+
+			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{ComputeBasePath}}locations/global/firewallPolicies/{{name}}")
+			if err != nil {
+				return err
+			}
+
+			billingProject := ""
+
+			if config.BillingProject != "" {
+				billingProject = config.BillingProject
+			}
+
+			_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
+				Config:    config,
+				Method:    "GET",
+				Project:   billingProject,
+				RawURL:    url,
+				UserAgent: config.UserAgent,
+			})
+			if err == nil {
+				return fmt.Errorf("ComputeFirewallPolicy still exists at %s", url)
+			}
+		}
+
+		return nil
+	}
+}

google/services/compute/resource_compute_firewall_policy_generated_test.go

@@ -29,7 +29,6 @@ import (
 	cloudbuild "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudbuild"
 	clouddeploy "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/clouddeploy"
 	cloudresourcemanager "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/cloudresourcemanager"
-	compute "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/compute"
 	containeraws "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containeraws"
 	containerazure "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/containerazure"
 	dataplex "github.com/GoogleCloudPlatform/declarative-resource-client-library/services/google/dataplex"
@@ -154,29 +153,6 @@ func NewDCLCloudResourceManagerClient(config *Config, userAgent, billingProject
 	return cloudresourcemanager.NewClient(dclConfig)
 }
 
-func NewDCLComputeClient(config *Config, userAgent, billingProject string, timeout time.Duration) *compute.Client {
-	configOptions := []dcl.ConfigOption{
-		dcl.WithHTTPClient(config.Client),
-		dcl.WithUserAgent(userAgent),
-		dcl.WithLogger(dclLogger{}),
-		dcl.WithBasePath(config.ComputeBasePath),
-	}
-
-	if timeout != 0 {
-		configOptions = append(configOptions, dcl.WithTimeout(timeout))
-	}
-
-	if config.UserProjectOverride {
-		configOptions = append(configOptions, dcl.WithUserProjectOverride())
-		if billingProject != "" {
-			configOptions = append(configOptions, dcl.WithBillingProject(billingProject))
-		}
-	}
-
-	dclConfig := dcl.NewConfig(configOptions...)
-	return compute.NewClient(dclConfig)
-}
-
 func NewDCLContainerAwsClient(config *Config, userAgent, billingProject string, timeout time.Duration) *containeraws.Client {
 	configOptions := []dcl.ConfigOption{
 		dcl.WithHTTPClient(config.Client),

google/transport/provider_dcl_client_creation.go

@@ -27,8 +27,6 @@ This resource should be generally be used with `google_compute_firewall_policy_a
 
 For more information see the [official documentation](https://cloud.google.com/vpc/docs/firewall-policies)
 
-~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
-See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
 
 To get more information about FirewallPolicy, see:
 
@@ -39,8 +37,6 @@ To get more information about FirewallPolicy, see:
 
 ```hcl
 resource "google_compute_firewall_policy" "default" {
-  provider = google-beta
-  
   parent      = "organizations/123456789"
   short_name  = "my-policy"
   description = "Example Resource"