Merge remote-tracking branch 'origin/main' into issues/3/main

# Conflicts:
# environ.go

Author: 54m

.gitignore

@@ -4,6 +4,9 @@
 out
 gen
 
+# VSCode project files
+.vscode
+
 # Binaries for programs and plugins
 *.exe
 *.exe~

constant.go

@@ -3,6 +3,14 @@ package gcpen
 const (
 	EnvKeyProjectID          = "GCP_PROJECT"          // for Google Cloud Functions
 	EnvKeyGoogleCloudProject = "GOOGLE_CLOUD_PROJECT" // for Google App Engine
-	EnvKeyServiceName        = "GAE_SERVICE"          // for Google App Engine
-	EnvKeyServiceVersion     = "GAE_VERSION"          // for Google App Engine
+
+	// Deprecated
+	EnvKeyServiceName = "GAE_SERVICE" // for Google App Engine
+	// Deprecated
+	EnvKeyServiceVersion = "GAE_VERSION" // for Google App Engine
+
+	EnvKeyGAEServiceName     = "GAE_SERVICE" // for Google App Engine
+	EnvKeyGAEServiceVersion  = "GAE_VERSION" // for Google App Engine
+	EnvKeyRUNServiceName     = "K_SERVICE"   // for Google Cloud Run
+	EnvKeyRUNServiceRevision = "K_REVISION"  // for Google Cloud Run
 )

environ.go

@@ -10,11 +10,24 @@ import (
 var (
 	// ProjectID - Google Cloud Platform Project ID
 	ProjectID = getProjectID()
+
 	// ServiceName - Google App Engine service name
+	// Deprecated
 	ServiceName = os.Getenv(EnvKeyServiceName)
+
 	// ServiceVersion - Google App Engine service version
+	// Deprecated
 	ServiceVersion = os.Getenv(EnvKeyServiceVersion)
-	projectNumber  int64
+
+	// GAEServiceName - Google App Engine service name
+	GAEServiceName = os.Getenv(EnvKeyGAEServiceName)
+	// GAEServiceVersion - Google App Engine service version
+	GAEServiceVersion = os.Getenv(EnvKeyGAEServiceVersion)
+	// RUNServiceName - Google Cloud Run service name
+	RUNServiceName = os.Getenv(EnvKeyRUNServiceName)
+	// RUNServiceRevision - Google Cloud Run service revision
+	RUNServiceRevision = os.Getenv(EnvKeyRUNServiceRevision)
+	projectNumber      int64
 )
 
 func getProjectID() string {
@@ -34,8 +47,18 @@ func getProjectID() string {
 // Reload - Reload environment variables.
 func Reload() {
 	ProjectID = getProjectID()
+
+	// Deprecated
+	// ServiceName - Deprecated
 	ServiceName = os.Getenv(EnvKeyServiceName)
+	// Deprecated
+	// ServiceVersion - Deprecated
 	ServiceVersion = os.Getenv(EnvKeyServiceVersion)
+
+	GAEServiceName = os.Getenv(EnvKeyGAEServiceName)
+	GAEServiceVersion = os.Getenv(EnvKeyGAEServiceVersion)
+	RUNServiceName = os.Getenv(EnvKeyRUNServiceName)
+	RUNServiceRevision = os.Getenv(EnvKeyRUNServiceRevision)
 }
 
 // GetProjectNumber - get project number

environ_test.go

@@ -6,26 +6,46 @@ import (
 )
 
 const (
-	testProject = "test-project"
-	testService = "test-service"
-	testVersion = "test-version"
+	testProject     = "test-project"
+	testGAEService  = "test-gae-service"
+	testGAEVersion  = "test-gae-version"
+	testRUNService  = "test-run-service"
+	testRUNRevision = "test-run-revision"
 )
 
 func init() {
 	os.Setenv(EnvKeyGoogleCloudProject, testProject)
-	os.Setenv(EnvKeyServiceName, testService)
-	os.Setenv(EnvKeyServiceVersion, testVersion)
+	os.Setenv(EnvKeyGAEServiceName, testGAEService)
+	os.Setenv(EnvKeyGAEServiceVersion, testGAEVersion)
+	os.Setenv(EnvKeyRUNServiceName, testRUNService)
+	os.Setenv(EnvKeyRUNServiceRevision, testRUNRevision)
 }
 
 func TestEnviron(t *testing.T) {
 	Reload()
 	if ProjectID != testProject {
 		t.Fatalf("unexpected, expected: %s, actual: %#v", testProject, ProjectID)
 	}
-	if ServiceName != testService {
-		t.Fatalf("unexpected, expected: %s, actual: %#v", testService, ServiceName)
+
+	// Deprecated
+	if ServiceName != testGAEService {
+		t.Fatalf("unexpected, expected: %s, actual: %#v", testGAEService, ServiceName)
+	}
+	// Deprecated
+	if ServiceVersion != testGAEVersion {
+		t.Fatalf("unexpected, expected: %s, actual: %#v", testGAEVersion, ServiceVersion)
+	}
+
+	if GAEServiceName != testGAEService {
+		t.Fatalf("unexpected, expected: %s, actual: %#v", testGAEService, GAEServiceName)
+	}
+	if GAEServiceVersion != testGAEVersion {
+		t.Fatalf("unexpected, expected: %s, actual: %#v", testGAEVersion, GAEServiceVersion)
+	}
+	if RUNServiceName != testRUNService {
+		t.Fatalf("unexpected, expected: %s, actual: %#v", testRUNService, RUNServiceName)
 	}
-	if ServiceVersion != testVersion {
-		t.Fatalf("unexpected, expected: %s, actual: %#v", testVersion, ServiceVersion)
+	if RUNServiceRevision != testRUNRevision {
+		t.Fatalf("unexpected, expected: %s, actual: %#v", testRUNRevision, RUNServiceRevision)
 	}
 }