From c19dc8817ae21beb33615f62066950ecfaaafa26 Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 12:07:27 -0600
Subject: [PATCH 01/19] added develop to be a building branch

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7e8f5bd..8f0a7b2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
   build-docker:
     name: Build Docker
     uses: ./.github/workflows/build-docker.yml
-    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop' ||startsWith(github.ref, 'refs/heads/hotfix/')
     with:
       version: 61.${{ github.run_number }}.${{ github.run_attempt }}
       image_name: "truemark/helloworld-java"

From 1b2817a5f802f6bd29ccfb9c0c975e5f68bc9c48 Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 12:07:58 -0600
Subject: [PATCH 02/19] added develop to be a building branch

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f0a7b2a..be8c424a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - develop
       - hotfix/*
 permissions:
   id-token: write

From 6f3ed15a5a4154d1bb45ba68f8375cafadd7289c Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 12:41:49 -0600
Subject: [PATCH 03/19] updated deployment to run for develop branch

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index be8c424a..f3b6b6ad 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       version: 61.${{ github.run_number }}.${{ github.run_attempt }}
       image_name: "truemark/helloworld-java"
     secrets:
-      aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
+      aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE_DEPLOY }}
       docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
       docker_hub_password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
     needs: [build-maven]
@@ -37,7 +37,7 @@ jobs:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
     needs: [ build-maven ]
   deploy-stage:
-    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
+    if: github.ref == 'refs/heads/develop' ||startsWith(github.ref, 'refs/heads/hotfix/')
     name: Deploy to Stage
     uses: ./.github/workflows/deploy.yml
     with:

From 6172d6407df20f0c44bbcd5f2d2db6344566e7f2 Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 12:44:25 -0600
Subject: [PATCH 04/19] updated role

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f3b6b6ad..19e47c96 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       version: 61.${{ github.run_number }}.${{ github.run_attempt }}
       image_name: "truemark/helloworld-java"
     secrets:
-      aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE_DEPLOY }}
+      aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
       docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
       docker_hub_password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
     needs: [build-maven]

From a2aea29d86239eea10f9912d79d6de738d297c14 Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 13:31:56 -0600
Subject: [PATCH 05/19] updated gateway

---
 helm-chart/hello-world/templates/istio.yaml | 2 +-
 helm-chart/hello-world/values.yaml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helm-chart/hello-world/templates/istio.yaml b/helm-chart/hello-world/templates/istio.yaml
index a5156b7f..af222b52 100644
--- a/helm-chart/hello-world/templates/istio.yaml
+++ b/helm-chart/hello-world/templates/istio.yaml
@@ -16,7 +16,7 @@ metadata:
   name: {{ include "truemark.fullname" . }}
 spec:
   hosts:
-    - "*"
+    - "hello.stage.truemark.io"
   gateways:
     - {{ include "truemark.fullname" . }}
   http:
diff --git a/helm-chart/hello-world/values.yaml b/helm-chart/hello-world/values.yaml
index 3c73b6b8..a434e2ac 100644
--- a/helm-chart/hello-world/values.yaml
+++ b/helm-chart/hello-world/values.yaml
@@ -76,11 +76,11 @@ istio:
       tls:
         httpsRedirect: true
       hosts:
-        - "*"
+        - "hello.stage.truemark.io"
     - port:
         number: 443
         name: https
         protocol: HTTP
       hosts:
-        - "*"
+        - "hello.stage.truemark.io"
 

From 9accfcd75e5c9596db5931fc295de83d43e8e984 Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 13:44:28 -0600
Subject: [PATCH 06/19] updated to use env variable inside of helm delpoy

---
 helm-chart/hello-world/templates/deployment.yaml | 4 ++++
 helm-chart/hello-world/values.yaml               | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/helm-chart/hello-world/templates/deployment.yaml b/helm-chart/hello-world/templates/deployment.yaml
index b120aa00..d5749a24 100644
--- a/helm-chart/hello-world/templates/deployment.yaml
+++ b/helm-chart/hello-world/templates/deployment.yaml
@@ -29,6 +29,10 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
+          {{ - if .Values.env }}
+          env:
+            {{ - toYaml .Values.env | nindent 10 }}
+          {{ - end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
diff --git a/helm-chart/hello-world/values.yaml b/helm-chart/hello-world/values.yaml
index a434e2ac..ba932143 100644
--- a/helm-chart/hello-world/values.yaml
+++ b/helm-chart/hello-world/values.yaml
@@ -4,6 +4,9 @@
 
 replicaCount: 1
 
+env:
+  - name: MESSAGE
+    value: "Hello, World from the Helm!"
 
 image:
   repository: public.ecr.aws/truemark/helloworld-java

From 93ed9e7ed74bfe4e2fe23712a99a0277f10e92b8 Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 13:46:37 -0600
Subject: [PATCH 07/19] updated helm chart

---
 helm-chart/hello-world/templates/deployment.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helm-chart/hello-world/templates/deployment.yaml b/helm-chart/hello-world/templates/deployment.yaml
index d5749a24..a8f86e9c 100644
--- a/helm-chart/hello-world/templates/deployment.yaml
+++ b/helm-chart/hello-world/templates/deployment.yaml
@@ -29,10 +29,10 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}
-          {{ - if .Values.env }}
+          {{- if .Values.env }}
           env:
-            {{ - toYaml .Values.env | nindent 10 }}
-          {{ - end }}
+            {{- toYaml .Values.env | nindent 10 }}
+          {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

From f374d66a06a0e99c3c14879e53a35fbbc99741f8 Mon Sep 17 00:00:00 2001
From: Trent Cameron <tcameron@truemark.io>
Date: Mon, 3 Jun 2024 13:57:55 -0600
Subject: [PATCH 08/19] updated to new namespace

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

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a6a9b1e7..f7e7fe14 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -60,4 +60,4 @@ jobs:
         env:
           KUBE_CONFIG_DATA: ${{ env.KUBE_CONFIG_DATA }}
         with:
-          command: helm upgrade --install --wait --atomic --set image.tag=$IMAGE_TAG -f helm-chart/hello-world/values.yaml hello-world helm-chart/hello-world
+          command: helm upgrade --install -n hello-world --create-namespace --wait --atomic --set image.tag=$IMAGE_TAG -f helm-chart/hello-world/values.yaml hello-world helm-chart/hello-world

From d2d743704d8fcc636a63c412ee094ae7abc8cf79 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 10:37:57 -0600
Subject: [PATCH 09/19] Renaming the docker version artifact to image tag.

---
 .github/workflows/build-docker.yml | 6 +++---
 .github/workflows/deploy.yml       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 40763ffd..dbe0797c 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -91,10 +91,10 @@ jobs:
 
       - name: Create Version Artifact
         run: |
-          echo ${{ inputs.version }} > docker-version.txt
+          echo ${{ inputs.version }} > image-tag.txt
 
       - name: Upload Docker Image Tag
         uses: actions/upload-artifact@v3
         with:
-          name: docker-version
-          path: docker-version.txt
+          name: image-tag
+          path: image-tag.txt
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f7e7fe14..c14dd5ff 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v3
         with:
-          name: docker-version
+          name: image-tag
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v2
@@ -44,7 +44,7 @@ jobs:
       - name: Get Docker Image Tag
         shell: bash
         run: | 
-          echo "IMAGE_TAG=$(cat docker-version.txt)" >> $GITHUB_ENV
+          echo "IMAGE_TAG=$(cat image-tag.txt)" >> $GITHUB_ENV
 
       - name: Setup Cluster Access
         run: |

From 11f4d996de519f2ec004b1a3649cd16540444532 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 12:34:12 -0600
Subject: [PATCH 10/19] Fixing the names of the steps and workflows.

---
 .github/workflows/build.yml                   | 22 ++++++++++---------
 .../workflows/{deploy.yml => eks-deploy.yml}  |  0
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename .github/workflows/{deploy.yml => eks-deploy.yml} (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 19e47c96..2e9d61ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,8 @@ jobs:
       docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
       docker_hub_password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
     needs: [build-maven]
-  diff-stage:
+  cdk-diff-stage:
+    if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK diff to Stage
     uses: ./.github/workflows/cdk-diff.yml
     with:
@@ -36,27 +37,28 @@ jobs:
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
     needs: [ build-maven ]
-  deploy-stage:
-    if: github.ref == 'refs/heads/develop' ||startsWith(github.ref, 'refs/heads/hotfix/')
-    name: Deploy to Stage
-    uses: ./.github/workflows/deploy.yml
+  eks-deploy-stage:
+    if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
+    name: EKS deploy to Stage
+    uses: ./.github/workflows/eks-deploy.yml
     with:
       environment: "stage"
-    needs: [diff-stage, build-docker]
+    needs: [cdk-diff-stage, build-docker]
   cdk-deploy-prod:
+    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK deploy to Prod
     uses: ./.github/workflows/cdk-deploy.yml
     with:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [diff-stage, build-docker]
+    needs: [cdk-diff-stage, build-docker]
   eks-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
-    name: Deploy to Prod
-    uses: ./.github/workflows/deploy.yml
+    name: EKS deploy to Prod
+    uses: ./.github/workflows/eks-deploy.yml
     with:
       environment: "prod"
-    needs: [cdk-deploy-prod]
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
+    needs: [cdk-deploy-prod]
diff --git a/.github/workflows/deploy.yml b/.github/workflows/eks-deploy.yml
similarity index 100%
rename from .github/workflows/deploy.yml
rename to .github/workflows/eks-deploy.yml

From 54b938645bbd6f8186be4037492421c90d477464 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 12:42:23 -0600
Subject: [PATCH 11/19] Adding in a CDK deploy to Stage step.

---
 .github/workflows/build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e9d61ed..60885463 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,6 +37,15 @@ jobs:
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
     needs: [ build-maven ]
+  cdk-deploy-stage:
+    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
+    name: CDK deploy to Stage
+    uses: ./.github/workflows/cdk-deploy.yml
+    with:
+      environment: "stage"
+    secrets:
+      aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
+    needs: [cdk-diff-stage, build-docker]
   eks-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: EKS deploy to Stage

From cc15cafc19860dc3676dc8e7194c190045365431 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 12:45:38 -0600
Subject: [PATCH 12/19] Fixing when the steps run.

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60885463..562bc817 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
     needs: [ build-maven ]
   cdk-deploy-stage:
-    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
+    if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK deploy to Stage
     uses: ./.github/workflows/cdk-deploy.yml
     with:
@@ -52,7 +52,7 @@ jobs:
     uses: ./.github/workflows/eks-deploy.yml
     with:
       environment: "stage"
-    needs: [cdk-diff-stage, build-docker]
+    needs: [cdk-diff-stage, build-docker, cdk-deploy-stage]
   cdk-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK deploy to Prod

From 7e56d20384f6ce6b72d68d153213b890db87cec0 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 12:51:59 -0600
Subject: [PATCH 13/19] Testing out different workflow patterns.

---
 .github/workflows/build.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 562bc817..4f2fc436 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
       docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
       docker_hub_password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-    needs: [build-maven]
+    needs: [ build-maven ]
   cdk-diff-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK diff to Stage
@@ -45,14 +45,23 @@ jobs:
       environment: "stage"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [cdk-diff-stage, build-docker]
+    needs: [ cdk-diff-stage, build-docker ]
   eks-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: EKS deploy to Stage
     uses: ./.github/workflows/eks-deploy.yml
     with:
       environment: "stage"
-    needs: [cdk-diff-stage, build-docker, cdk-deploy-stage]
+    needs: [ cdk-diff-stage, build-docker ]
+  cdk-diff-prod:
+    if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
+    name: CDK diff to Prod
+    uses: ./.github/workflows/cdk-diff.yml
+    with:
+      environment: "prod"
+    secrets:
+      aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
+    needs: [ build-maven ]
   cdk-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK deploy to Prod
@@ -61,7 +70,7 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [cdk-diff-stage, build-docker]
+    needs: [ cdk-diff-prod, build-docker ]
   eks-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: EKS deploy to Prod
@@ -70,4 +79,4 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [cdk-deploy-prod]
+    needs: [ cdk-deploy-prod ]

From e9b4f98163a9bddbdef5d2a5aff0b95ec58499d1 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 12:57:09 -0600
Subject: [PATCH 14/19] Testing a different configuration.

---
 .github/workflows/build.yml      | 6 +++---
 .github/workflows/cdk-deploy.yml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f2fc436..eec22282 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,14 +45,14 @@ jobs:
       environment: "stage"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ cdk-diff-stage, build-docker ]
+    needs: [ cdk-diff-stage ]
   eks-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: EKS deploy to Stage
     uses: ./.github/workflows/eks-deploy.yml
     with:
       environment: "stage"
-    needs: [ cdk-diff-stage, build-docker ]
+    needs: [ cdk-deploy-stage ]
   cdk-diff-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK diff to Prod
@@ -61,7 +61,7 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ build-maven ]
+    needs: [ build-maven, build-docker ]
   cdk-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK deploy to Prod
diff --git a/.github/workflows/cdk-deploy.yml b/.github/workflows/cdk-deploy.yml
index eed8321d..2874532d 100644
--- a/.github/workflows/cdk-deploy.yml
+++ b/.github/workflows/cdk-deploy.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     container: # Replace with GitHub action in the future
       image: public.ecr.aws/truemark/aws-cdk:ubuntu
+    environment: ${{ inputs.environment }}
     steps:
       - uses: actions/checkout@v4
 

From bc41ea31771a737aab04b163b3f0a4ee69d1d338 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 13:06:01 -0600
Subject: [PATCH 15/19] Another configuration test.

---
 .github/workflows/build.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eec22282..60492fbc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,7 @@ jobs:
       version: 61.${{ github.run_number }}.${{ github.run_attempt }}
       java_version: 21
       java_distribution: "corretto"
+
   build-docker:
     name: Build Docker
     uses: ./.github/workflows/build-docker.yml
@@ -28,6 +29,7 @@ jobs:
       docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
       docker_hub_password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
     needs: [ build-maven ]
+
   cdk-diff-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK diff to Stage
@@ -37,6 +39,7 @@ jobs:
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
     needs: [ build-maven ]
+
   cdk-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK deploy to Stage
@@ -46,6 +49,7 @@ jobs:
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
     needs: [ cdk-diff-stage ]
+
   eks-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: EKS deploy to Stage
@@ -53,6 +57,7 @@ jobs:
     with:
       environment: "stage"
     needs: [ cdk-deploy-stage ]
+
   cdk-diff-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK diff to Prod
@@ -61,7 +66,8 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ build-maven, build-docker ]
+    needs: [ build-docker ]
+
   cdk-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: CDK deploy to Prod
@@ -70,7 +76,8 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ cdk-diff-prod, build-docker ]
+    needs: [ cdk-diff-prod ]
+
   eks-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
     name: EKS deploy to Prod

From 3d245134ad29ee57f1dcd277c1b0310a8e6cdb84 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 13:24:35 -0600
Subject: [PATCH 16/19] Another configuration test.

---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60492fbc..16dda8aa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
       environment: "stage"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ cdk-diff-stage ]
+    needs: [ build-docker, cdk-diff-stage ]
 
   eks-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
@@ -66,7 +66,7 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ build-docker ]
+    needs: [ build-maven ]
 
   cdk-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')
@@ -86,4 +86,4 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ cdk-deploy-prod ]
+    needs: [ cdk-deploy-prod, eks-deploy-stage ]

From 36624360fb61daf97e32f5e7e19bb38bc7a63f60 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 13:31:09 -0600
Subject: [PATCH 17/19] Another configuration test.

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 16dda8aa..e2cee9a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,4 +86,4 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ cdk-deploy-prod, eks-deploy-stage ]
+    needs: [ cdk-deploy-prod ]

From 150da938514642e10bcd08bd469c41c9b5bd9f79 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 13:32:59 -0600
Subject: [PATCH 18/19] Another configuration test.

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2cee9a7..559c014d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       environment: "stage"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ build-maven ]
+    needs: [ build-maven, build-docker ]
 
   cdk-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')
@@ -66,7 +66,7 @@ jobs:
       environment: "prod"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ build-maven ]
+    needs: [ build-maven, build-docker ]
 
   cdk-deploy-prod:
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/hotfix/')

From 97ac7d64ed522b305314c209ac36a00611632718 Mon Sep 17 00:00:00 2001
From: Louie Celli <v-lcelli@youngliving.com>
Date: Mon, 15 Jul 2024 13:35:42 -0600
Subject: [PATCH 19/19] Another configuration test.

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 559c014d..85988e7a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,7 +48,7 @@ jobs:
       environment: "stage"
     secrets:
       aws_assume_role: ${{ secrets.AWS_ASSUME_ROLE }}
-    needs: [ build-docker, cdk-diff-stage ]
+    needs: [ cdk-diff-stage ]
 
   eks-deploy-stage:
     if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')