Update test org for org policy test (#15770)

Author: shuyama1

mmv1/products/orgpolicy/CustomConstraint.yaml

@@ -39,7 +39,7 @@ examples:
     vars:
       policy_name: 'custom.disableGkeAutoUpgrade'
     test_env_vars:
-      org_id: 'ORG_ID'
+      org_id: 'ORG_TARGET'
     test_vars_overrides:
       'policy_name': '"custom.tfTestDisableGkeAutoUpgrade" + acctest.RandString(t, 10)'
   - name: 'org_policy_custom_constraint_full'

mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go

@@ -12,7 +12,7 @@ func TestAccOrgPolicyCustomConstraint_update(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":        envvar.GetTestOrgFromEnv(t),
+		"org_id":        envvar.GetTestOrgTargetFromEnv(t),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 

mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_policy_test.go

@@ -77,7 +77,7 @@ func TestAccOrgPolicyPolicy_OrganizationPolicy(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"org_id":        envvar.GetTestOrgFromEnv(t),
+		"org_id":        envvar.GetTestOrgTargetFromEnv(t),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 
@@ -104,6 +104,15 @@ func TestAccOrgPolicyPolicy_OrganizationPolicy(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"name", "spec.0.rules.0.condition.0.expression"},
 			},
+			{
+				Config: testAccOrgPolicyPolicy_DryRunSpecHandWritten(context),
+			},
+			{
+				ResourceName:            "google_org_policy_policy.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"name", "spec.0.rules.0.condition.0.expression"},
+			},
 		},
 	})
 }
@@ -150,31 +159,6 @@ func TestAccOrgPolicyPolicy_ProjectPolicy(t *testing.T) {
 		},
 	})
 }
-func TestAccOrgPolicyPolicy_DryRunSpecHandWritten(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:             testAccCheckOrgPolicyPolicyDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccOrgPolicyPolicy_DryRunSpecHandWritten(context),
-			},
-			{
-				ResourceName:            "google_org_policy_policy.primary",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"name", "spec.0.rules.0.condition.0.expression"},
-			},
-		},
-	})
-}
 
 func testAccOrgPolicyPolicy_EnforcePolicy(context map[string]interface{}) string {
 	return acctest.Nprintf(`
@@ -266,7 +250,7 @@ resource "google_folder" "basic" {
 func testAccOrgPolicyPolicy_OrganizationPolicy(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_org_policy_custom_constraint" "constraint" {
-  name         = "custom.tfTest%{random_suffix}"
+  name         = "custom.tfTestdisableGkeAutoUpgrade%{random_suffix}"
   parent       = "organizations/%{org_id}"
   display_name = "Disable GKE auto upgrade"
   description  = "Only allow GKE NodePool resource to be created or updated if AutoUpgrade is not enabled where this custom constraint is enforced."
@@ -291,7 +275,7 @@ resource "google_org_policy_policy" "primary" {
 func testAccOrgPolicyPolicy_OrganizationPolicyUpdate0(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_org_policy_custom_constraint" "constraint" {
-  name         = "custom.tfTest%{random_suffix}"
+  name         = "custom.tfTestdisableGkeAutoUpgrade%{random_suffix}"
   parent       = "organizations/%{org_id}"
   display_name = "Disable GKE auto upgrade"
   description  = "Only allow GKE NodePool resource to be created or updated if AutoUpgrade is not enabled where this custom constraint is enforced."
@@ -429,14 +413,14 @@ resource "google_project" "basic" {
 func testAccOrgPolicyPolicy_DryRunSpecHandWritten(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_org_policy_custom_constraint" "constraint" {
-  name         = "custom.disableGkeAutoUpgrade%{random_suffix}"
+  name         = "custom.tfTestdisableGkeAutoUpgrade%{random_suffix}"
   parent       = "organizations/%{org_id}"
   display_name = "Disable GKE auto upgrade"
   description  = "Only allow GKE NodePool resource to be created or updated if AutoUpgrade is not enabled where this custom constraint is enforced."
 
   action_type    = "ALLOW"
   condition      = "resource.management.autoUpgrade == false"
-  method_types   = ["CREATE"]
+  method_types   = ["CREATE", "UPDATE"]
   resource_types = ["container.googleapis.com/NodePool"]
 }