From cde02a885ef8a0f2dd0e21af71bd1f87caff4e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20B=C3=A9jean?= <nicolas@bejean.fr>
Date: Sat, 29 Jan 2022 14:27:35 +0100
Subject: [PATCH] fix: base64 invalid input

---
 .gitlab-ci.yml | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8dee3e..dd6993b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,25 +202,15 @@ destroy-psc:
     GCP_DNS_ZONE_GKE_ELASTIC: $GCP_DNS_ZONE_GKE_ELASTIC
     EC_SERVICE_ATTACHMENT_URI: $EC_SERVICE_ATTACHMENT_URI
     EC_DNS_ZONE: $EC_DNS_ZONE
-    GCP_SERVICE_ACCOUNT: $GCP_SA
+    GCP_SA: $GCP_SA
   before_script:
-    - echo $GCP_SERVICE_ACCOUNT > gcp-sa.json
-    - ls -la
-    - cat gcp-sa.json
-    - echo ${GCP_SERVICE_ACCOUNT} > gcp-sa.json
-    - ls -la
-    - cat gcp-sa.json
-    - echo ${GCP_SA} > gcp-sa.json
-    - ls -la
-    - cat gcp-sa.json
-    - echo "$GCP_SERVICE_ACCOUNT" > gcp-sa.json
-    - ls -la
-    - cat gcp-sa.json
-    - gcloud auth activate-service-account --key-file gcp-sa.json
-    - echo "Activate Service Account OK"
-    - gcloud config set project $GCP_PROJECT_ID
-    - echo "Set Project OK"
-    - cd $GCLOUD_ROOT_PSC
+    - |
+      echo $GCP_SA | base64 -di > gcp-sa.json
+      gcloud auth activate-service-account --key-file gcp-sa.json
+      echo "Activate Service Account: OK"
+      gcloud config set project $GCP_PROJECT_ID
+      echo "Set Project: OK"
+      cd $GCLOUD_ROOT_PSC
   script:
     - |
       chmod +x ./destroy-psc.sh
-- 
GitLab