From fee8f8330ae86e6c4f199eeea79cca2a272f89f7 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Sun, 19 May 2024 02:14:53 -0400
Subject: [PATCH 01/16] ci: add initial CodeBuild buildspec

---
 buildspec.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 buildspec.yml

diff --git a/buildspec.yml b/buildspec.yml
new file mode 100644
index 0000000..39dfafd
--- /dev/null
+++ b/buildspec.yml
@@ -0,0 +1,33 @@
+version: 0.2
+
+env:
+  variables:
+    IMAGE_SCAN_EMAIL_TO: noreply@cfpb.gov
+    IMAGE_SCANNER_SECRET: cfpb/team/regtech/twistlock
+    SMTP_CREDS_SECRET: cfpb/team/regtech/smtp-ses-creds
+  secrets-manager:
+    IMAGE_SCANNER_URL: "${IMAGE_SCANNER_SECRET}:TL_CONSOLE_URL"
+    IMAGE_SCANNER_USERNAME: "${IMAGE_SCANNER_SECRET}:TL_USER"
+    IMAGE_SCANNER_PASSWORD: "${IMAGE_SCANNER_SECRET}:TL_PASSWORD"
+    SMTP_PASSWORD: "${SMTP_CREDS_SECRET}:password"
+    SMTP_PORT: "${SMTP_CREDS_SECRET}:smtp_port"
+    SMTP_HOST: "${SMTP_CREDS_SECRET}:smtp_server"
+    SMTP_USERNAME: "${SMTP_CREDS_SECRET}:username"
+
+phases:
+  install:
+    commands:
+      - codebuild-init && && source ./env.sh
+  pre_build:
+    commands:
+      # Set envvars dependent on CodeBuild project's own envvars
+      - export IMAGE_NAME="cfpb/${NAMESPACE}/regtech-mail-api"
+      - export IMAGE_TAG=$GIT_REF
+      - export REGISTRY_IMAGE_NAME="${ECR_ACCOUNT_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}"
+      - env | sort
+  build:
+    commands:
+      - docker build -t $REGISTRY_IMAGE_NAME .
+      - scan-image $REGISTRY_IMAGE_NAME $IMAGE_SCAN_EMAIL_TO
+      - docker push $REGISTRY_IMAGE_NAME
+      
\ No newline at end of file

From 8daed66c74cf0204254046ad9c4e9d766fb503f0 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Sun, 19 May 2024 02:18:07 -0400
Subject: [PATCH 02/16] fix: remove dupe `&&` in buildspec

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 39dfafd..081a29b 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -17,7 +17,7 @@ env:
 phases:
   install:
     commands:
-      - codebuild-init && && source ./env.sh
+      - codebuild-init && source ./env.sh
   pre_build:
     commands:
       # Set envvars dependent on CodeBuild project's own envvars

From eaf42a81e7418374d57da1d7e1868452261a9173 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Sun, 19 May 2024 02:22:27 -0400
Subject: [PATCH 03/16] fix: replace `$GIT_REF` with new `$GIT_REF_NAME`

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 081a29b..0e63647 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -22,7 +22,7 @@ phases:
     commands:
       # Set envvars dependent on CodeBuild project's own envvars
       - export IMAGE_NAME="cfpb/${NAMESPACE}/regtech-mail-api"
-      - export IMAGE_TAG=$GIT_REF
+      - export IMAGE_TAG=$GIT_REF_NAME
       - export REGISTRY_IMAGE_NAME="${ECR_ACCOUNT_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}"
       - env | sort
   build:

From dd4b6291b75a961632a29954ce78d835a6d37e91 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Sun, 19 May 2024 02:31:39 -0400
Subject: [PATCH 04/16] ci: add build success message

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 0e63647..60b6469 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -30,4 +30,4 @@ phases:
       - docker build -t $REGISTRY_IMAGE_NAME .
       - scan-image $REGISTRY_IMAGE_NAME $IMAGE_SCAN_EMAIL_TO
       - docker push $REGISTRY_IMAGE_NAME
-      
\ No newline at end of file
+      - echo "Image ${REGISTRY_IMAGE_NAME} now available for use. Enjoy!"

From 11006a9159ff70305570ef16518d2bde57c1f842 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Mon, 20 May 2024 02:04:25 -0400
Subject: [PATCH 05/16] ci: use newly-renamed `GIT_REF` envvar

---
 buildspec.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildspec.yml b/buildspec.yml
index 60b6469..3d6560a 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -2,6 +2,7 @@ version: 0.2
 
 env:
   variables:
+    SERVICE_NAME: regtech-mail-api
     IMAGE_SCAN_EMAIL_TO: noreply@cfpb.gov
     IMAGE_SCANNER_SECRET: cfpb/team/regtech/twistlock
     SMTP_CREDS_SECRET: cfpb/team/regtech/smtp-ses-creds
@@ -21,8 +22,8 @@ phases:
   pre_build:
     commands:
       # Set envvars dependent on CodeBuild project's own envvars
-      - export IMAGE_NAME="cfpb/${NAMESPACE}/regtech-mail-api"
-      - export IMAGE_TAG=$GIT_REF_NAME
+      - export IMAGE_NAME="cfpb/${NAMESPACE}/${SERVICE_NAME}"
+      - export IMAGE_TAG=$GIT_REF
       - export REGISTRY_IMAGE_NAME="${ECR_ACCOUNT_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}"
       - env | sort
   build:

From e0e3a2bfec9854aaa467245a9abc2a8d854b46ef Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Thu, 30 May 2024 13:49:34 -0400
Subject: [PATCH 06/16] # Temp change to trigger job...

---
 buildspec.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildspec.yml b/buildspec.yml
index 3d6560a..02f875d 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,5 +1,6 @@
 version: 0.2
 
+# Temp change to trigger job...
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From acc04b6be95d25f05d4cb26c7b297c137f636fe8 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Thu, 30 May 2024 13:58:01 -0400
Subject: [PATCH 07/16] Temp change to trigger job...again...

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 02f875d..6ec08fe 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,6 +1,6 @@
 version: 0.2
 
-# Temp change to trigger job...
+# Temp change to trigger job...again...
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From db7c8e151aae5b16d9d7bd3d1b870af94f76795b Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Sun, 9 Jun 2024 15:01:07 -0400
Subject: [PATCH 08/16] ci: debug DevHub bug(s)

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 6ec08fe..08dcdf7 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,6 +1,6 @@
 version: 0.2
 
-# Temp change to trigger job...again...
+# Temp change to trigger job...again...again...
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From 825a4fd53de4c2bd5b99c2fa440362aaa34113bc Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Mon, 10 Jun 2024 16:05:40 -0400
Subject: [PATCH 09/16] ci: update buildspec with latest Secret names

---
 buildspec.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/buildspec.yml b/buildspec.yml
index 3d6560a..88a735b 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -3,13 +3,14 @@ version: 0.2
 env:
   variables:
     SERVICE_NAME: regtech-mail-api
-    IMAGE_SCAN_EMAIL_TO: noreply@cfpb.gov
-    IMAGE_SCANNER_SECRET: cfpb/team/regtech/twistlock
+    CONTACTS_SECRET: cfpb/team/regtech/contacts
+    IMAGE_SCANNER_SECRET: cfpb/team/regtech/image-scanner-creds
     SMTP_CREDS_SECRET: cfpb/team/regtech/smtp-ses-creds
   secrets-manager:
-    IMAGE_SCANNER_URL: "${IMAGE_SCANNER_SECRET}:TL_CONSOLE_URL"
-    IMAGE_SCANNER_USERNAME: "${IMAGE_SCANNER_SECRET}:TL_USER"
-    IMAGE_SCANNER_PASSWORD: "${IMAGE_SCANNER_SECRET}:TL_PASSWORD"
+    EMAIL_TO: "${CONTACTS_SECRET}:developers_all"
+    IMAGE_SCANNER_URL: "${IMAGE_SCANNER_SECRET}:url"
+    IMAGE_SCANNER_USERNAME: "${IMAGE_SCANNER_SECRET}:username"
+    IMAGE_SCANNER_PASSWORD: "${IMAGE_SCANNER_SECRET}:password"
     SMTP_PASSWORD: "${SMTP_CREDS_SECRET}:password"
     SMTP_PORT: "${SMTP_CREDS_SECRET}:smtp_port"
     SMTP_HOST: "${SMTP_CREDS_SECRET}:smtp_server"

From a9029d1c855ea97777662822c947c455ce1ac4a0 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Mon, 10 Jun 2024 22:31:08 -0400
Subject: [PATCH 10/16] ci: trigger build...maybe

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 208b301..af335cc 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,6 +1,6 @@
 version: 0.2
 
-# Temp change to trigger job...again...again...
+# Temp change to trigger job...again...again...again...
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From 3c0f161707860930abd8dbb1668249cc404b943c Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Tue, 11 Jun 2024 12:23:09 -0400
Subject: [PATCH 11/16] chore: try to kick off CodeBuild

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index af335cc..08efe07 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,6 +1,6 @@
 version: 0.2
 
-# Temp change to trigger job...again...again...again...
+# Temp change to trigger job...again...again...again...again...
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From c71f2417f268b28c53400f295d37458375be5ea4 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hans.keeler@cfpb.gov>
Date: Tue, 11 Jun 2024 12:49:45 -0400
Subject: [PATCH 12/16] chore: try to trigger codebuild

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 08efe07..e9a40fc 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,6 +1,6 @@
 version: 0.2
 
-# Temp change to trigger job...again...again...again...again...
+# Temp change to trigger job...again...again...again...again...again...
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From 43bd1d093865344224481fb9e70fbd3d88cbfb32 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Tue, 11 Jun 2024 23:30:54 -0400
Subject: [PATCH 13/16] chore: cleanup ci trigger comments

---
 buildspec.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index e9a40fc..88a735b 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,6 +1,5 @@
 version: 0.2
 
-# Temp change to trigger job...again...again...again...again...again...
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From 45da709e059bb659828af16a98efe826716e535d Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Wed, 12 Jun 2024 10:44:21 -0400
Subject: [PATCH 14/16] ci: fix secret name for `CONTACTS_SECRET`

---
 buildspec.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildspec.yml b/buildspec.yml
index 88a735b..a1fa837 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -3,7 +3,7 @@ version: 0.2
 env:
   variables:
     SERVICE_NAME: regtech-mail-api
-    CONTACTS_SECRET: cfpb/team/regtech/contacts
+    CONTACTS_SECRET: cfpb/team/regtech/contact-info
     IMAGE_SCANNER_SECRET: cfpb/team/regtech/image-scanner-creds
     SMTP_CREDS_SECRET: cfpb/team/regtech/smtp-ses-creds
   secrets-manager:
@@ -11,10 +11,10 @@ env:
     IMAGE_SCANNER_URL: "${IMAGE_SCANNER_SECRET}:url"
     IMAGE_SCANNER_USERNAME: "${IMAGE_SCANNER_SECRET}:username"
     IMAGE_SCANNER_PASSWORD: "${IMAGE_SCANNER_SECRET}:password"
-    SMTP_PASSWORD: "${SMTP_CREDS_SECRET}:password"
+    SMTP_HOST: "${SMTP_CREDS_SECRET}:mail_server"
     SMTP_PORT: "${SMTP_CREDS_SECRET}:smtp_port"
-    SMTP_HOST: "${SMTP_CREDS_SECRET}:smtp_server"
     SMTP_USERNAME: "${SMTP_CREDS_SECRET}:username"
+    SMTP_PASSWORD: "${SMTP_CREDS_SECRET}:password"
 
 phases:
   install:

From a7b4fcfe6e22f5a8a5ceef781b436a97e6c04319 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Wed, 12 Jun 2024 10:52:30 -0400
Subject: [PATCH 15/16] ci: test build trigger

---
 buildspec.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildspec.yml b/buildspec.yml
index a1fa837..069929e 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -1,5 +1,6 @@
 version: 0.2
 
+# Trigger build #1
 env:
   variables:
     SERVICE_NAME: regtech-mail-api

From fc9eb1f448e4b10535e42f08a4852b7ce2d7fdb3 Mon Sep 17 00:00:00 2001
From: Hans Keeler <hkeeler@users.noreply.github.com>
Date: Wed, 12 Jun 2024 11:00:49 -0400
Subject: [PATCH 16/16] ci: fix scan-image email to envvar

---
 buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildspec.yml b/buildspec.yml
index 069929e..56ac591 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -31,6 +31,6 @@ phases:
   build:
     commands:
       - docker build -t $REGISTRY_IMAGE_NAME .
-      - scan-image $REGISTRY_IMAGE_NAME $IMAGE_SCAN_EMAIL_TO
+      - scan-image $REGISTRY_IMAGE_NAME $EMAIL_TO
       - docker push $REGISTRY_IMAGE_NAME
       - echo "Image ${REGISTRY_IMAGE_NAME} now available for use. Enjoy!"