Bring in HotFix repairs

README.md

@@ -6,7 +6,7 @@ The framework uses Terraform for infrastructure deployment, and Ansible for the
 
 ## Enterprise-scale  - Reference Implementation
 
-![Ansible Lint](https://github.com/Azure/sap-automation/workflows/Ansible%20Lint/badge.svg)    [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Average time to resolve an issue")    [![Percentage of issues still open](http://isitmaintained.com/badge/open/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Percentage of issues still open")
+![Ansible Lint](https://github.com/Azure/sap-automation/workflows/Ansible%20Lint/badge.svg)    [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Average time to resolve an issue")    [![Percentage of issues still open](http://isitmaintained.com/badge/open/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Percentage of issues still open") [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/Azure/sap-automation/badge)](https://scorecard.dev/viewer/?uri=github.com/Azure/sap-automation)
 
 ## Partnership
 

Webapp/SDAF/SDAFWebApp.csproj

@@ -16,18 +16,18 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Data.Tables" Version="12.9.1" />
-    <PackageReference Include="Azure.Identity" Version="1.12.1" />
+    <PackageReference Include="Azure.Identity" Version="1.13.0" />
     <PackageReference Include="Azure.ResourceManager" Version="1.13.0" />
     <PackageReference Include="Azure.ResourceManager.Compute" Version="1.6.0" />
     <PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.3.0" />
     <PackageReference Include="Azure.ResourceManager.Network" Version="1.9.0" />
     <PackageReference Include="Azure.ResourceManager.Resources" Version="1.9.0" />
     <PackageReference Include="Azure.ResourceManager.Storage" Version="1.3.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.33" />
-    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.5" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.2.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.2.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.35" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="3.2.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.2.2" />
     <PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="19.241.0-preview" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

deploy/ansible/roles-os/1.1-swap/defaults/main.yaml

@@ -0,0 +1,8 @@
+---
+# TODO: Maybe move these to a group_vars/all/distro file so that they
+# can be shared by all playbooks/tasks automatically, and extend with
+# standardised versions of all similar patterns used in the playbooks.
+# Changed from ansible_os_family to ansible_distribution to adopt Oracle Linux. os_family returns returns value Redhat by default.
+distro_name:    "{{ ansible_distribution | upper }}-{{ ansible_distribution_major_version }}"
+distribution_id:      "{{ ansible_distribution | lower ~ ansible_distribution_major_version }}"
+distribution_full_id: "{{ ansible_distribution | lower ~ ansible_distribution_version }}"

deploy/ansible/roles-os/1.1-swap/tasks/main.yaml

@@ -35,9 +35,8 @@
     state:                             latest
   environment:
     ZYPP_LOCK_TIMEOUT:                 "20"
-
   when:
-    - ansible_os_family == 'Suse'
+    - distribution_id == 'sles_sap15'
   tags:
     - skip_ansible_lint
 

deploy/ansible/vars/ansible-input-api.yaml

@@ -5,7 +5,7 @@ become_user_name:                       root
 oracle_user_name:                       oracle
 orchestration_ansible_user:             azureadm
 # ------------------- Begin - SDAF Ansible Version ---------------------------8
-SDAF_Version:                   "3.13.0.0"
+SDAF_Version:                           "3.13.1.0"
 
 # ------------------- End - SDAF Ansible Version ---------------------------8
 

deploy/configs/version.txt

@@ -1 +1 @@
-3.13.0.0
+3.13.1.0

deploy/pipelines/03-sap-system-deployment.yaml

@@ -114,19 +114,11 @@ stages:
                     NETWORK=$(grep "^network_logical_name" $HOME_CONFIG/SYSTEM/$(sap_system_folder)/$(sap_system_configuration) | awk -F'=' '{print $2}' | xargs)
                     SID=$(grep "^sid" $HOME_CONFIG/SYSTEM/$(sap_system_folder)/$(sap_system_configuration) | awk -F'=' '{print $2}' | xargs)
 
-                echo "Environment:           $ENVIRONMENT"
-                echo "Location:              $LOCATION"
-                echo "Network:               $NETWORK"
-                echo "SID:                   $SID"
-                echo "System TFvars          $sap_system_configuration"
-                echo ""
-                echo "Agent:                 $(this_agent)"
-                echo "Organization:          $(System.CollectionUri)"
-                echo "Project:               $(System.TeamProject)"
-                echo ""
-                echo "Azure CLI version:"
-                echo "-------------------------------------------------"
-                az --version
+                echo "Environment:                         $ENVIRONMENT"
+                echo "Location:                            $LOCATION"
+                echo "Network:                             $NETWORK"
+                echo "SID:                                 $SID"
+                echo "System TFvars:                       $(sap_system_configuration)"
 
                 ENVIRONMENT_IN_FILENAME=$(echo $(sap_system_folder) | awk -F'-' '{print $1}' | xargs) ;
                           LOCATION_CODE=$(echo $(sap_system_folder) | awk -F'-' '{print $2}' | xargs) ;
@@ -191,10 +183,20 @@ stages:
                   *) LOCATION_IN_FILENAME="westeurope" ;;
                 esac
 
-                echo "Environment(filename): $ENVIRONMENT_IN_FILENAME"
-                echo "Location(filename):    $LOCATION_IN_FILENAME"
-                echo "Network(filename):     $NETWORK_IN_FILENAME"
-                echo "SID(filename):         $SID_IN_FILENAME"
+                echo "Environment(filename):               $ENVIRONMENT_IN_FILENAME"
+                echo "Location(filename):                  $LOCATION_IN_FILENAME"
+                echo "Network(filename):                   $NETWORK_IN_FILENAME"
+                echo "SID(filename):                       $SID_IN_FILENAME"
+
+                echo ""
+                echo "Agent:                               $(this_agent)"
+                echo "Organization:                        $(System.CollectionUri)"
+                echo "Project:                             $(System.TeamProject)"
+                echo ""
+                echo "Azure CLI version:"
+                echo "-------------------------------------------------"
+                az --version
+
 
                 if [ $ENVIRONMENT != $ENVIRONMENT_IN_FILENAME ]; then
                   echo "##vso[task.logissue type=error]The environment setting in $(sap_system_configuration) '$ENVIRONMENT' does not match the $(sap_system_configuration) file name '$ENVIRONMENT_IN_FILENAME'. Filename should have the pattern [ENVIRONMENT]-[REGION_CODE]-[NETWORK_LOGICAL_NAME]-[SID]"
@@ -231,18 +233,20 @@ stages:
                 fi
               echo -e "$green--- Configure devops CLI extension ---$reset"
 
-                az config set extension.use_dynamic_install=yes_without_prompt --output none
+                az config set extension.use_dynamic_install=yes_without_prompt --output none  --only-show-errors
 
-                az extension add --name azure-devops --output none
+                az extension add --name azure-devops --output none --only-show-errors
 
-                az devops configure --defaults organization=$(System.CollectionUri) project='$(System.TeamProject)' --output none
+                az devops configure --defaults organization=$(System.CollectionUri) project='$(System.TeamProject)' --output none --only-show-errors
 
                 export VARIABLE_GROUP_ID=$(az pipelines variable-group list --query "[?name=='$(variable_group)'].id | [0]")
-                echo '$(variable_group) id: ' $VARIABLE_GROUP_ID
+
                 if [ -z ${VARIABLE_GROUP_ID} ]; then
                   echo "##vso[task.logissue type=error]Variable group $(variable_group) could not be found."
                   exit 2
                 fi
+                printf -v val '%-15s' "$(variable_group) id:"
+                echo "$val                      $VARIABLE_GROUP_ID"
               echo -e "$green--- Login ---$reset"
 
                 if [ -z $USE_MSI ]; then
@@ -256,7 +260,8 @@ stages:
                 fi
 
                 if [ $USE_MSI != "true" ]; then
-                  echo "Using SPN"
+                  echo "Deployment credentials:              Service Principal"
+                  echo "Deployment credential ID (SPN):     $WL_ARM_CLIENT_ID"
 
                   export ARM_CLIENT_ID=$WL_ARM_CLIENT_ID
                   export ARM_CLIENT_SECRET=$WL_ARM_CLIENT_SECRET
@@ -271,6 +276,7 @@ stages:
                     exit $return_code
                   fi
                 else
+                  echo "Deployment credentials:              Managed Identity"
                   export ARM_USE_MSI=true
                   export ARM_SUBSCRIPTION_ID=$WL_ARM_SUBSCRIPTION_ID
                   unset ARM_TENANT_ID
@@ -280,48 +286,53 @@ stages:
               echo -e "$green--- Define variables ---$reset"
                 cd $HOME_CONFIG/SYSTEM/$(sap_system_folder)
 
-                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Terraform_Remote_Storage_Subscription.value" | tr -d \")
+                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Terraform_Remote_Storage_Subscription.value" --out tsv)
                 if [ -z ${az_var} ]; then
-                  export STATE_SUBSCRIPTION=$(grep STATE_SUBSCRIPTION ${environment_file_name} | awk -F'=' '{print $2}' | xargs) ; echo 'Terraform state file subscription' $STATE_SUBSCRIPTION
+                  export STATE_SUBSCRIPTION=$(grep STATE_SUBSCRIPTION ${environment_file_name} | awk -F'=' '{print $2}' | xargs)
                 else
-                  export STATE_SUBSCRIPTION=${az_var} ; echo 'Terraform state file subscription' $STATE_SUBSCRIPTION
+                  export STATE_SUBSCRIPTION=${az_var}
                 fi
 
-                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Terraform_Remote_Storage_Account_Name.value" | tr -d \")
+                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Terraform_Remote_Storage_Account_Name.value" --out tsv)
                 if [ -z ${az_var} ]; then
-                  export REMOTE_STATE_SA=$(grep REMOTE_STATE_SA ${environment_file_name} | awk -F'=' '{print $2}' | xargs) ; echo 'Terraform state file storage account' $REMOTE_STATE_SA
+                  export REMOTE_STATE_SA=$(grep REMOTE_STATE_SA ${environment_file_name} | awk -F'=' '{print $2}' | xargs)
                 else
-                  export REMOTE_STATE_SA=${az_var} ; echo 'Terraform state file storage account' $REMOTE_STATE_SA
+                  export REMOTE_STATE_SA=${az_var}
                 fi
 
-                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Deployer_State_FileName.value" | tr -d \")
+                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Deployer_State_FileName.value" --out tsv)
                 if [ -z ${az_var} ]; then
-                  export deployer_tfstate_key=$(grep deployer_tfstate_key ${environment_file_name} | awk -F'=' '{print $2}' | xargs) ; echo 'Deployer State File' $deployer_tfstate_key
+                  export deployer_tfstate_key=$(grep deployer_tfstate_key ${environment_file_name} | awk -F'=' '{print $2}' | xargs)
                 else
-                  export deployer_tfstate_key=${az_var} ; echo 'Deployer State File' $deployer_tfstate_key
+                  export deployer_tfstate_key=${az_var}
                 fi
 
                 az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "${NETWORK}"Workload_Zone_State_FileName.value | tr -d \")
                 if [ -z ${az_var} ]; then
-                  export landscape_tfstate_key=$(grep landscape_tfstate_key= ${environment_file_name} | awk -F'=' '{print $2}' | xargs) ; echo 'landscape_tfstate_key' $landscape_tfstate_key
+                  export landscape_tfstate_key=$(grep landscape_tfstate_key= ${environment_file_name} | awk -F'=' '{print $2}' | xargs)
                 else
-                  export landscape_tfstate_key=${az_var} ; echo 'landscape_tfstate_key' $landscape_tfstate_key
+                  export landscape_tfstate_key=${az_var}
                 fi
 
-                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Deployer_Key_Vault.value" | tr -d \")
+                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Deployer_Key_Vault.value" --out tsv)
                 if [ -z ${az_var} ]; then
-                  export key_vault=$(grep keyvault= ${environment_file_name} | awk -F'=' '{print $2}' | xargs) ; echo 'Deployer Key Vault' $key_vault
+                  export key_vault=$(grep keyvault= ${environment_file_name} | awk -F'=' '{print $2}' | xargs)
                 else
-                  export key_vault=${az_var} ; echo 'Deployer Key Vault' $key_vault
+                  export key_vault=${az_var}
                 fi
 
                 az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "${NETWORK}"Workload_Key_Vault.value | tr -d \")
                 if [ -z ${az_var} ]; then
-                  export workload_key_vault=$(grep workloadkeyvault= ${environment_file_name} | awk -F'=' '{print $2}' | xargs) ; echo 'Workload Key Vault' ${workload_key_vault}
+                  export workload_key_vault=$(grep workloadkeyvault= ${environment_file_name} | awk -F'=' '{print $2}' | xargs)
                 else
-                  export workload_key_vault=${az_var} ; echo 'Workload Key Vault' ${workload_key_vault}
+                  export workload_key_vault=${az_var}
                 fi
 
+                echo "Deployer state file:                 $deployer_tfstate_key"
+                echo "Deployer Key Vault:                  $key_vault"
+                echo "Workload Zone state file:            $landscape_tfstate_key"
+                echo "Workload Zone Key Vault:             $workload_key_vault"
+
               echo -e "$green--- Run the installer script that deploys the SAP System ---$reset"
 
                 $SAP_AUTOMATION_REPO_PATH/deploy/scripts/installer.sh --parameterfile $(sap_system_configuration) --type sap_system \

deploy/pipelines/04-sap-software-download.yaml

@@ -117,7 +117,7 @@ stages:
                     echo "##vso[task.logissue type=error]Variable group $(variable_group) could not be found."
                     exit 2
                 fi
-                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Deployer_Key_Vault.value" | tr -d \")
+                az_var=$(az pipelines variable-group variable list --group-id ${VARIABLE_GROUP_ID} --query "Deployer_Key_Vault.value" --out tsv)
                 if [ -n ${az_var} ]; then
                     kv_name=${az_var}; echo "Key Vault="$kv_name
                 else