Add support for HANA Scaleout with HSR

.github/workflows/github-actions-ansible-lint.yml

@@ -6,10 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 #v5.2.0
         with:
           python-version: '3.x'
 

.github/workflows/ossf-scorecard.yml

@@ -0,0 +1,73 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '32 4 * * 5'
+  push:
+    branches: [ "main" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: readhttps://github.com/hdamecharla/sap-automation-kimforss/tree/main
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: results.sarif

Webapp/SDAF/Models/EnvironmentModel.cs

@@ -42,7 +42,7 @@ public class Variables
 
   public class Variable
   {
-    public string? value { get; set; }
+    public string value { get; set; }
     [JsonIgnore]
     public bool? isSecret { get; set; }
     [JsonIgnore]

Webapp/SDAF/SDAFWebApp.csproj

@@ -20,7 +20,7 @@
     <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.8.0" />
+    <PackageReference Include="Azure.ResourceManager.Network" Version="1.9.0" />
     <PackageReference Include="Azure.ResourceManager.Resources" Version="1.8.0" />
     <PackageReference Include="Azure.ResourceManager.Storage" Version="1.3.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.21.2" />

deploy/ansible/configuration_menu.sh

@@ -61,7 +61,7 @@ export ANSIBLE_PASSWORD=$password_secret
 # entry associated with the specific setting.
 #
 export           ANSIBLE_HOST_KEY_CHECKING=False
-export           ANSIBLE_INVENTORY="${sap_sid}_hosts.yaml"
+export           ANSIBLE_INVENTORY="${sap_sid%$'\r'}_hosts.yaml"
 export           ANSIBLE_PRIVATE_KEY_FILE=sshkey
 export           ANSIBLE_COLLECTIONS_PATHS=/opt/ansible/collections:${ANSIBLE_COLLECTIONS_PATHS:+${ANSIBLE_COLLECTIONS_PATHS}}
 
@@ -149,7 +149,7 @@ all_playbooks=(
 
 # Set of options that will be passed to the ansible-playbook command
 playbook_options=(
-        --inventory-file="${sap_sid}_hosts.yaml"
+        --inventory-file="${sap_sid%$'\r'}_hosts.yaml"
         --private-key=${ANSIBLE_PRIVATE_KEY_FILE}
         --extra-vars="_workspace_directory=`pwd`"
         --extra-vars="@${sap_params_file}"

deploy/ansible/playbook_02_os_sap_specific_config.yaml

@@ -162,12 +162,12 @@
 
         # we do not need to add the same assertion for subnet_cidr_client as it is
         # calculated for specific deployment scenarios.
-        - name:                        "SAP OS configuration playbook: - Set the subnet_client_cidr fact"
+        - name:                        "SAP OS configuration playbook: - Set the subnet_cidr_client fact"
           ansible.builtin.set_fact:
-            subnet_client_cidr:        "{{ subnet_cidr_client | default(azure_network_metadata.json.interface[0].ipv4.subnet[0].address + '/' + azure_network_metadata.json.interface[0].ipv4.subnet[0].prefix) }}"
+            subnet_cidr_client:        "{{ subnet_cidr_client | default(azure_network_metadata.json.interface[0].ipv4.subnet[0].address + '/' + azure_network_metadata.json.interface[0].ipv4.subnet[0].prefix) }}"
           when:
             - platform == 'HANA'
-            - db_scale_out
+            - database_scale_out
             - not database_high_availability
           tags:
             - always