rename GOOGLE_PROJECT_PREFIX (#13988) (#22831)

modular-magician · web-flow · commit b282527acb5a · 2025-05-16T14:07:08.000-07:00
[upstream:e053eedfc7d5feed2a1f7d36edf61428009886cb]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/google/envvar/envvar_utils.go b/google/envvar/envvar_utils.go
@@ -89,7 +89,7 @@ var UniverseDomainEnvVars = []string{
 }
 
 var ProjectPrefixEnvVars = []string{
-	"GOOGLE_PROJECT_PREFIX",
+	"GOOGLE_UNIVERSE_PROJECT_PREFIX",
 }
 
 // This is the billing account that will be charged for the infrastructure used during testing. For
@@ -153,7 +153,7 @@ func GetTestUniverseDomainFromEnv(t *testing.T) string {
 }
 
 // Project Prefix of different universes
-func GetProjectPrefixFromEnv() string {
+func GetUniverseProjectPrefixFromEnv() string {
 	return transport_tpg.MultiEnvSearch(ProjectPrefixEnvVars)
 }
 
diff --git a/google/provider/universe/universe_domain_compute_test.go b/google/provider/universe/universe_domain_compute_test.go
@@ -39,7 +39,7 @@ func TestAccUniverseDomainDiskImage(t *testing.T) {
 
 	universeDomain := envvar.GetTestUniverseDomainFromEnv(t)
 	zone := envvar.GetTestZoneFromEnv()
-	prefix := envvar.GetProjectPrefixFromEnv()
+	prefix := envvar.GetUniverseProjectPrefixFromEnv()
 	image_project := ""
 
 	if prefix != "" {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ var UniverseDomainEnvVars = []string{`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`var ProjectPrefixEnvVars = []string{`
`92`		`- "GOOGLE_PROJECT_PREFIX",`
	`92`	`+ "GOOGLE_UNIVERSE_PROJECT_PREFIX",`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// This is the billing account that will be charged for the infrastructure used during testing. For`
`@@ -153,7 +153,7 @@ func GetTestUniverseDomainFromEnv(t *testing.T) string {`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`// Project Prefix of different universes`
`156`		`-func GetProjectPrefixFromEnv() string {`
	`156`	`+func GetUniverseProjectPrefixFromEnv() string {`
`157`	`157`	`return transport_tpg.MultiEnvSearch(ProjectPrefixEnvVars)`
`158`	`158`	`}`
`159`	`159`