Merge pull request #11 from gynzy/chore/absolute-path

chore: use absolute path to gcloud
gynzy · Feb 8, 2024 · 533c41c · 533c41c
2 parents 3396e14 + 4ede3c7
commit 533c41c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/index.js b/index.js
@@ -10,7 +10,7 @@ const readFile = util.promisify(fs.readFile);
 const deleteFile = util.promisify(fs.rm);
 const required = { required: true };
 
-const GCLOUD_BINARY = 'gcloud';
+const GCLOUD_BINARY = '/opt/google-cloud-sdk/bin/gcloud';
 
 /**
  * Status marks the deployment status. Only activates if token is set as an

diff --git a/tests/scenarios/canary.sh.snap b/tests/scenarios/canary.sh.snap
@@ -22,9 +22,9 @@
 ::debug::param: ttl = "false"
 ::debug::param: service_account = "helm-ttl-plugin"
 Setting up GKE authentication
-[command]/tmp/bin/gcloud auth activate-service-account --key-file=sa.json
+[command]/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=sa.json
 gcloud auth activate-service-account --key-file=sa.json
-[command]/tmp/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
+[command]/opt/google-cloud-sdk/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 ::debug::env: KUBECONFIG="undefined"
 ::debug::rendering value files [./values.yml] with: {"secrets":{"secret":"val"}}

diff --git a/tests/scenarios/helm3.sh.snap b/tests/scenarios/helm3.sh.snap
@@ -22,9 +22,9 @@
 ::debug::param: ttl = "false"
 ::debug::param: service_account = "helm-ttl-plugin"
 Setting up GKE authentication
-[command]/tmp/bin/gcloud auth activate-service-account --key-file=sa.json
+[command]/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=sa.json
 gcloud auth activate-service-account --key-file=sa.json
-[command]/tmp/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
+[command]/opt/google-cloud-sdk/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 ::debug::env: KUBECONFIG="undefined"
 ::debug::rendering value files [./values.yml] with: {"secrets":{"secret":"val"}}

diff --git a/tests/scenarios/production.sh.snap b/tests/scenarios/production.sh.snap
@@ -22,9 +22,9 @@
 ::debug::param: ttl = "false"
 ::debug::param: service_account = "helm-ttl-plugin"
 Setting up GKE authentication
-[command]/tmp/bin/gcloud auth activate-service-account --key-file=sa.json
+[command]/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=sa.json
 gcloud auth activate-service-account --key-file=sa.json
-[command]/tmp/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
+[command]/opt/google-cloud-sdk/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 ::debug::env: KUBECONFIG="undefined"
 ::debug::rendering value files [./values.yml] with: {"secrets":{"secret":"val"}}

diff --git a/tests/scenarios/ttl.sh.snap b/tests/scenarios/ttl.sh.snap
@@ -22,9 +22,9 @@
 ::debug::param: ttl = "7 days"
 ::debug::param: service_account = "helm-ttl-plugin"
 Setting up GKE authentication
-[command]/tmp/bin/gcloud auth activate-service-account --key-file=sa.json
+[command]/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=sa.json
 gcloud auth activate-service-account --key-file=sa.json
-[command]/tmp/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
+[command]/opt/google-cloud-sdk/bin/gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 gcloud container clusters get-credentials clusterName --zone GKElocation --project GKEproject
 ::debug::env: KUBECONFIG="undefined"
 ::debug::rendering value files [./values.yml] with: {"secrets":{"secret":"val"}}

diff --git a/tests/test-snap.sh b/tests/test-snap.sh
@@ -7,7 +7,8 @@ export PATH="/tmp/bin:$PATH"
 mkdir -p /tmp/bin
 cp ./helm-fake /tmp/bin/helm
 cp ./helm3-fake /tmp/bin/helm3
-cp ./gcloud-fake /tmp/bin/gcloud
+mkdir -p /opt/google-cloud-sdk/bin/
+cp ./gcloud-fake /opt/google-cloud-sdk/bin/gcloud
 
 for s in $(find ./scenarios/ -mindepth 1 | grep -v 'snap'); do
   echo $s