From 8d3a4e7e7b64fb48c5bec215563331a74eb73590 Mon Sep 17 00:00:00 2001
From: Piotr Dudkiewicz <58216515+pd-dudkiewicz@users.noreply.github.com>
Date: Thu, 20 May 2021 15:29:28 +0100
Subject: [PATCH] Revert "feat:Add tenant Id and deployment for prod (#13)"
 (#18)

This reverts commit 28a17159080c03918be55004c839c53961f8317e.
---
 Jenkinsfile_CNP            | 21 ++++++---------------
 bin/import-bpmn-diagram.sh |  9 +++++++--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
index f6d7fe4e0..70790fb8a 100644
--- a/Jenkinsfile_CNP
+++ b/Jenkinsfile_CNP
@@ -30,12 +30,9 @@ def secrets = [
     secret('microservicekey-civil-service', 'S2S_SECRET'),
     secret('ccd-importer-username', 'CCD_CONFIGURER_IMPORTER_USERNAME'),
     secret('ccd-importer-password', 'CCD_CONFIGURER_IMPORTER_PASSWORD')
-  ]
-]
-
-def prod_secrets = [
-  'civil-${env}': [
-    secret('microservicekey-civil-service', 'S2S_SECRET')
+  ],
+  'civil-prod': [
+    secret('microservicekey-civil-service', 'S2S_SECRET_PROD')
   ]
 ]
 
@@ -49,7 +46,7 @@ def uploadBpmnDiagrams(String env) {
   dir("${WORKSPACE}/bin") {
     sh """
       eval \$(./variables/load-${env}-environment-variables.sh)
-      ./import-bpmn-diagram.sh ${WORKSPACE}
+      ./import-bpmn-diagram.sh ${WORKSPACE} ${env}
     """
   }
 }
@@ -64,11 +61,7 @@ withPipeline(type, product, component) {
     loadVaultSecrets(secrets)
   }
   onMaster {
-    if(env == 'prod'){
-      loadVaultSecrets(prod_secrets)
-    } else {
-      loadVaultSecrets(secrets)
-    }
+    loadVaultSecrets(secrets)
   }
   onDemo {
     loadVaultSecrets(secrets)
@@ -148,9 +141,7 @@ withPipeline(type, product, component) {
   after('functionalTest:aat') {
     createGithubRelease()
     uploadBpmnDiagrams('aat')
-    steps.archiveArtifacts allowEmptyArchive: true, artifacts: 'output/**/*'
-  }
-  after('deploy:prod') {
     uploadBpmnDiagrams('prod')
+    steps.archiveArtifacts allowEmptyArchive: true, artifacts: 'output/**/*'
   }
 }
diff --git a/bin/import-bpmn-diagram.sh b/bin/import-bpmn-diagram.sh
index bf506b2a7..89773a468 100755
--- a/bin/import-bpmn-diagram.sh
+++ b/bin/import-bpmn-diagram.sh
@@ -3,8 +3,14 @@
 set -eu
 workspace=${1}
 
+s2sSecret=${S2S_SECRET:-AABBCCDDEEFFGGHH}
+
+if [[ "${2}" == 'prod' ]]; then
+  s2sSecret=${S2S_SECRET_PROD}
+fi
+
 serviceToken=$($(realpath $workspace)/bin/utils/idam-lease-service-token.sh civil_service \
-  $(docker run --rm toolbelt/oathtool --totp -b ${S2S_SECRET:-AABBCCDDEEFFGGHH}))
+  $(docker run --rm toolbelt/oathtool --totp -b ${s2sSecret}))
 filepath="$(realpath $workspace)/src/main/resources/camunda"
 
 for file in $(find ${filepath} -name '*.bpmn')
@@ -15,7 +21,6 @@ do
     -H "ServiceAuthorization: Bearer ${serviceToken}" \
     -F "deployment-name=$(basename ${file})" \
     -F "deploy-changed-only=true" \
-    -F "tenant-id=civil" \
     -F "file=@${filepath}/$(basename ${file})")
 
 upload_http_code=$(echo "$uploadResponse" | tail -n1)