CCM-11938: Fix sonar issues

Author: sidnhs

.github/actions/build-proxies/action.yml

@@ -71,21 +71,28 @@ runs:
 
     - name: Build ${{ inputs.apimEnv }} oas
       working-directory: .
+      env:
+        APIM_ENV: ${{ inputs.apimEnv }}
       shell: bash
       run: |
-        if [ ${{ inputs.apimEnv }} == "internal-dev-sandbox" ] && [ ${{ inputs.buildSandbox }} == true ]
+        if [ ${{ env.APIM_ENV }} == "internal-dev-sandbox" ] && [ ${{ inputs.buildSandbox }} == true ]
         then
           echo "Building sandbox OAS spec"
           make build-json-oas-spec APIM_ENV=sandbox
         else
           echo "Building env specific OAS spec"
-          make build-json-oas-spec APIM_ENV=${{ inputs.apimEnv }}
+          make build-json-oas-spec APIM_ENV=${{ env.APIM_ENV }}
+        fi
+        if [[ $APIM_ENV == *-pr ]]; then
+          echo "Removing pr suffix from APIM_ENV after building OAS and calling proxygen"
+          APIM_ENV=$(echo "$APIM_ENV" | sed 's/-pr$//')
+          echo "APIM_ENV=$APIM_ENV" >> $GITHUB_ENV
         fi
 
     - name: Upload OAS Spec
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ inputs.apimEnv }}-build-output
+        name: ${{ env.APIM_ENV }}-build-output
         path: ./build
 
     - name: Trigger deploy proxy
@@ -101,7 +108,7 @@ runs:
           --targetEnvironment "${{ inputs.environment }}" \
           --runId "${{ inputs.runId }}" \
           --buildSandbox ${{ inputs.buildSandbox }} \
-          --apimEnvironment "${{ inputs.apimEnv }}" \
+          --apimEnvironment "${{ env.APIM_ENV }}" \
           --boundedContext "notify-supplier" \
           --targetDomain "$TARGET_DOMAIN" \
           --version "${{ inputs.version }}"

.github/workflows/manual-proxy-environment-deploy.yaml

@@ -67,18 +67,7 @@ jobs:
 
           echo "ENVIRONMENT=$ENVIRONMENT" >> $GITHUB_ENV
           echo "APIM_ENV=$APIM_ENV" >> $GITHUB_ENV
-      - name: Build environment oas
-        working-directory: .
-        env:
-          APIM_ENV: ${{ env.APIM_ENV }}
-        shell: bash
-        run: |
-            make build-json-oas-spec APIM_ENV=$APIM_ENV
-            if [[ $APIM_ENV == *-pr ]]; then
-              echo "Removing pr suffix from APIM_ENV after building OAS and calling proxygen"
-              APIM_ENV=$(echo "$APIM_ENV" | sed 's/-pr$//')
-              echo "APIM_ENV=$APIM_ENV" >> $GITHUB_ENV
-            fi
+
       - name: "Build proxies"
         env:
           PROXYGEN_API_NAME: nhs-notify-supplier

scripts/config/sonar-scanner.properties

@@ -3,8 +3,8 @@
 sonar.host.url=https://sonarcloud.io
 sonar.qualitygate.wait=true
 sonar.sourceEncoding=UTF-8
-sonar.sources=lambdas/example-lambda
-sonar.tests=tests/, lambdas/example-lambda/src/__tests__
+sonar.sources=lambdas/api-handler/src, lambdas/authorizer/src
+sonar.tests=tests/, lambdas/authorizer/src/__tests__
 sonar.exclusions=lambdas/*/src/__tests__/**/*
 sonar.terraform.provider.aws.version=5.54.1
 sonar.cpd.exclusions=**.test.*