From c322ae9a56d9a0337940c246f1ec8b36f02682c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2024 18:10:14 +0000
Subject: [PATCH 1/2] Bump github/codeql-action from 3.27.5 to 3.27.6

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.5 to 3.27.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f09c1c0a94de965c15400f5634aa42fac8fb8f88...aa578102511db1f4524ed59b8cc2bae4f6e88195)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/code-scanning.yml | 6 +++---
 .github/workflows/scorecards.yml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
index ab2b0d18a..412f5c87d 100644
--- 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
index ebf3cd1d4..2d26721a2 100644
--- 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

From 2e9d6217062292470ece7dab5b61e4560696ef44 Mon Sep 17 00:00:00 2001
From: Bill Buchan <bill.buchan@digital.justice.gov.uk>
Date: Wed, 4 Dec 2024 11:48:08 +0000
Subject: [PATCH 2/2] Do not set become: if running in AWS

Reversion to previous behaviour within AWS.   Outside AWS must explicitly set this false.
---
 ansible/roles/oracle-oms-setup/tasks/create_jobs.yml            | 2 +-
 .../roles/oracle-oms-setup/tasks/import_metric_extensions.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/oracle-oms-setup/tasks/create_jobs.yml b/ansible/roles/oracle-oms-setup/tasks/create_jobs.yml
index 8dc978d58..61da085cb 100644
--- 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
index 17b4c74d4..7188aacd6 100644
--- 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: