Update target project and org for storagecontrol tests (#13769) (#22520)

modular-magician · web-flow · commit cb9af4dad783 · 2025-04-24T18:57:44.000-07:00
[upstream:ef56a05e5a7313913776a899a4ac38527561e092]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/google/services/storagecontrol/data_source_storage_control_organizaton_intelligence_config_test.go b/google/services/storagecontrol/data_source_storage_control_organizaton_intelligence_config_test.go
@@ -17,7 +17,7 @@ func TestAccDataSourceGoogleStorageControlOrganizationIntelligenceConfig_basic(t
 
 	context := map[string]interface{}{
 		"random_suffix": acctest.RandString(t, 10),
-		"org_id":        envvar.GetTestOrgFromEnv(t),
+		"org_id":        envvar.GetTestOrgTargetFromEnv(t),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
diff --git a/google/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go b/google/services/storagecontrol/data_source_storage_control_project_intelligence_config_test.go
@@ -15,7 +15,7 @@ func TestAccDataSourceGoogleStorageControlProjectIntelligenceConfig_basic(t *tes
 
 	context := map[string]interface{}{
 		"random_suffix": acctest.RandString(t, 10),
-		"project":       envvar.GetTestProjectFromEnv(),
+		"project":       acctest.BootstrapProject(t, "tf-test-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId,
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
diff --git a/google/services/storagecontrol/resource_storage_control_folder_intelligence_config_test.go b/google/services/storagecontrol/resource_storage_control_folder_intelligence_config_test.go
@@ -14,7 +14,6 @@ func TestAccStorageControlFolderIntelligenceConfig_update(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"project":       envvar.GetTestProjectFromEnv(),
 		"org_id":        envvar.GetTestOrgFromEnv(t),
 		"random_suffix": acctest.RandString(t, 10),
 	}
diff --git a/google/services/storagecontrol/resource_storage_control_organization_intelligence_config_test.go b/google/services/storagecontrol/resource_storage_control_organization_intelligence_config_test.go
@@ -16,8 +16,7 @@ func TestAccStorageControlOrganizationIntelligenceConfig_update(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"project":       envvar.GetTestProjectFromEnv(),
-		"org_id":        envvar.GetTestOrgFromEnv(t),
+		"org_id":        envvar.GetTestOrgTargetFromEnv(t),
 		"random_suffix": acctest.RandString(t, 10),
 	}
 
diff --git a/google/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go b/google/services/storagecontrol/resource_storage_control_project_intelligence_config_test.go
@@ -16,7 +16,7 @@ func TestAccStorageControlProjectIntelligenceConfig_update(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"project":       envvar.GetTestProjectFromEnv(),
+		"project":       acctest.BootstrapProject(t, "tf-test-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId,
 		"random_suffix": acctest.RandString(t, 10),
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func TestAccDataSourceGoogleStorageControlOrganizationIntelligenceConfig_basic(t`
`17`	`17`
`18`	`18`	`context := map[string]interface{}{`
`19`	`19`	`"random_suffix": acctest.RandString(t, 10),`
`20`		`- "org_id": envvar.GetTestOrgFromEnv(t),`
	`20`	`+ "org_id": envvar.GetTestOrgTargetFromEnv(t),`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`acctest.VcrTest(t, resource.TestCase{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func TestAccDataSourceGoogleStorageControlProjectIntelligenceConfig_basic(t *tes`
`15`	`15`
`16`	`16`	`context := map[string]interface{}{`
`17`	`17`	`"random_suffix": acctest.RandString(t, 10),`
`18`		`- "project": envvar.GetTestProjectFromEnv(),`
	`18`	`+ "project": acctest.BootstrapProject(t, "tf-test-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId,`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`acctest.VcrTest(t, resource.TestCase{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ func TestAccStorageControlFolderIntelligenceConfig_update(t *testing.T) {`
`14`	`14`	`t.Parallel()`
`15`	`15`
`16`	`16`	`context := map[string]interface{}{`
`17`		`- "project": envvar.GetTestProjectFromEnv(),`
`18`	`17`	`"org_id": envvar.GetTestOrgFromEnv(t),`
`19`	`18`	`"random_suffix": acctest.RandString(t, 10),`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ func TestAccStorageControlOrganizationIntelligenceConfig_update(t *testing.T) {`
`16`	`16`	`t.Parallel()`
`17`	`17`
`18`	`18`	`context := map[string]interface{}{`
`19`		`- "project": envvar.GetTestProjectFromEnv(),`
`20`		`- "org_id": envvar.GetTestOrgFromEnv(t),`
	`19`	`+ "org_id": envvar.GetTestOrgTargetFromEnv(t),`
`21`	`20`	`"random_suffix": acctest.RandString(t, 10),`
`22`	`21`	`}`
`23`	`22`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func TestAccStorageControlProjectIntelligenceConfig_update(t *testing.T) {`
`16`	`16`	`t.Parallel()`
`17`	`17`
`18`	`18`	`context := map[string]interface{}{`
`19`		`- "project": envvar.GetTestProjectFromEnv(),`
	`19`	`+ "project": acctest.BootstrapProject(t, "tf-test-stor-int-", envvar.GetTestBillingAccountFromEnv(t), []string{"storage.googleapis.com"}).ProjectId,`
`20`	`20`	`"random_suffix": acctest.RandString(t, 10),`
`21`	`21`	`}`
`22`	`22`