Merge branch 'main' into retry_transaction

googleapis · Jul 18, 2024 · ead286e · ead286e
2 parents 88ffd50 + a880fb8
commit ead286e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/internal/detect/detect.go b/internal/detect/detect.go
@@ -27,7 +27,9 @@ import (
 )
 
 const (
-	projectIDSentinel = "*detect-project-id*"
+	// ProjectIDSentinel is the value that users should pass for the project ID
+	// to enable detection.
+	ProjectIDSentinel = "*detect-project-id*"
 	envProjectID      = "GOOGLE_CLOUD_PROJECT"
 )
 
@@ -41,8 +43,8 @@ var (
 //  1. GOOGLE_CLOUD_PROJECT envvar
 //  2. ADC creds.ProjectID
 //  3. A static value if the environment is emulated.
-func ProjectID(ctx context.Context, projectID string, emulatorEnvVar string, opts ...option.ClientOption) (string, error) {
-	if projectID != projectIDSentinel {
+func ProjectID(ctx context.Context, projectID, emulatorEnvVar string, opts ...option.ClientOption) (string, error) {
+	if projectID != ProjectIDSentinel {
 		return projectID, nil
 	}
 	// 1. Try a well known environment variable

diff --git a/internal/detect/detect_test.go b/internal/detect/detect_test.go
@@ -37,19 +37,19 @@ func TestIt(t *testing.T) {
 		},
 		{
 			name:      "environment project id",
-			projectID: projectIDSentinel,
+			projectID: ProjectIDSentinel,
 			env:       map[string]string{envProjectID: "environment-project-id"},
 			want:      "environment-project-id",
 		},
 		{
 			name:         "adc project id",
-			projectID:    projectIDSentinel,
+			projectID:    ProjectIDSentinel,
 			adcProjectID: "adc-project-id",
 			want:         "adc-project-id",
 		},
 		{
 			name:      "emulator project id",
-			projectID: projectIDSentinel,
+			projectID: ProjectIDSentinel,
 			env:       map[string]string{"EMULATOR_HOST": "something"},
 			want:      "emulated-project",
 		},