Merge branch 'main' into DBA-818-BACKUP-REPORT

ministryofjustice · Dec 4, 2024 · ad524eb · ad524eb
2 parents 80575a5 + 4bc4eaf
commit ad524eb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
@@ -38,7 +38,7 @@ jobs:
         run: tflint --disable-rule=terraform_unused_declarations --format sarif > tflint.sarif
       - name: Upload SARIF file
         if: success() || failure()
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: tflint.sarif
   trivy:
@@ -64,7 +64,7 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: success() || failure()
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: 'trivy-results.sarif'
   checkov:
@@ -91,6 +91,6 @@ jobs:
           skip_check: CKV_GIT_1,CKV_AWS_126,CKV2_AWS_38,CKV2_AWS_39
       - name: Upload SARIF file
         if: success() || failure()
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: ./checkov.sarif
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: results.sarif
diff --git a/ansible/roles/oracle-oms-setup/tasks/create_jobs.yml b/ansible/roles/oracle-oms-setup/tasks/create_jobs.yml
@@ -18,7 +18,7 @@
     depth: 1
     file_type: file
   delegate_to: localhost
-  become: "{{ is_aws_environment | default(true) }}"
+  become: "{{ omit if (is_aws_environment | default(true)) else false }}"
   register: get_oem_job_property_files
   loop: "{{ application_groups.keys() | list + ['common'] }}"
   loop_control:

diff --git a/ansible/roles/oracle-oms-setup/tasks/import_metric_extensions.yml b/ansible/roles/oracle-oms-setup/tasks/import_metric_extensions.yml
@@ -26,7 +26,7 @@
     depth: 1
     file_type: directory
   delegate_to: localhost
-  become: "{{ is_aws_environment | default(true) }}"
+  become: "{{ omit if (is_aws_environment | default(true)) else false }}"
   register: get_metric_extensions
   loop: "{{ application_groups.keys() | list + ['common'] }}"
   loop_control: