Remove commented out code and conditionally set secret with key WZ_PAT

XpiritBV · Mar 25, 2024 · 1dd6b6f · 1dd6b6f
1 parent 14f5548
commit 1dd6b6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/deploy/automation/01-deploy-control-plane/02-deploy-control-plane.sh b/deploy/automation/01-deploy-control-plane/02-deploy-control-plane.sh
@@ -451,9 +451,9 @@ if [ 0 == $return_code ]; then
     # if [[ -n "${ARM_SUBSCRIPTION_ID}" ]]; then
     #     set_value_with_key "Terraform_Remote_Storage_Subscription" ${ARM_SUBSCRIPTION_ID} fi
     # fi
-    if [[ -n "${deployerfolder}" ]]; then
-        set_value_with_key "Deployer_State_FileName" ${deployerfolder}.terraform.tfstate
-    fi
+    # # # if [[ -n "${deployerfolder}" ]]; then
+    # # #     set_value_with_key "Deployer_State_FileName" ${deployerfolder}.terraform.tfstate
+    # # # fi
     # if [[ -n "${file_key_vault}" ]]; then
     #     set_value_with_key "Deployer_Key_Vault" ${file_key_vault} fi
     # fi

diff --git a/deploy/automation/02-deploy-sap-workload-zone/01-deploy-sap-workload-zone.sh b/deploy/automation/02-deploy-sap-workload-zone/01-deploy-sap-workload-zone.sh
@@ -456,13 +456,13 @@ fi
 start_group "Adding variables to platform variable group"
 
 if [ -n $VARIABLE_GROUP_ID ]; then
-    set_value_with_key "Terraform_Remote_Storage_Account_Name" ${REMOTE_STATE_SA}
+    #set_value_with_key "Terraform_Remote_Storage_Account_Name" ${REMOTE_STATE_SA}
 
-    set_value_with_key "Terraform_Remote_Storage_Subscription" ${STATE_SUBSCRIPTION}
+    #set_value_with_key "Terraform_Remote_Storage_Subscription" ${STATE_SUBSCRIPTION}
 
-    set_value_with_key "Deployer_State_FileName" ${deployer_tfstate_key}
+    #set_value_with_key "Deployer_State_FileName" ${deployer_tfstate_key}
 
-    set_value_with_key "Deployer_Key_Vault" ${key_vault}
+    #set_value_with_key "Deployer_Key_Vault" ${key_vault}
 
     set_value_with_key "Workload_Key_Vault" ${workload_key_vault}
 
@@ -472,7 +472,9 @@ if [ -n $VARIABLE_GROUP_ID ]; then
 
     set_value_with_key "Workload_Zone_State_FileName" ${landscape_tfstate_key}
 
-    set_secret_with_key "WZ_PAT" $AZURE_DEVOPS_EXT_PAT
+    if [[ $(get_platform) = devops ]]; then
+        set_secret_with_key "WZ_PAT" $AZURE_DEVOPS_EXT_PAT
+    fi
 fi
 
 if [ 0 != $return_code ]; then