Promote Packet Broker Security Profile to GA. (GoogleCloudPlatform#16403)

duvni · web-flow · commit e5db79b930c0 · 2026-02-17T15:02:30.000Z
diff --git a/mmv1/products/networksecurity/SecurityProfile.yaml b/mmv1/products/networksecurity/SecurityProfile.yaml
@@ -59,7 +59,6 @@ examples:
     test_env_vars:
       org_id: 'ORG_ID'
   - name: 'network_security_security_profile_mirroring'
-    min_version: 'beta'
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-security-profile'
@@ -87,7 +86,6 @@ examples:
       org_id: 'ORG_ID'
     tgc_skip_test: The ENUM value URL_FILTERING in type field is transformed to UNKNOWN_ENUM_VALUE_ProfileType_5 in CAI asset. The reason could be that URL_FILTERING is not supported in CAI yet. Will check if the value in CAI assets will be correct later.
   - name: network_security_security_profile_broker
-    min_version: 'beta'
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-security-profile'
@@ -309,7 +307,6 @@ properties:
           This field is used for Packet Broker mirroring endpoint groups to specify
           the deployment groups that the packet should be mirrored to by the broker.
           Format: projects/{project_id}/locations/global/mirroringDeploymentGroups/{deployment_group_id}
-        min_version: 'beta'
       - name: 'mirroringEndpointGroupType'
         type: String
         description: |-
@@ -318,7 +315,6 @@ properties:
           DIRECT
           BROKER
         output: true
-        min_version: 'beta'
     conflicts:
       - 'threatPreventionProfile'
       - 'urlFilteringProfile'
diff --git a/mmv1/templates/terraform/examples/network_security_security_profile_broker.tf.tmpl b/mmv1/templates/terraform/examples/network_security_security_profile_broker.tf.tmpl
@@ -1,26 +1,22 @@
 resource "google_compute_network" "default" {
-  provider                = google-beta
   name                    = "{{index $.Vars "network_name"}}"
   auto_create_subnetworks = false
 }
 
 resource "google_network_security_mirroring_deployment_group" "default" {
-  provider                      = google-beta
   mirroring_deployment_group_id = "{{index $.Vars "deployment_group_id"}}"
   location                      = "global"
   network                       = google_compute_network.default.id
 }
 
 resource "google_network_security_mirroring_endpoint_group" "default" {
-  provider                    = google-beta
   mirroring_endpoint_group_id = "{{index $.Vars "endpoint_group_id"}}"
   location                    = "global"
   type                        = "BROKER"
   mirroring_deployment_groups = [google_network_security_mirroring_deployment_group.default.id]
 }
 
 resource "google_network_security_security_profile" "{{$.PrimaryResourceId}}" {
-  provider    = google-beta
   name        = "{{index $.Vars "resource_name"}}"
   parent      = "organizations/{{index $.TestEnvVars "org_id"}}"
   description = "my description"
diff --git a/mmv1/templates/terraform/examples/network_security_security_profile_mirroring.tf.tmpl b/mmv1/templates/terraform/examples/network_security_security_profile_mirroring.tf.tmpl
@@ -1,25 +1,21 @@
 resource "google_compute_network" "default" {
-  provider                = google-beta
   name                    = "{{index $.Vars "network_name"}}"
   auto_create_subnetworks = false
 }
 
 resource "google_network_security_mirroring_deployment_group" "default" {
-  provider                      = google-beta
   mirroring_deployment_group_id = "{{index $.Vars "deployment_group_id"}}"
   location                      = "global"
   network                       = google_compute_network.default.id
 }
 
 resource "google_network_security_mirroring_endpoint_group" "default" {
-  provider                      = google-beta
-  mirroring_endpoint_group_id   = "{{index $.Vars "endpoint_group_id"}}"
-  location                      = "global"
-  mirroring_deployment_group    = google_network_security_mirroring_deployment_group.default.id
+  mirroring_endpoint_group_id = "{{index $.Vars "endpoint_group_id"}}"
+  location                    = "global"
+  mirroring_deployment_group  = google_network_security_mirroring_deployment_group.default.id
 }
 
 resource "google_network_security_security_profile" "{{$.PrimaryResourceId}}" {
-  provider    = google-beta
   name        = "{{index $.Vars "resource_name"}}"
   parent      = "organizations/{{index $.TestEnvVars "org_id"}}"
   description = "my description"
diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.tmpl
@@ -95,8 +95,7 @@ func TestAccNetworkSecuritySecurityProfiles_antivirusOverrides(t *testing.T) {
 	})
 }
 
-{{- if ne $.TargetVersionName "ga" }}
-func TestAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdate(t *testing.T) {
+func TestAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBrokerUpdate(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
@@ -106,29 +105,52 @@ func TestAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilt
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckNetworkSecuritySecurityProfileDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdateEmpty(context),
+				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_basic(context),
 			},
 			{
 				ResourceName:            "google_network_security_security_profile.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels", "url_filtering_profile"},
+				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels"},
 			},
 			{
-				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdate1(context),
+				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_update(context),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+					plancheck.ExpectResourceAction("google_network_security_security_profile.default", plancheck.ResourceActionUpdate),
+					},
+				},
 			},
 			{
 				ResourceName:            "google_network_security_security_profile.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels", "url_filtering_profile"},
+				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels"},
 			},
+		},
+	})
+}
+
+{{- if ne $.TargetVersionName "ga" }}
+func TestAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdate(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.ProtoV5ProviderBetaFactories(t),
+		CheckDestroy:             testAccCheckNetworkSecuritySecurityProfileDestroyProducer(t),
+		Steps: []resource.TestStep{
 			{
-				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdate2(context),
+				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdateEmpty(context),
 			},
 			{
 				ResourceName:            "google_network_security_security_profile.default",
@@ -137,66 +159,45 @@ func TestAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilt
 				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels", "url_filtering_profile"},
 			},
 			{
-				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdateDefault(context),
+				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdate1(context),
 			},
 			{
 				ResourceName:            "google_network_security_security_profile.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels", "url_filtering_profile"},
 			},
-      			{
-				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdateEmpty(context),
+			{
+				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdate2(context),
 			},
 			{
 				ResourceName:            "google_network_security_security_profile.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels", "url_filtering_profile"},
 			},
-		},
-	})
-}
-
-func TestAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBrokerUpdate(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.ProtoV5ProviderBetaFactories(t),
-		CheckDestroy:             testAccCheckNetworkSecuritySecurityProfileDestroyProducer(t),
-		Steps: []resource.TestStep{
 			{
-				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_basic(context),
+				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdateDefault(context),
 			},
 			{
 				ResourceName:            "google_network_security_security_profile.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels"},
+				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels", "url_filtering_profile"},
 			},
-			{
-				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_update(context),
-				ConfigPlanChecks: resource.ConfigPlanChecks{
-					PreApply: []plancheck.PlanCheck{
-					plancheck.ExpectResourceAction("google_network_security_security_profile.default", plancheck.ResourceActionUpdate),
-					},
-				},
+      			{
+				Config: testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdateEmpty(context),
 			},
 			{
 				ResourceName:            "google_network_security_security_profile.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels"},
+				ImportStateVerifyIgnore: []string{"labels", "location", "name", "parent", "terraform_labels", "url_filtering_profile"},
 			},
 		},
 	})
 }
+
 {{- end }}
 
 func testAccNetworkSecuritySecurityProfiles_basic(orgId string, randomSuffix string) string {
@@ -276,6 +277,74 @@ resource "google_network_security_security_profile" "foobar" {
 `, randomSuffix, orgId)
 }
 
+func testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_basic(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_network" "default" {
+  name                    = "tf-test-my-network%{random_suffix}"
+  auto_create_subnetworks = false
+}
+
+resource "google_network_security_mirroring_deployment_group" "default" {
+  mirroring_deployment_group_id = "tf-test-my-dg%{random_suffix}"
+  location                      = "global"
+  network                       = google_compute_network.default.id
+}
+
+resource "google_network_security_mirroring_endpoint_group" "default" {
+  mirroring_endpoint_group_id = "tf-test-my-eg%{random_suffix}"
+  location                    = "global"
+  type                        = "BROKER"
+  mirroring_deployment_groups = [google_network_security_mirroring_deployment_group.default.id]
+}
+
+resource "google_network_security_security_profile" "default" {
+  name        = "tf-test-my-security-profile%{random_suffix}"
+  parent      = "organizations/%{org_id}"
+  description = "my description"
+  type        = "CUSTOM_MIRRORING"
+
+  custom_mirroring_profile {
+    mirroring_endpoint_group = google_network_security_mirroring_endpoint_group.default.id
+    mirroring_deployment_groups = [google_network_security_mirroring_deployment_group.default.id]
+  }
+}
+`, context)
+}
+
+func testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_update(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_network" "default" {
+  name                    = "tf-test-my-network%{random_suffix}"
+  auto_create_subnetworks = false
+}
+
+resource "google_network_security_mirroring_deployment_group" "default" {
+  mirroring_deployment_group_id = "tf-test-my-dg%{random_suffix}"
+  location                      = "global"
+  network                       = google_compute_network.default.id
+}
+
+resource "google_network_security_mirroring_endpoint_group" "default" {
+  mirroring_endpoint_group_id = "tf-test-my-eg%{random_suffix}"
+  location                    = "global"
+  type                        = "BROKER"
+  mirroring_deployment_groups = [google_network_security_mirroring_deployment_group.default.id]
+}
+
+resource "google_network_security_security_profile" "default" {
+  name        = "tf-test-my-security-profile%{random_suffix}"
+  parent      = "organizations/%{org_id}"
+  description = "my description"
+  type        = "CUSTOM_MIRRORING"
+
+  custom_mirroring_profile {
+    mirroring_endpoint_group = google_network_security_mirroring_endpoint_group.default.id
+    mirroring_deployment_groups = []
+  }
+}
+`, context)
+}
+
 {{- if ne $.TargetVersionName "ga" }}
 func testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileUrlFilteringUpdateEmpty(context map[string]interface{}) string {
 	return acctest.Nprintf(`
@@ -370,79 +439,4 @@ resource "google_network_security_security_profile" "default" {
 `, context)
 }
 
-func testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_basic(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_compute_network" "default" {
-  provider                = google-beta
-  name                    = "tf-test-my-network%{random_suffix}"
-  auto_create_subnetworks = false
-}
-
-resource "google_network_security_mirroring_deployment_group" "default" {
-  provider                      = google-beta
-  mirroring_deployment_group_id = "tf-test-my-dg%{random_suffix}"
-  location                      = "global"
-  network                       = google_compute_network.default.id
-}
-
-resource "google_network_security_mirroring_endpoint_group" "default" {
-  provider                    = google-beta
-  mirroring_endpoint_group_id = "tf-test-my-eg%{random_suffix}"
-  location                    = "global"
-  type                        = "BROKER"
-  mirroring_deployment_groups = [google_network_security_mirroring_deployment_group.default.id]
-}
-
-resource "google_network_security_security_profile" "default" {
-  provider    = google-beta
-  name        = "tf-test-my-security-profile%{random_suffix}"
-  parent      = "organizations/%{org_id}"
-  description = "my description"
-  type        = "CUSTOM_MIRRORING"
-
-  custom_mirroring_profile {
-    mirroring_endpoint_group = google_network_security_mirroring_endpoint_group.default.id
-    mirroring_deployment_groups = [google_network_security_mirroring_deployment_group.default.id]
-  }
-}
-`, context)
-}
-
-func testAccNetworkSecuritySecurityProfile_networkSecuritySecurityProfileMirroringBroker_update(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_compute_network" "default" {
-  provider                = google-beta
-  name                    = "tf-test-my-network%{random_suffix}"
-  auto_create_subnetworks = false
-}
-
-resource "google_network_security_mirroring_deployment_group" "default" {
-  provider                      = google-beta
-  mirroring_deployment_group_id = "tf-test-my-dg%{random_suffix}"
-  location                      = "global"
-  network                       = google_compute_network.default.id
-}
-
-resource "google_network_security_mirroring_endpoint_group" "default" {
-  provider                    = google-beta
-  mirroring_endpoint_group_id = "tf-test-my-eg%{random_suffix}"
-  location                    = "global"
-  type                        = "BROKER"
-  mirroring_deployment_groups = [google_network_security_mirroring_deployment_group.default.id]
-}
-
-resource "google_network_security_security_profile" "default" {
-  provider    = google-beta
-  name        = "tf-test-my-security-profile%{random_suffix}"
-  parent      = "organizations/%{org_id}"
-  description = "my description"
-  type        = "CUSTOM_MIRRORING"
-
-  custom_mirroring_profile {
-    mirroring_endpoint_group = google_network_security_mirroring_endpoint_group.default.id
-    mirroring_deployment_groups = []
-  }
-}
-`, context)
-}
 {{- end }}
