Merge branch 'main' into rfc-migrate-sql-views-procs-vol-app

dvsa · Dec 6, 2024 · c8a671d · c8a671d
2 parents 98b6d83 + 909e697
commit c8a671d
Show file tree

Hide file tree

Showing 25 changed files with 4,173 additions and 1,507 deletions.
diff --git a/.github/workflows/deploy-environment.yaml b/.github/workflows/deploy-environment.yaml
@@ -157,6 +157,16 @@ jobs:
         id: init
         run: terraform init -no-color -input=false -upgrade
 
+      - name: Get Current Versions from Terraform State
+        id: get_current_versions
+        run: |
+          terraform output -json > outputs.json || true
+          if [ -s outputs.json ] && [ "$(jq -r 'length' outputs.json)" -gt 0 ]; then
+            jq -r 'to_entries[] | select(.key | startswith("deployed_")) | "\(.key | ltrimstr("deployed_"))=\(.value.value // "")"' outputs.json >> $GITHUB_OUTPUT
+          else
+            echo "No outputs found, could be first run"
+          fi
+
       - name: Select workspace
         if: ${{ inputs.workspace }}
         run: terraform workspace select -or-create ${{ inputs.workspace }}
@@ -277,16 +287,6 @@ jobs:
               })
             }
 
-      - name: Get Current Versions from Terraform State
-        id: get_current_versions
-        run: |
-          terraform output -json > outputs.json
-          echo "api_image_tag=$(jq -r '.api_image_tag.value' outputs.json)" >> $GITHUB_OUTPUT
-          echo "cli_image_tag=$(jq -r '.cli_image_tag.value' outputs.json)" >> $GITHUB_OUTPUT
-          echo "selfserve_image_tag=$(jq -r '.selfserve_image_tag.value' outputs.json)" >> $GITHUB_OUTPUT
-          echo "internal_image_tag=$(jq -r '.internal_image_tag.value' outputs.json)" >> $GITHUB_OUTPUT
-          echo "assets_version=$(jq -r '.assets_version.value' outputs.json)" >> $GITHUB_OUTPUT
-
       - name: Apply
         id: apply
         if: ${{ inputs.apply }}

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -92,7 +92,7 @@ jobs:
           cache-to: type=gha,mode=max,scope=${{ inputs.project }}
 
       - name: Scan
-        uses: aquasecurity/trivy-action@0.28.0
+        uses: aquasecurity/trivy-action@0.29.0
         with:
           image-ref: ${{ steps.build.outputs.imageid }}
           skip-dirs: /var/clamav

diff --git a/.github/workflows/security-docker.yaml b/.github/workflows/security-docker.yaml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Scan
-        uses: aquasecurity/trivy-action@0.28.0
+        uses: aquasecurity/trivy-action@0.29.0
         with:
           exit-code: 1
           scan-ref: "infra/docker"

diff --git a/.github/workflows/security-terraform.yaml b/.github/workflows/security-terraform.yaml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Scan
-        uses: aquasecurity/trivy-action@0.28.0
+        uses: aquasecurity/trivy-action@0.29.0
         with:
           exit-code: 1
           scan-ref: "infra/terraform"

diff --git a/app/api/config/autoload/config.global.php b/app/api/config/autoload/config.global.php
@@ -317,7 +317,7 @@
             'oauth2' => [
                 'client_id' => '%olcs_txc_client_id%',
                 'client_secret' => '%olcs_txc_client_secret%',
-                'token_url' => '',
+                'token_url' => '%olcs_txc_token_url%',
                 'scope' => '%olcs_txc_scope%',
                 'proxy' => 'http://%shd_proxy%',
                 'service_name' => 'TransXchange',
@@ -343,7 +343,7 @@
     'nr' => [
         // @to-do currently waiting on the actual nr address
         'inr_service' => [
-            'uri' => '',
+            'uri' => '%olcs_natreg_uri%',
             'adapter' => Laminas\Http\Client\Adapter\Curl::class,
             'options' => [
                 'sslcert' => '/opt/dvsa/inr/certs/inr_client_cert.pem',
@@ -359,7 +359,7 @@
             ]
         ],
         'repute_url' => [
-            'uri' => ''
+            'uri' => '%olcs_natreg_repute%'
         ],
     ],
 

diff --git a/app/api/module/Api/src/Entity/Pi/Pi.php b/app/api/module/Api/src/Entity/Pi/Pi.php
@@ -451,9 +451,9 @@ private function isClosableWrittenOutcome()
     /**
      * Is this a Transport Manager Pi?
      */
-    public function isTm()
+    public function isTm(): bool
     {
-        return $this->case->isTm();
+        return $this->case instanceof CasesEntity && $this->case->isTm();
     }
 
     /**