Merge pull request #78 from navikt/cleanup

clean up yaml/bash a bit

Author: nocturnalnematode

.github/workflows/buildAndPublish.yml

@@ -1,19 +1,19 @@
 # Workflow: Build and Publish
 # Purpose: Builds Salesforce packages and publishes artifacts.
 # Triggers: Manual (workflow_dispatch) or workflow call.
-name: "Build and Publish"
+name: Build and Publish
 on:
   workflow_call:
     outputs:
       hasNewArtifacts:
-        description: "Whether new artifacts were generated during the build step."
+        description: Whether new artifacts were generated during the build step.
         value: ${{ jobs.buildAndPublish.outputs.artifactsFound || false}}
     secrets:
       METRICS_KEYS:
         required: true
       SF_DEVHUB_URL:
         required: true
-        description: "Salesforce DevHub authentication URL"
+        description: Salesforce DevHub authentication URL
   workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -82,7 +82,7 @@ jobs:
         uses: navikt/sf-gha-authenticateOrg@da2f995ee865e05111574719abfc5ba12b459f0c
         with:
           auth-url: ${{ secrets.SF_DEVHUB_URL }}
-          alias: "devhub"
+          alias: devhub
           setDefaultDevhubUsername: "true"
 
       - name: Get modified package names
@@ -105,12 +105,12 @@ jobs:
           if sfp build \
             --devhubalias devhub \
             --diffcheck \
-            --buildnumber "${GITHUB_RUN_ID}" \
+            --buildnumber "$GITHUB_RUN_ID" \
             --branch main \
-            --releaseconfig "${PATH_TO_CONFIG_FILE}" \
-            --loglevel "${SFP_LOG_LEVEL}" \
+            --releaseconfig "$PATH_TO_CONFIG_FILE" \
+            --loglevel "$SFP_LOG_LEVEL" \
             2>&1; then
-            
+
             # Check if artifacts were generated
             if [ -d "artifacts" ] && [ -n "$(ls -A artifacts)" ]; then
               echo "Artifacts found"
@@ -131,7 +131,7 @@ jobs:
         if: steps.build.outputs.artifactsFound == 'true'
         with:
           files: sfdx-project.json
-          commitMessage: "Update package versions for impacted packages"
+          commitMessage: Update package versions for impacted packages
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish Artifacts
@@ -142,9 +142,9 @@ jobs:
           sfp publish \
             --artifactdir artifacts \
             --npm \
-            --scope "@${SCOPE}" \
+            --scope "@$SCOPE" \
             --devhubalias devhub \
-            --loglevel "${SFP_LOG_LEVEL}" \
+            --loglevel "$SFP_LOG_LEVEL" \
             --gittag \
             --pushgittag \
             --logsgroupsymbol ::group::,::endgroup:: \
@@ -162,7 +162,7 @@ jobs:
         if: steps.build.outputs.artifactsFound == 'true'
         uses: navikt/sf-platform/.github/actions/uploadWorkflowArtifactsAndLogs@2587bfd49c2659fb02009a3329618e7069915f5d
         with:
-          artifactName: "build-artifacts"
+          artifactName: build-artifacts
           uploadArtifacts: true
-          logName: "build-logs"
+          logName: build-logs
           publishLogs: true

.github/workflows/ciCreatePlatformPool.yml

@@ -1,18 +1,18 @@
-name: "Replenish platform pools"
+name: Replenish platform pools
 on:
   workflow_call:
     inputs:
       gitRef:
-        description: "Commit Id from where the pools should be created"
+        description: Commit Id from where the pools should be created
         required: false
-        default: "main"
+        default: main
         type: string
       poolMatrixDefPath:
-        description: "Path to the file describing the pools to create"
+        description: Path to the file describing the pools to create
         required: true
         type: string
       clearPools:
-        description: "If checked, clear unused scratches in the pools"
+        description: If checked, clear unused scratches in the pools
         required: true
         type: boolean
     secrets:
@@ -24,21 +24,21 @@ on:
   workflow_dispatch:
     inputs:
       gitRef:
-        description: "Commit Id from where the pools should be created"
+        description: Commit Id from where the pools should be created
         required: false
-        default: "main"
+        default: main
       poolMatrixDefPath:
-        description: "Path to the file describing the pools to create"
+        description: Path to the file describing the pools to create
         required: true
-        default: "config/poolMatrixdef.json"
+        default: config/poolMatrixdef.json
       clearPools:
-        description: "If checked, clear unused scratches in the pools"
+        description: If checked, clear unused scratches in the pools
         required: true
         default: "false"
 
 jobs:
   checkScratchLimitsThreshold:
-    name: "Check Scratch limits"
+    name: Check Scratch limits
     runs-on: ubuntu-latest
     permissions: {}
     outputs:
@@ -49,13 +49,13 @@ jobs:
         with:
           version: ${{ vars.SF_CLI_VERSION }}
 
-      - name: "Authenticate Dev Hub"
+      - name: Authenticate Dev Hub
         uses: navikt/sf-gha-authenticateOrg@da2f995ee865e05111574719abfc5ba12b459f0c
         with:
           auth-url: ${{ secrets.SF_DEVHUB_URL }}
           alias: devhub
 
-      - name: "Check scratch org limits"
+      - name: Check scratch org limits
         id: checkLimits
         run: |
           printf 'get org limits...\n' >&2
@@ -71,14 +71,14 @@ jobs:
           echo "canReplenishPool=true" >> "$GITHUB_OUTPUT"
 
           printf 'Check remaining daily scratch orgs\n' >&2
-          if [ $remainingDailyScratchOrgs -lt ${POOL_REMAINING_DAILY_SCRATCH_ORG_LIMIT} ]; then
-            echo "::warning title=To few remaining daily scratch orgs::Max daily scatch orgs: $maxDailyScratchOrgs. Remaining daily scratch orgs: $remainingDailyScratchOrgs. Threshold: ${POOL_REMAINING_DAILY_SCRATCH_ORG_LIMIT}."
+          if [ $remainingDailyScratchOrgs -lt $POOL_REMAINING_DAILY_SCRATCH_ORG_LIMIT ]; then
+            echo "::warning title=Too few remaining daily scratch orgs::Max daily scatch orgs: $maxDailyScratchOrgs. Remaining daily scratch orgs: $remainingDailyScratchOrgs. Threshold: $POOL_REMAINING_DAILY_SCRATCH_ORG_LIMIT."
             echo "canReplenishPool=false" >> "$GITHUB_OUTPUT"
           fi
 
           printf 'Check remaining active scratch orgs\n' >&2
-          if [ $remainingActiveScratchOrgs -lt ${POOL_REMAINING_ACTIVE_SCRATCH_ORG_LIMIT} ]; then
-            echo "::warning title=To many active Scratch Orgs::Max active scratch orgs: $maxActiveScratchOrgs. Remaining scratch orgs: $remainingActiveScratchOrgs. Threshold: ${POOL_REMAINING_ACTIVE_SCRATCH_ORG_LIMIT}."
+          if [ $remainingActiveScratchOrgs -lt $POOL_REMAINING_ACTIVE_SCRATCH_ORG_LIMIT ]; then
+            echo "::warning title=Too many active Scratch Orgs::Max active scratch orgs: $maxActiveScratchOrgs. Remaining scratch orgs: $remainingActiveScratchOrgs. Threshold: $POOL_REMAINING_ACTIVE_SCRATCH_ORG_LIMIT."
             echo "canReplenishPool=false" >> "$GITHUB_OUTPUT"
           fi
 
@@ -95,7 +95,7 @@ jobs:
           ref: ${{ inputs.gitRef }}
           fetch-depth: 0
           persist-credentials: false
-      - name: "Authenticate Dev Hub"
+      - name: Authenticate Dev Hub
         uses: navikt/sf-gha-authenticateOrg@da2f995ee865e05111574719abfc5ba12b459f0c
         with:
           auth-url: ${{ secrets.SF_DEVHUB_URL }}
@@ -136,13 +136,13 @@ jobs:
 
       - id: getMatrix
         run: |
-          content=$(jq --compact-output '.' "${POOL_MATRIX_DEF_PATH}")  
+          content=$(jq --compact-output '.' "$POOL_MATRIX_DEF_PATH")
           echo "matrixJson=$content" >> "$GITHUB_OUTPUT"
         env:
           POOL_MATRIX_DEF_PATH: ${{ inputs.poolMatrixDefPath }}
 
   createPool:
-    name: "Replenish Pool"
+    name: Replenish Pool
     needs: [prepareMatrix, checkScratchLimitsThreshold]
     if: needs.checkScratchLimitsThreshold.outputs.canReplenishPool
     runs-on: ubuntu-latest
@@ -174,36 +174,36 @@ jobs:
           echo Pool Tag: "$POOL_TAG"
           echo Pool Config Path: ${{ matrix.pool.poolConfigPath }}
           echo Pool Delete Job Type: ${{ matrix.pool.deleteJobType }}
-          echo Clear unused scratch orgs: ${CLEAR_POOLS}
+          echo Clear unused scratch orgs: "$CLEAR_POOLS"
         env:
           CLEAR_POOLS: ${{ inputs.clearPools }}
 
-      - name: "Authenticate Dev Hub"
+      - name: Authenticate Dev Hub
         uses: navikt/sf-gha-authenticateOrg@da2f995ee865e05111574719abfc5ba12b459f0c
         with:
           auth-url: ${{ secrets.SF_DEVHUB_URL }}
           alias: devhub
 
-      - name: "Clear pool"
+      - name: Clear pool
         id: clearPool
         if: ${{ inputs.clearPools }}
         uses: navikt/sf-gha-deleteScratchPool@1f0986d2312a2969e658946acb496f6dcd7d4032
         with:
-          devhub: "devhub"
+          devhub: devhub
           poolTag: ${{ env.POOL_TAG }}
           deleteJobType: ${{ matrix.pool.deleteJobType }}
           isCiPool: ${{ matrix.pool.isCiPool }}
 
-      - name: "Create Pool"
+      - name: Create Pool
         run: |
           sfp pool prepare --poolconfig "${{ matrix.pool.poolConfigPath }}" --targetdevhubusername devhub
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: "Delete orphans"
+      - name: Delete orphans
         uses: navikt/sf-gha-deleteScratchPool@1f0986d2312a2969e658946acb496f6dcd7d4032
         with:
-          devhub: "devhub"
+          devhub: devhub
           deleteJobType: orphans
           isCiPool: ${{ matrix.pool.isCiPool }}
 

.github/workflows/ciCreatePlatformPoolScheduled.yml

@@ -1,4 +1,4 @@
-name: "SHEDULED Replenish platform pools"
+name: SHEDULED Replenish platform pools
 on:
   # Det er satt opp skedulering for når poolet oppdateres.
   # Det er ikke behov for å kjøre denne jobber 24/7 og det er derfor satt opp noen skeduleringer (husk at tid er UTC)

.github/workflows/ciStaticCodeValidation.yml

@@ -1,21 +1,21 @@
-name: "Run static code validation"
+name: Run static code validation
 on:
   workflow_call:
     inputs:
       validateEntireRepo:
-        description: "Validate entire repo (setting to false will only validate the diff against main)"
+        description: Validate entire repo (setting to false will only validate the diff against main)
         default: true
         required: false
         type: boolean
       gitRef:
-        description: "Which git ref to use"
+        description: Which git ref to use
         default: ${{ github.ref }}
         required: false
         type: string
   workflow_dispatch:
     inputs:
       validateEntireRepo:
-        description: "Validate entire repo (unchecking will only validate the diff against main)"
+        description: Validate entire repo (unchecking will only validate the diff against main)
         default: true
         required: false
         type: boolean
@@ -28,23 +28,23 @@ jobs:
       security-events: write
     defaults:
       run:
-        shell: "bash"
+        shell: bash
     steps:
-      - name: "Install SF CLI"
+      - name: Install SF CLI
         uses: navikt/sf-platform/.github/actions/installSfCli@cdc0fe1ab477cdf5c025f6591f9da7601e3914f1
         with:
           version: ${{ vars.SF_CLI_VERSION }}
 
       - name: "Install Salesforce Code Analyzer"
         run: |
           echo "::group::Install Salesforce Code Analyzer Plugin"
-          sf plugins install code-analyzer@${SF_SCANNER_VERSION}
+          sf plugins install code-analyzer@"$SF_SCANNER_VERSION"
           sf plugins --core
           echo "::endgroup::"
         env:
           SF_SCANNER_VERSION: ${{ vars.SF_SCANNER_VERSION }}
 
-      - name: "Checkout"
+      - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           ref: ${{ inputs.gitRef }}
@@ -61,17 +61,17 @@ jobs:
           prettierPathsToValidate='**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}'
           sfCodeAnalyzerPathToValidate='src'
 
-          if [ "${VALIDATE_ENTIRE_REPO}" = "false" ]; then
+          if [ "$VALIDATE_ENTIRE_REPO" = "false" ]; then
             mapfile -t prettier_diffed_files_to_lint < <(git diff --name-only --diff-filter=d HEAD~ -- \*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml})
             mapfile -t codeAnalyzer_diffed_sf_files < <(git diff --name-only --diff-filter=d HEAD~ -- src/**/*.{cls,cmp,component,css,html,js,json,page,trigger,xml})
             codeAnalyzer_json=$(jq -c -n '$ARGS.positional' --args "${codeAnalyzer_diffed_sf_files[@]}")
-            
+
             prettierPathsToValidate="$(printf "%s\n" "${prettier_diffed_files_to_lint[@]}")"
             sfCodeAnalyzerPathToValidate="$codeAnalyzer_json"
           fi
 
-          echo "prettierPathsToValidate=$prettierPathsToValidate" >> $GITHUB_OUTPUT
-          echo "sfCodeAnalyzerPathToValidate=$sfCodeAnalyzerPathToValidate" >> $GITHUB_OUTPUT
+          echo "prettierPathsToValidate=$prettierPathsToValidate" >> "$GITHUB_OUTPUT"
+          echo "sfCodeAnalyzerPathToValidate=$sfCodeAnalyzerPathToValidate" >> "$GITHUB_OUTPUT"
         env:
           VALIDATE_ENTIRE_REPO: ${{ inputs.validateEntireRepo != '' && inputs.validateEntireRepo || true }}