From 80bfae892bb02b51f66eda3497b2d7f0853de735 Mon Sep 17 00:00:00 2001
From: Tyler Mapp <tyler.mapp@mothership.com>
Date: Thu, 29 Feb 2024 12:55:47 -0500
Subject: [PATCH 1/2] feat: update RDS CA bundle

Updating to new link for the combined cert bundle from
[AWS](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL.html).
---
 build/bin/import_certs.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/build/bin/import_certs.sh b/build/bin/import_certs.sh
index adb28a5..9465e04 100755
--- a/build/bin/import_certs.sh
+++ b/build/bin/import_certs.sh
@@ -2,18 +2,17 @@
 set -e
 
 mydir=/tmp/rds-ca
-if [ ! -e "${mydir}" ]
-then
-mkdir -p "${mydir}"
+if [ ! -e "${mydir}" ]; then
+    mkdir -p "${mydir}"
 fi
 
 pushd "${mydir}"
-curl -sS "https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem" > ${mydir}/rds-combined-ca-bundle.pem
-awk 'split_after == 1 {n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1}{print > "rds-ca-" n ""}' < ${mydir}/rds-combined-ca-bundle.pem
+curl -sS "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem" >${mydir}/rds-combined-ca-bundle.pem
+awk 'split_after == 1 {n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1}{print > "rds-ca-" n ""}' <${mydir}/rds-combined-ca-bundle.pem
 
 for CERT in rds-ca-*; do
-    mv "$CERT" "/usr/local/share/ca-certificates/aws-rds-ca-$(basename $CERT).crt" 
-done 
+    mv "$CERT" "/usr/local/share/ca-certificates/aws-rds-ca-$(basename $CERT).crt"
+done
 
 popd
 rm -rf ${mydir}

From bc4b43fe51550005b6f506ac742848810d118103 Mon Sep 17 00:00:00 2001
From: Tyler Mapp <tyler.mapp@mothership.com>
Date: Thu, 29 Feb 2024 13:11:37 -0500
Subject: [PATCH 2/2] build: bump golangci-lint-action

Resolves issue where it would panic on `load embedded ruleguard rules`.

Add setting up go since new version doesn't any longer
---
 .github/workflows/ci.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bf20088..1ba9963 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -43,7 +43,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2.1.3
+        with:
+          go-version: 1.17.x
       - name: Lint 
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.45
+          version: v1.51