chore: pick tools config version from cloudbuild.yaml (#68)

* chore: pick tools config version from cloudbuild.yaml

* Update e2e_test.go

* Update tbgenkit_test.go

Author: dishaprakash

core/e2e_test.go

@@ -31,10 +31,11 @@ import (
 
 // Global variables to hold session-scoped "fixtures"
 var (
-	projectID      string = getEnvVar("GOOGLE_CLOUD_PROJECT")
-	toolboxVersion string = getEnvVar("TOOLBOX_VERSION")
-	authToken1     string
-	authToken2     string
+	projectID      	string = getEnvVar("GOOGLE_CLOUD_PROJECT")
+	toolboxVersion 	string = getEnvVar("TOOLBOX_VERSION")
+	authToken1     	string
+	authToken2     	string
+	manifestVersion string = getEnvVar("TOOLBOX_MANIFEST_VERSION")
 )
 
 func TestMain(m *testing.M) {
@@ -43,7 +44,7 @@ func TestMain(m *testing.M) {
 
 	// Get secrets and auth tokens
 	log.Println("Fetching secrets and auth tokens...")
-	toolsManifestContent := accessSecretVersion(ctx, projectID, "sdk_testing_tools", "34")
+	toolsManifestContent := accessSecretVersion(ctx, projectID, "sdk_testing_tools", manifestVersion)
 	clientID1 := accessSecretVersion(ctx, projectID, "sdk_testing_client1", "latest")
 	clientID2 := accessSecretVersion(ctx, projectID, "sdk_testing_client2", "latest")
 	authToken1 = getAuthToken(ctx, clientID1)

integration.cloudbuild.yaml

@@ -42,6 +42,7 @@ steps:
       - "GOPATH=/gopath"
       - TOOLBOX_VERSION=$_TOOLBOX_VERSION
       - GOOGLE_CLOUD_PROJECT=$PROJECT_ID
+      - TOOLBOX_MANIFEST_VERSION=$_TOOLBOX_MANIFEST_VERSION
     volumes:
       - name: "go"
         path: "/gopath"
@@ -55,6 +56,7 @@ steps:
       - "GOPATH=/gopath"
       - TOOLBOX_VERSION=$_TOOLBOX_VERSION
       - GOOGLE_CLOUD_PROJECT=$PROJECT_ID
+      - TOOLBOX_MANIFEST_VERSION=$_TOOLBOX_MANIFEST_VERSION
     volumes:
       - name: "go"
         path: "/gopath"
@@ -65,3 +67,4 @@ options:
   logging: CLOUD_LOGGING_ONLY
 substitutions:
   _TOOLBOX_VERSION: '0.12.0'
+  _TOOLBOX_MANIFEST_VERSION: '34'

tbgenkit/tbgenkit_test.go

@@ -31,10 +31,11 @@ import (
 
 // Global variables to hold session-scoped "fixtures"
 var (
-	projectID      string = getEnvVar("GOOGLE_CLOUD_PROJECT")
-	toolboxVersion string = getEnvVar("TOOLBOX_VERSION")
-	authToken1     string
-	authToken2     string
+	projectID      	string = getEnvVar("GOOGLE_CLOUD_PROJECT")
+	toolboxVersion 	string = getEnvVar("TOOLBOX_VERSION")
+	authToken1     	string
+	authToken2     	string
+	manifestVersion string = getEnvVar("TOOLBOX_MANIFEST_VERSION")
 )
 
 func TestMain(m *testing.M) {
@@ -43,7 +44,7 @@ func TestMain(m *testing.M) {
 
 	// Get secrets and auth tokens
 	log.Println("Fetching secrets and auth tokens...")
-	toolsManifestContent := accessSecretVersion(ctx, projectID, "sdk_testing_tools", "34")
+	toolsManifestContent := accessSecretVersion(ctx, projectID, "sdk_testing_tools", manifestVersion)
 	clientID1 := accessSecretVersion(ctx, projectID, "sdk_testing_client1", "latest")
 	clientID2 := accessSecretVersion(ctx, projectID, "sdk_testing_client2", "latest")
 	authToken1 = getAuthToken(ctx, clientID1)