godev/cmd: use GO_TELEMETRY_ENV instead of ENV

Environment variable named 'ENV' can have special meaning. https://pubs.opengroup.org/onlinepubs/9699919799/utilities/sh.html#tag_20_117_08 Fixes golang/go#62138 Change-Id: I1c0b6d62aa51f9e726bd21164b58b334ee3f7356 Reviewed-on: https://go-review.googlesource.com/c/telemetry/+/521595 Reviewed-by: Jamal Carvalho <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Run-TryBot: Hyang-Ah Hana Kim <[email protected]>
golang · Aug 21, 2023 · 95548c4 · 95548c4
1 parent c38c7ff
commit 95548c4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/godev/cmd/telemetrygodev/README.md b/godev/cmd/telemetrygodev/README.md
@@ -21,6 +21,7 @@ cloud storage emulator and use the -gcs flag to use the Cloud Storage API.
 | GO_TELEMETRY_LOCAL_STORAGE         | .localstorage         | Directory for storage emulator I/O or file system storage |
 | GO_TELEMETRY_UPLOAD_CONFIG         | ../config/config.json | Location of the upload config used for report validation  |
 | GO_TELEMETRY_MAX_REQUEST_BYTES     | 102400                | Maximum request body size the server allows               |
+| GO_TELEMETRY_ENV                   | local                 | Deployment environment (e.g. prod, dev, local, ... )      |
 
 ## Testing
 

diff --git a/godev/cmd/telemetrygodev/cloudbuild.yaml b/godev/cmd/telemetrygodev/cloudbuild.yaml
@@ -37,6 +37,6 @@ steps:
       - "--region"
       - "us-central1"
       - "--set-env-vars"
-      - "ENV=$_ENV"
+      - "GO_TELEMETRY_ENV=$_ENV"
 images:
   - "gcr.io/$PROJECT_ID/telemetrygodev:$COMMIT_SHA"
diff --git a/godev/cmd/telemetrygodev/config.go b/godev/cmd/telemetrygodev/config.go
@@ -72,7 +72,7 @@ func newConfig() *config {
 		ProjectID:           env("GO_TELEMETRY_PROJECT_ID", "go-telemetry"),
 		StorageEmulatorHost: env("GO_TELEMETRY_STORAGE_EMULATOR_HOST", "localhost:8081"),
 		LocalStorage:        env("GO_TELEMETRY_LOCAL_STORAGE", ".localstorage"),
-		UploadBucket:        env("ENV", "local") + "-telemetry-uploaded",
+		UploadBucket:        env("GO_TELEMETRY_ENV", "local") + "-telemetry-uploaded",
 		UploadConfig:        env("GO_TELEMETRY_UPLOAD_CONFIG", "../config/config.json"),
 		MaxRequestBytes:     env("GO_TELEMETRY_MAX_REQUEST_BYTES", int64(100*1024)),
 		RequestTimeout:      10 * time.Duration(time.Minute),

diff --git a/godev/cmd/worker/README.md b/godev/cmd/worker/README.md
@@ -30,6 +30,7 @@ cloud storage emulator and use the -gcs flag to use the Cloud Storage API.
 | GO_TELEMETRY_LOCAL_STORAGE         | .localstorage         | Directory for storage emulator I/O or file system storage |
 | GO_TELEMETRY_UPLOAD_CONFIG         | ../config/config.json | Location of the upload config used for report validation  |
 | GO_TELEMETRY_MAX_REQUEST_BYTES     | 102400                | Maximum request body size the server allows               |
+| GO_TELEMETRY_ENV                   | local                 | Deployment environment (e.g. prod, dev, local, ... )      |
 
 ## Testing
 

diff --git a/godev/cmd/worker/cloudbuild.yaml b/godev/cmd/worker/cloudbuild.yaml
@@ -37,6 +37,6 @@ steps:
       - "--region"
       - "us-central1"
       - "--set-env-vars"
-      - "ENV=$_ENV"
+      - "GO_TELEMETRY_ENV=$_ENV"
 images:
   - "gcr.io/$PROJECT_ID/worker:$COMMIT_SHA"
diff --git a/godev/cmd/worker/config.go b/godev/cmd/worker/config.go
@@ -71,7 +71,7 @@ var (
 
 // newConfig returns a new config. Getting the config should follow a call to flag.Parse.
 func newConfig() *config {
-	environment := env("ENV", "local")
+	environment := env("GO_TELEMETRY_ENV", "local")
 	return &config{
 		Port:                env("PORT", "8082"),
 		ProjectID:           env("GO_TELEMETRY_PROJECT_ID", "go-telemetry"),