From 9f8ffd77e36f5dbb58c1a330d79c13ab17e52526 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 11:02:47 +0000
Subject: [PATCH 01/16] task: actionlint

---
 .github/workflows/code-health.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index bf2d896575..2a3d49c64f 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -111,6 +111,17 @@ jobs:
             echo "Try running: make gen-docs"
             exit 1
           fi
+  actionlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Download actionlint
+        id: get_actionlint
+        run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+        shell: bash
+      - name: Check workflow files
+        run: ${{ steps.get_actionlint.outputs.executable }} -color
+        shell: bash
   mocks:
     runs-on: ubuntu-latest
     steps:

From fdca88741849cc88f086ba6cf1772bcee79353ef Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 11:45:33 +0000
Subject: [PATCH 02/16] annotation

---
 .github/workflows/code-health.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index 2a3d49c64f..ca126deba1 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -102,8 +102,10 @@ jobs:
         run: make gen-docs > /dev/null
       - name: Check for uncommited files
         run: |
-          export FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
-          export LINES=$(echo "$FILES" | awk 'NF' | wc -l)
+          export FILES=
+          FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
+          export LINES=
+          LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ $LINES -ne 0 ]; then
             echo "Detected files that need to be committed:"
             echo "$FILES" | sed -e "s/^/  /"
@@ -120,7 +122,9 @@ jobs:
         run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
         shell: bash
       - name: Check workflow files
-        run: ${{ steps.get_actionlint.outputs.executable }} -color
+        run: |
+          echo "::add-matcher::.github/actionlint-matcher.json"
+          ${{ steps.get_actionlint.outputs.executable }} -color
         shell: bash
   mocks:
     runs-on: ubuntu-latest
@@ -139,7 +143,7 @@ jobs:
         run: |
           export FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
           export LINES=$(echo "$FILES" | awk 'NF' | wc -l)
-          if [ $LINES -ne 0 ]; then
+          if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
             echo "$FILES" | sed -e "s/^/  /"
             echo ""

From bbd56f3fd96edb136f4838b566a13348092e14e7 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 11:48:19 +0000
Subject: [PATCH 03/16] Create actionlint-matcher.json

---
 .github/actionlint-matcher.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/actionlint-matcher.json

diff --git a/.github/actionlint-matcher.json b/.github/actionlint-matcher.json
new file mode 100644
index 0000000000..4613e1617b
--- /dev/null
+++ b/.github/actionlint-matcher.json
@@ -0,0 +1,17 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "actionlint",
+      "pattern": [
+        {
+          "regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4,
+          "code": 5
+        }
+      ]
+    }
+  ]
+}

From fd03ae06fb78329b2c3e25d38ac844450b05ac1d Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 11:56:18 +0000
Subject: [PATCH 04/16] Update code-health.yml

---
 .github/workflows/code-health.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index ca126deba1..a8cb3c759d 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -106,7 +106,7 @@ jobs:
           FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
           export LINES=
           LINES=$(echo "$FILES" | awk 'NF' | wc -l)
-          if [ $LINES -ne 0 ]; then
+          if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
             echo "$FILES" | sed -e "s/^/  /"
             echo ""
@@ -141,8 +141,10 @@ jobs:
         run: make gen-mocks
       - name: Check for uncommited files
         run: |
-          export FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
-          export LINES=$(echo "$FILES" | awk 'NF' | wc -l)
+          export FILES=
+          FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
+          export LINES=
+          LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
             echo "$FILES" | sed -e "s/^/  /"

From a0e93ae951896a058410423c4af281d9d5c24f04 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 12:04:17 +0000
Subject: [PATCH 05/16] Update code-health.yml

---
 .github/workflows/code-health.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index a8cb3c759d..285e214b3d 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -108,6 +108,7 @@ jobs:
           LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
+            # shellcheck disable=SC2001
             echo "$FILES" | sed -e "s/^/  /"
             echo ""
             echo "Try running: make gen-docs"
@@ -147,6 +148,7 @@ jobs:
           LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
+            # shellcheck disable=SC2001
             echo "$FILES" | sed -e "s/^/  /"
             echo ""
             echo "Try running: make gen-mocks"

From 5215fa695bb21dd160e4ab3562d8795a2a698e39 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 12:08:33 +0000
Subject: [PATCH 06/16] fixes

---
 .github/workflows/code-health.yml    | 8 +++++---
 .github/workflows/docker-release.yml | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index 285e214b3d..3acc30a80b 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -174,9 +174,11 @@ jobs:
         run: go mod tidy
       - name: Check for uncommited files
         run: |
-          export FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
-          export LINES=$(echo "$FILES" | awk 'NF' | wc -l)
-          if [ $LINES -ne 0 ]; then
+          export FILES=
+          FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
+          export LINES=
+          LINES=$(echo "$FILES" | awk 'NF' | wc -l)
+          if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
             echo "$FILES" | sed -e "s/^/  /"
             echo ""
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 12a7a5e7e1..141388ffef 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -69,7 +69,7 @@ jobs:
         id: set-date
         run: |
           DATE=$(date +'%Y-%m-%d')
-          echo DATE=${DATE} >> $GITHUB_ENV
+          echo "DATE=${DATE}" >> "$GITHUB_ENV"
       - name: 'Get latest tag'
         id: get-latest-tag
         uses: oprypin/find-latest-tag@e1e0e606cc7e9ede25140a5a139b3a5a1b717ece
@@ -80,7 +80,7 @@ jobs:
       - name: Extract version
         run: |
           release_tag=${{ steps.get-latest-tag.outputs.tag }}
-          echo "LATEST_VERSION=${release_tag#*/}" >> $GITHUB_ENV
+          echo "LATEST_VERSION=${release_tag#*/}" >> "$GITHUB_ENV"
       - name: Enable containerd image store # See https://github.com/docker/setup-buildx-action/issues/257#issuecomment-1722284952
         uses: crazy-max/ghaction-setup-docker@c2351bbd0bfab8cd65e684219ad8ea46a6d093f3
         with:

From 73ad65956a29be07c3dea80e0a81a9b6931cd935 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 12:09:34 +0000
Subject: [PATCH 07/16] Update code-health.yml

---
 .github/workflows/code-health.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index 3acc30a80b..e73b7108bb 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -180,6 +180,7 @@ jobs:
           LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
+            # shellcheck disable=SC2001
             echo "$FILES" | sed -e "s/^/  /"
             echo ""
             echo "Try running: go mod tidy"

From 062ba51721c854d7f89a4ab4d916abfb8c4f5acc Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 12:10:02 +0000
Subject: [PATCH 08/16] Update docker-release.yml

---
 .github/workflows/docker-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 141388ffef..2b998b476c 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -18,7 +18,7 @@ jobs:
         id: set-date
         run: |
           DATE=$(date +'%Y-%m-%d')
-          echo DATE=${DATE} >> $GITHUB_ENV
+          echo "DATE=${DATE}" >> "$GITHUB_ENV"
       - name: 'Get latest tag'
         id: get-latest-tag
         uses: oprypin/find-latest-tag@e1e0e606cc7e9ede25140a5a139b3a5a1b717ece

From 35627723b3737cf4e405454440b5c8cd0aaaa53e Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 12:14:17 +0000
Subject: [PATCH 09/16] Update docker-release.yml

---
 .github/workflows/docker-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 2b998b476c..98b6b01261 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Extract version
         run: |
           release_tag=${{ steps.get-latest-tag.outputs.tag }}
-          echo "LATEST_VERSION=${release_tag#*/}" >> $GITHUB_ENV
+          echo "LATEST_VERSION=${release_tag#*/}" >> "$GITHUB_ENV"
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226
       - name: Login to Docker Hub

From 0458693de0a4b4e572e6d14a4fdbb7af095e5ead Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 13:57:58 +0000
Subject: [PATCH 10/16] Update code-health.yml

---
 .github/workflows/code-health.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index e73b7108bb..315cb3e387 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -100,7 +100,7 @@ jobs:
           go-version-file: 'go.mod'
       - name: Generate docs
         run: make gen-docs > /dev/null
-      - name: Check for uncommited files
+      - name: Check for uncommitted files
         run: |
           export FILES=
           FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
@@ -108,8 +108,7 @@ jobs:
           LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
-            # shellcheck disable=SC2001
-            echo "$FILES" | sed -e "s/^/  /"
+            echo "${FILES//^/ }"
             echo ""
             echo "Try running: make gen-docs"
             exit 1
@@ -148,8 +147,7 @@ jobs:
           LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
-            # shellcheck disable=SC2001
-            echo "$FILES" | sed -e "s/^/  /"
+            echo "${FILES//^/ }"
             echo ""
             echo "Try running: make gen-mocks"
             exit 1
@@ -180,8 +178,7 @@ jobs:
           LINES=$(echo "$FILES" | awk 'NF' | wc -l)
           if [ "$LINES" -ne 0 ]; then
             echo "Detected files that need to be committed:"
-            # shellcheck disable=SC2001
-            echo "$FILES" | sed -e "s/^/  /"
+            echo "${FILES//^/ }"
             echo ""
             echo "Try running: go mod tidy"
             exit 1

From a78e50591e9f0f3c87364e6c40dca778b3c87783 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 14:03:35 +0000
Subject: [PATCH 11/16] Update docker-release.yml

---
 .github/workflows/docker-release.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 98b6b01261..d4d1696e41 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -109,15 +109,15 @@ jobs:
           IMAGE: ${{ env.STAGING_IMAGE_REPOSITORY }}:latest
         run: |
           docker pull "${IMAGE}"
-          
           # DIGESTS contains a list of three digests separated by a comma.
-          DIGESTS=$(docker buildx imagetools inspect $IMAGE --format '{{- range .Manifest.Manifests}}{{- if eq .Platform.OS "linux" }}{{ .Digest }},{{- end }}{{- end }}{{- .Manifest.Digest }}
-          ')
+            DIGESTS=$(docker buildx imagetools inspect "${IMAGE}" --format '{{- range .Manifest.Manifests}}{{- if eq .Platform.OS "linux" }}{{ .Digest }},{{- end }}{{- end }}{{- .Manifest.Digest }}
+            ')
           echo "These are the Docker image DIGESTS: ${DIGESTS}"
           
-          echo "GRS_CONFIG_USER1_USERNAME=${GRS_USERNAME}" >> "signing-envfile"
-          echo "GRS_CONFIG_USER1_PASSWORD=${GRS_PASSWORD}" >> "signing-envfile"
-          echo "COSIGN_REPOSITORY=${SIGNATURE_REPO}" >> "signing-envfile"
+          {
+           echo "GRS_CONFIG_USER1_USERNAME=${GRS_USERNAME}"
+           echo "GRS_CONFIG_USER1_PASSWORD=${GRS_PASSWORD}"
+          } >> "signing-envfile"
           
           echo "${DOCKERHUB_SECRET}" | docker login --password-stdin --username "${DOCKERHUB_USER}"
           for DIGEST in $(echo "$DIGESTS" | tr ',' ' '); do
@@ -127,10 +127,10 @@ jobs:
               --env-file=signing-envfile \
               --rm \
               -v ~/.docker/config.json:/root/.docker/config.json \
-              -v $(pwd):$(pwd) \
-              -w $(pwd) \
+              -v "$(pwd):$(pwd)" \
+              -w "$(pwd)" \
               artifactory.corp.mongodb.com/release-tools-container-registry-local/garasign-cosign \
-              cosign sign --key "${PKCS11_URI}" --sign-container-identity=index.docker.io/mongodb/atlas --tlog-upload=false "${IMAGE}@${DIGEST}"  
+              cosign sign --key "${PKCS11_URI}" --sign-container-identity=index.docker.io/mongodb/atlas --tlog-upload=false "${IMAGE}@${DIGEST}"
           done
       - name: Push image to dockerhub public registry
         run: |

From cf47cf665633ac743de8950637ea200c750024ff Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 14:23:06 +0000
Subject: [PATCH 12/16] Update dependabot.yml

---
 .github/workflows/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
index da150e8699..75924f2f27 100644
--- a/.github/workflows/dependabot.yml
+++ b/.github/workflows/dependabot.yml
@@ -21,7 +21,7 @@
       - name: Find JIRA team
         id: find
         run: |
-          echo "assigned_team="$(git diff HEAD~1..HEAD -- go.mod | grep -v "// indirect" | grep -i "^\-" | grep -v "^\-\-\-" | awk '{print $2}' | xargs -I $ echo "jq -r \".\\\"$\\\"\" < build/ci/library_owners.json" | sh | xargs -I $ echo "jq -r \".\\\"$\\\"\" < build/ci/library_owners_jira.json" | sh | head -1)  >> "${GITHUB_OUTPUT}"
+          echo "assigned_team=$(git diff HEAD~1..HEAD -- go.mod | grep -v "// indirect" | grep -i "^\-" | grep -v "^\-\-\-" | awk '{print $2}' | xargs -I $ echo "jq -r \".\\\"$\\\"\" < build/ci/library_owners.json" | sh | xargs -I $ echo "jq -r \".\\\"$\\\"\" < build/ci/library_owners_jira.json" | sh | head -1)"  >> "${GITHUB_OUTPUT}"
       - name: Create JIRA ticket
         id: create
         shell: bash

From 61a152f9cc5c6dfafbbd920e5425ecca01fedb7a Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 14:27:19 +0000
Subject: [PATCH 13/16] Update docker-release.yml

---
 .github/workflows/docker-release.yml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index d4d1696e41..2a215508ff 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -178,18 +178,14 @@ jobs:
       - name: Verify Signature Docker Image
         env:
           IMAGE: ${{ env.IMAGE_REPOSITORY }}:latest
+          COSIGN_REPOSITORY: docker:io/mongodb/signatures
         run: |
           # Download MongoDB Atlas CLI Public Key
-          curl https://cosign.mongodb.com/atlas-cli.pem > atlas-cli.pem
-          
-          # Download Docker Image
-          docker pull "${IMAGE}"
-          
+          curl https://cosign.mongodb.com/atlas-cli.pem > atlas-cli.pem          
+          docker pull "${IMAGE}"          
           # Verify the signature
-          COSIGN_REPOSITORY=docker.io/mongodb/signatures cosign verify --private-infrastructure --key=./atlas-cli.pem "docker.io/${IMAGE}"
-          
-          # Check the exit status of cosign verify
-          if [ $? -ne 0 ]; then
+          if cosign verify --private-infrastructure --key=./atlas-cli.pem "docker.io/${IMAGE}";
+          then
             echo "Error: Signature verification for ${IMAGE} failed."
             exit 1
           fi
@@ -221,18 +217,14 @@ jobs:
       - name: Verify Signature Quay Image
         env:
           IMAGE: ${{ env.QUAY }}/${{ env.IMAGE_REPOSITORY }}:latest
+          COSIGN_REPOSITORY: docker:io/mongodb/signatures
         run: |
           # Download MongoDB Atlas CLI Public Key
-          curl https://cosign.mongodb.com/atlas-cli.pem > atlas-cli.pem
-          
-          # Download Quay Image
-          docker pull "${IMAGE}"
-          
+          curl https://cosign.mongodb.com/atlas-cli.pem > atlas-cli.pem          
+          docker pull "${IMAGE}"          
           # Verify the signature
-          COSIGN_REPOSITORY=docker.io/mongodb/signatures cosign verify --private-infrastructure --key=./atlas-cli.pem "${IMAGE}"
-          
-          # Check the exit status of cosign verify
-          if [ $? -ne 0 ]; then
+          if ! cosign verify --private-infrastructure --key=./atlas-cli.pem "${IMAGE}" 
+          then
             echo "Error: Signature verification for ${IMAGE} failed."
             exit 1
           fi

From 80656c3603b3578f719a26360c7fabe6a0f0fcff Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 14:29:22 +0000
Subject: [PATCH 14/16] Update docker-release.yml

---
 .github/workflows/docker-release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 2a215508ff..6e867935b8 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -110,8 +110,8 @@ jobs:
         run: |
           docker pull "${IMAGE}"
           # DIGESTS contains a list of three digests separated by a comma.
-            DIGESTS=$(docker buildx imagetools inspect "${IMAGE}" --format '{{- range .Manifest.Manifests}}{{- if eq .Platform.OS "linux" }}{{ .Digest }},{{- end }}{{- end }}{{- .Manifest.Digest }}
-            ')
+          DIGESTS=$(docker buildx imagetools inspect "${IMAGE}" --format '{{- range .Manifest.Manifests}}{{- if eq .Platform.OS "linux" }}{{ .Digest }},{{- end }}{{- end }}{{- .Manifest.Digest }}
+          ')
           echo "These are the Docker image DIGESTS: ${DIGESTS}"
           
           {

From 41c7137f6ee42267f72f6569c0c8b5ab989305c0 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 14:30:13 +0000
Subject: [PATCH 15/16] Update docker-release.yml

---
 .github/workflows/docker-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 6e867935b8..5fa9a8fa06 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -223,7 +223,7 @@ jobs:
           curl https://cosign.mongodb.com/atlas-cli.pem > atlas-cli.pem          
           docker pull "${IMAGE}"          
           # Verify the signature
-          if ! cosign verify --private-infrastructure --key=./atlas-cli.pem "${IMAGE}" 
+          if ! cosign verify --private-infrastructure --key=./atlas-cli.pem "${IMAGE}";
           then
             echo "Error: Signature verification for ${IMAGE} failed."
             exit 1

From 059bb7c2a4078ee46cc88e7e06b0c737a56a11eb Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Tue, 5 Mar 2024 14:30:54 +0000
Subject: [PATCH 16/16] Update code-health.yml

---
 .github/workflows/code-health.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
index 315cb3e387..2c14fd84f0 100644
--- a/.github/workflows/code-health.yml
+++ b/.github/workflows/code-health.yml
@@ -139,7 +139,7 @@ jobs:
         run: go install github.com/golang/mock/mockgen@latest
       - name: Generate mocks
         run: make gen-mocks
-      - name: Check for uncommited files
+      - name: Check for uncommitted files
         run: |
           export FILES=
           FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)
@@ -170,7 +170,7 @@ jobs:
           go-version-file: 'go.mod'
       - name: Run 'go mod tidy'
         run: go mod tidy
-      - name: Check for uncommited files
+      - name: Check for uncommitted files
         run: |
           export FILES=
           FILES=$(git ls-files -o -m --directory --exclude-standard --no-empty-directory)