From 7d7405069ce4c0033a6e62256e1d966d6c170664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 14:41:34 -0400
Subject: [PATCH 1/9] add `ap-southeast-5`

---
 ci/datasources/regions.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/datasources/regions.yaml b/ci/datasources/regions.yaml
index 9f12a011..93816ce9 100644
--- a/ci/datasources/regions.yaml
+++ b/ci/datasources/regions.yaml
@@ -11,6 +11,7 @@ regions:
   - code: "ap-southeast-2"
   - code: "ap-southeast-3"
   - code: "ap-southeast-4"
+  - code: "ap-southeast-5"
   - code: "ap-northeast-1"
   - code: "ap-northeast-2"
   - code: "ap-northeast-3"

From 0972afa2f26d237421d45ab3c9fff3a237c1e325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:07:52 -0400
Subject: [PATCH 2/9] revamp pipeline

---
 .gitignore                                    |  2 +-
 .gitlab-ci.yml                                | 24 ++++-
 .gitlab/Dockerfile                            | 18 ++++
 .gitlab/config.yaml                           | 13 +++
 {ci => .gitlab}/datasources/environments.yaml |  0
 {ci => .gitlab}/datasources/regions.yaml      |  0
 {ci => .gitlab}/datasources/runtimes.yaml     |  0
 {ci => .gitlab}/input_files/build.yaml.tpl    | 91 ++++++++-----------
 {ci => .gitlab/scripts}/get_secrets.sh        |  0
 {ci => .gitlab/scripts}/publish_layers.sh     |  0
 {ci => .gitlab/scripts}/publish_npm.sh        |  0
 ci/config.yaml                                | 13 ---
 12 files changed, 92 insertions(+), 69 deletions(-)
 create mode 100644 .gitlab/Dockerfile
 create mode 100644 .gitlab/config.yaml
 rename {ci => .gitlab}/datasources/environments.yaml (100%)
 rename {ci => .gitlab}/datasources/regions.yaml (100%)
 rename {ci => .gitlab}/datasources/runtimes.yaml (100%)
 rename {ci => .gitlab}/input_files/build.yaml.tpl (63%)
 rename {ci => .gitlab/scripts}/get_secrets.sh (100%)
 rename {ci => .gitlab/scripts}/publish_layers.sh (100%)
 rename {ci => .gitlab/scripts}/publish_npm.sh (100%)
 delete mode 100644 ci/config.yaml

diff --git a/.gitignore b/.gitignore
index 965a29cc..ce317e92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ package-lock.json
 **/.serverless
 /.idea/
 
-ci/build-*.yaml
\ No newline at end of file
+.gitlab/build-*.yaml
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e94568cf..955179ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,25 @@
+variables:
+  DOCKER_TARGET_IMAGE: registry.ddbuild.io/ci/datadog-lambda-js
+  DOCKER_TARGET_VERSION: latest
+
 stages:
   - pre 
   - build
 
+ci image:
+  stage: build
+  image: registry.ddbuild.io/images/docker:20.10
+  tags: ["arch:arm64"]
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - .gitlab/Dockerfile
+      when: on_success
+  variables:
+    DOCKER_TARGET: ${DOCKER_TARGET_IMAGE}:${DOCKER_TARGET_VERSION}
+  script:
+    - docker buildx build --platform linux/amd64,linux/arm64 --no-cache --pull --push --tag ${DOCKER_TARGET} -f .gitlab/Dockerfile .
+
 .go-cache: &go-cache
   key: datadog-lambda-js-go-cache
   policy: pull
@@ -13,16 +31,16 @@ generator:
   cache: *go-cache
   script:
     - apk add --no-cache gomplate
-    - gomplate --config ci/config.yaml
+    - gomplate --config .gitlab/config.yaml
   artifacts:
     paths:
-      - ci/*-pipeline.yaml
+      - .gitlab/*-pipeline.yaml
 
 build-layers:
   stage: build
   trigger:
     include:
-      - artifact: ci/build-pipeline.yaml
+      - artifact: .gitlab/build-pipeline.yaml
         job: generator
     strategy: depend
   rules:
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
new file mode 100644
index 00000000..16c328a5
--- /dev/null
+++ b/.gitlab/Dockerfile
@@ -0,0 +1,18 @@
+FROM registry.ddbuild.io/images/docker:24.0.5
+
+RUN apt-get update && apt-get install -y --fix-missing --no-install-recommends \
+  curl gcc gnupg g++ make cmake unzip openssl g++ uuid-runtime xxd ca-certificates
+
+# Install NodeJS 18.x
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update && apt-get install -y nodejs
+
+# Install Yarn and Typescript globally
+RUN npm install --global yarn typescript
+RUN yarn global add serverless@^3.38.0 --prefix /usr/local
+
+# Install AWS CLI
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+RUN unzip awscliv2.zip && ./aws/install
diff --git a/.gitlab/config.yaml b/.gitlab/config.yaml
new file mode 100644
index 00000000..5111f8d8
--- /dev/null
+++ b/.gitlab/config.yaml
@@ -0,0 +1,13 @@
+inputFiles:
+  - .gitlab/input_files/build.yaml.tpl
+
+outputFiles:
+  - .gitlab/build-pipeline.yaml
+
+datasources:
+  runtimes:
+    url: .gitlab/datasources/runtimes.yaml
+  regions:
+    url: .gitlab/datasources/regions.yaml
+  environments:
+    url: .gitlab/datasources/environments.yaml
diff --git a/ci/datasources/environments.yaml b/.gitlab/datasources/environments.yaml
similarity index 100%
rename from ci/datasources/environments.yaml
rename to .gitlab/datasources/environments.yaml
diff --git a/ci/datasources/regions.yaml b/.gitlab/datasources/regions.yaml
similarity index 100%
rename from ci/datasources/regions.yaml
rename to .gitlab/datasources/regions.yaml
diff --git a/ci/datasources/runtimes.yaml b/.gitlab/datasources/runtimes.yaml
similarity index 100%
rename from ci/datasources/runtimes.yaml
rename to .gitlab/datasources/runtimes.yaml
diff --git a/ci/input_files/build.yaml.tpl b/.gitlab/input_files/build.yaml.tpl
similarity index 63%
rename from ci/input_files/build.yaml.tpl
rename to .gitlab/input_files/build.yaml.tpl
index aee9a142..371d3cdf 100644
--- a/ci/input_files/build.yaml.tpl
+++ b/.gitlab/input_files/build.yaml.tpl
@@ -1,3 +1,7 @@
+variables:
+  CI_DOCKER_TARGET_IMAGE: registry.ddbuild.io/ci/datadog-lambda-js
+  CI_DOCKER_TARGET_VERSION: latest
+
 stages:
  - build
  - test
@@ -11,18 +15,6 @@ default:
       # Retry when the runner fails to start
       - runner_system_failure
 
-.install-node: &install-node
-  - apt-get update
-  - apt-get install -y ca-certificates curl gnupg xxd
-  - mkdir -p /etc/apt/keyrings
-  - curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-  # We are explicitly setting the node_18.x version for the installation
-  - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-  - apt-get update
-  - apt-get install nodejs -y
-  - npm install --global yarn
-  - npm install --global typescript
-
 .node-before-script: &node-before-script
   - echo 'yarn-offline-mirror ".yarn-cache/"' >> .yarnrc
   - echo 'yarn-offline-mirror-pruning true' >> .yarnrc
@@ -36,10 +28,10 @@ default:
     - $CI_PROJECT_DIR/.yarn-cache
   policy: pull
 
-build-layer ({{ $runtime.name }}):
+build layer ({{ $runtime.name }}):
   stage: build
   tags: ["arch:amd64"]
-  image: registry.ddbuild.io/images/docker:20.10
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
   artifacts:
     expire_in: 1 hr # Unsigned zips expire in 1 hour
     paths:
@@ -49,14 +41,14 @@ build-layer ({{ $runtime.name }}):
   script:
     - NODE_VERSION={{ $runtime.node_version }} ./scripts/build_layers.sh
 
-check-layer-size ({{ $runtime.name }}):
+check layer size ({{ $runtime.name }}):
   stage: test
   tags: ["arch:amd64"]
-  image: registry.ddbuild.io/images/docker:20.10
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
   needs: 
-    - build-layer ({{ $runtime.name }})
+    - build layer ({{ $runtime.name }})
   dependencies:
-    - build-layer ({{ $runtime.name }})
+    - build layer ({{ $runtime.name }})
   script: 
     - NODE_VERSION={{ $runtime.node_version }} ./scripts/check_layer_size.sh
 
@@ -70,7 +62,7 @@ lint ({{ $runtime.name }}):
     - yarn check-formatting
     - yarn lint
 
-unit-test ({{ $runtime.name }}):
+unit test ({{ $runtime.name }}):
   stage: test
   tags: ["arch:amd64"]
   image: registry.ddbuild.io/images/mirror/node:{{ $runtime.node_major_version }}-bullseye
@@ -81,21 +73,19 @@ unit-test ({{ $runtime.name }}):
     - yarn test --ci --forceExit --detectOpenHandles
     - bash <(curl -s https://codecov.io/bash)
 
-integration-test ({{ $runtime.name }}):
+integration test ({{ $runtime.name }}):
   stage: test
   tags: ["arch:amd64"]
-  image: registry.ddbuild.io/images/docker:20.10-py3
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
   needs: 
-    - build-layer ({{ $runtime.name }})
+    - build layer ({{ $runtime.name }})
   dependencies:
-    - build-layer ({{ $runtime.name }})
+    - build layer ({{ $runtime.name }})
   cache: &{{ $runtime.name }}-cache
   variables:
     CI_ENABLE_CONTAINER_IMAGE_BUILDS: "true"
   before_script:
-    - *install-node
-    - EXTERNAL_ID_NAME=integration-test-externalid ROLE_TO_ASSUME=sandbox-integration-test-deployer AWS_ACCOUNT=425362996713 source ./ci/get_secrets.sh
-    - yarn global add serverless@^3.38.0 --prefix /usr/local
+    - EXTERNAL_ID_NAME=integration-test-externalid ROLE_TO_ASSUME=sandbox-integration-test-deployer AWS_ACCOUNT=425362996713 source .gitlab/scripts/get_secrets.sh
     - cd integration_tests && yarn install && cd ..
   script:
     - RUNTIME_PARAM={{ $runtime.node_major_version }} ./scripts/run_integration_tests.sh
@@ -103,37 +93,35 @@ integration-test ({{ $runtime.name }}):
 {{ range $environment := (ds "environments").environments }}
 
 {{ if or (eq $environment.name "prod") }}
-sign-layer ({{ $runtime.name }}):
+sign layer ({{ $runtime.name }}):
   stage: sign
   tags: ["arch:amd64"]
-  image: registry.ddbuild.io/images/docker:20.10-py3
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
   rules:
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
       when: manual
   needs:
-    - build-layer ({{ $runtime.name }})
-    - check-layer-size ({{ $runtime.name }})
+    - build layer ({{ $runtime.name }})
+    - check layer size ({{ $runtime.name }})
     - lint ({{ $runtime.name }})
-    - unit-test ({{ $runtime.name }})
-    - integration-test ({{ $runtime.name }})
+    - unit test ({{ $runtime.name }})
+    - integration test ({{ $runtime.name }})
   dependencies:
-    - build-layer ({{ $runtime.name }})
+    - build layer ({{ $runtime.name }})
   artifacts: # Re specify artifacts so the modified signed file is passed
     expire_in: 1 day # Signed layers should expire after 1 day
     paths:
       - .layers/datadog_lambda_node{{ $runtime.node_version }}.zip
   before_script:
-    - apt-get update
-    - apt-get install -y uuid-runtime
-    - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source ./ci/get_secrets.sh
+    - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
   script:
     - LAYER_FILE=datadog_lambda_node{{ $runtime.node_version }}.zip ./scripts/sign_layers.sh {{ $environment.name }}
 {{ end }}
 
-publish-layer-{{ $environment.name }} ({{ $runtime.name }}):
+publish layer {{ $environment.name }} ({{ $runtime.name }}):
   stage: publish
   tags: ["arch:amd64"]
-  image: registry.ddbuild.io/images/docker:20.10-py3
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
   rules:
     - if: '"{{ $environment.name }}" =~ /^(sandbox|staging)/'
       when: manual
@@ -141,19 +129,19 @@ publish-layer-{{ $environment.name }} ({{ $runtime.name }}):
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   needs:
 {{ if or (eq $environment.name "prod") }}
-      - sign-layer ({{ $runtime.name }})
+      - sign layer ({{ $runtime.name }})
 {{ else }}
-      - build-layer ({{ $runtime.name }})
-      - check-layer-size ({{ $runtime.name }})
+      - build layer ({{ $runtime.name }})
+      - check layer size ({{ $runtime.name }})
       - lint ({{ $runtime.name }})
-      - unit-test ({{ $runtime.name }})
-      - integration-test ({{ $runtime.name }})
+      - unit test ({{ $runtime.name }})
+      - integration test ({{ $runtime.name }})
 {{ end }}
   dependencies:
 {{ if or (eq $environment.name "prod") }}
-      - sign-layer ({{ $runtime.name }})
+      - sign layer ({{ $runtime.name }})
 {{ else }}
-      - build-layer ({{ $runtime.name }})
+      - build layer ({{ $runtime.name }})
 {{ end }}
   parallel:
     matrix:
@@ -161,27 +149,26 @@ publish-layer-{{ $environment.name }} ({{ $runtime.name }}):
           - {{ .code }}
         {{- end}}
   before_script:
-    - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source ./ci/get_secrets.sh
+    - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
   script:
-    - STAGE={{ $environment.name }} NODE_VERSION={{ $runtime.node_version }} ./ci/publish_layers.sh
+    - STAGE={{ $environment.name }} NODE_VERSION={{ $runtime.node_version }} .gitlab/scripts/publish_layers.sh
 
 {{- end }}
 
 {{- end }}
 
-publish-npm-package:
+publish npm package:
   stage: publish
   tags: ["arch:amd64"]
-  image: registry.ddbuild.io/images/docker:20.10-py3
+  image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
   cache: []
   rules:
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
   when: manual
   needs: {{ range $runtime := (ds "runtimes").runtimes }}
-    - sign-layer ({{ $runtime.name }})
+    - sign layer ({{ $runtime.name }})
   {{- end }}
   before_script:
-    - *install-node
     - *node-before-script
   script:
-    - ./ci/publish_npm.sh
+    - .gitlab/scripts/publish_npm.sh
diff --git a/ci/get_secrets.sh b/.gitlab/scripts/get_secrets.sh
similarity index 100%
rename from ci/get_secrets.sh
rename to .gitlab/scripts/get_secrets.sh
diff --git a/ci/publish_layers.sh b/.gitlab/scripts/publish_layers.sh
similarity index 100%
rename from ci/publish_layers.sh
rename to .gitlab/scripts/publish_layers.sh
diff --git a/ci/publish_npm.sh b/.gitlab/scripts/publish_npm.sh
similarity index 100%
rename from ci/publish_npm.sh
rename to .gitlab/scripts/publish_npm.sh
diff --git a/ci/config.yaml b/ci/config.yaml
deleted file mode 100644
index d37a0f31..00000000
--- a/ci/config.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-inputFiles:
-  - ci/input_files/build.yaml.tpl
-
-outputFiles:
-  - ci/build-pipeline.yaml
-
-datasources:
-  runtimes:
-    url: ci/datasources/runtimes.yaml
-  regions:
-    url: ci/datasources/regions.yaml
-  environments:
-    url: ci/datasources/environments.yaml

From 7f6aa14ac67ae56d298678fbdf0294e9aa62ea6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:09:40 -0400
Subject: [PATCH 3/9] build image first

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 955179ee..b1ebdc69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,11 +10,11 @@ ci image:
   stage: build
   image: registry.ddbuild.io/images/docker:20.10
   tags: ["arch:arm64"]
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
-      changes:
-        - .gitlab/Dockerfile
-      when: on_success
+  # rules:
+  #   - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+  #     changes:
+  #       - .gitlab/Dockerfile
+  #     when: on_success
   variables:
     DOCKER_TARGET: ${DOCKER_TARGET_IMAGE}:${DOCKER_TARGET_VERSION}
   script:

From d60482bbddd539f2f68b4bd7561183bab02553cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:24:27 -0400
Subject: [PATCH 4/9] awscli is already installed

---
 .gitlab-ci.yml                    | 1 +
 .gitlab/scripts/publish_layers.sh | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1ebdc69..2fa84bee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ ci image:
   stage: build
   image: registry.ddbuild.io/images/docker:20.10
   tags: ["arch:arm64"]
+  needs: []
   # rules:
   #   - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
   #     changes:
diff --git a/.gitlab/scripts/publish_layers.sh b/.gitlab/scripts/publish_layers.sh
index 7e56bb89..3387e97f 100755
--- a/.gitlab/scripts/publish_layers.sh
+++ b/.gitlab/scripts/publish_layers.sh
@@ -17,8 +17,6 @@ NODE_VERSIONS=("16.14" "18.12" "20.9")
 STAGES=('prod', 'sandbox', 'staging')
 
 printf "Starting script...\n\n"
-printf "Installing dependencies\n"
-pip install awscli
 
 publish_layer() {
     region=$1

From 2a58d7de5c4ee806ae57489a83161b895fd17a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:24:59 -0400
Subject: [PATCH 5/9] only build image on changes on dockerfile

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fa84bee..4eeb2a8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,11 @@ ci image:
   image: registry.ddbuild.io/images/docker:20.10
   tags: ["arch:arm64"]
   needs: []
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
-  #     changes:
-  #       - .gitlab/Dockerfile
-  #     when: on_success
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - .gitlab/Dockerfile
+      when: on_success
   variables:
     DOCKER_TARGET: ${DOCKER_TARGET_IMAGE}:${DOCKER_TARGET_VERSION}
   script:

From bc5f4d3843444f70eb8b4d4f6efa0e1b15af3779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:37:04 -0400
Subject: [PATCH 6/9] see if cli updates

---
 .gitlab-ci.yml                     | 10 +++++-----
 .gitlab/Dockerfile                 |  2 +-
 .gitlab/input_files/build.yaml.tpl |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4eeb2a8c..2fa84bee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,11 @@ ci image:
   image: registry.ddbuild.io/images/docker:20.10
   tags: ["arch:arm64"]
   needs: []
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
-      changes:
-        - .gitlab/Dockerfile
-      when: on_success
+  # rules:
+  #   - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+  #     changes:
+  #       - .gitlab/Dockerfile
+  #     when: on_success
   variables:
     DOCKER_TARGET: ${DOCKER_TARGET_IMAGE}:${DOCKER_TARGET_VERSION}
   script:
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 16c328a5..9f9ecf4f 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -15,4 +15,4 @@ RUN yarn global add serverless@^3.38.0 --prefix /usr/local
 
 # Install AWS CLI
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-RUN unzip awscliv2.zip && ./aws/install
+RUN unzip awscliv2.zip && ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update
diff --git a/.gitlab/input_files/build.yaml.tpl b/.gitlab/input_files/build.yaml.tpl
index 371d3cdf..60e57941 100644
--- a/.gitlab/input_files/build.yaml.tpl
+++ b/.gitlab/input_files/build.yaml.tpl
@@ -58,6 +58,7 @@ lint ({{ $runtime.name }}):
   image: registry.ddbuild.io/images/mirror/node:{{ $runtime.node_major_version }}-bullseye
   cache: &{{ $runtime.name }}-cache
   before_script: *node-before-script
+  needs: []
   script: 
     - yarn check-formatting
     - yarn lint
@@ -68,6 +69,7 @@ unit test ({{ $runtime.name }}):
   image: registry.ddbuild.io/images/mirror/node:{{ $runtime.node_major_version }}-bullseye
   cache: &{{ $runtime.name }}-cache
   before_script: *node-before-script
+  needs: []
   script: 
     - yarn build
     - yarn test --ci --forceExit --detectOpenHandles

From df28916325480de74ed30e024bef60feddeab438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:46:12 -0400
Subject: [PATCH 7/9] build image and check latest `aws-cli` version

---
 .gitlab/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 9f9ecf4f..9fad1041 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -15,4 +15,6 @@ RUN yarn global add serverless@^3.38.0 --prefix /usr/local
 
 # Install AWS CLI
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-RUN unzip awscliv2.zip && ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update
+RUN unzip awscliv2.zip
+RUN ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update
+RUN aws --version

From 391f73e6c1b6a26bdda25531cf1f2e648457acb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:56:43 -0400
Subject: [PATCH 8/9] specify aws cli version

---
 .gitlab/Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 9fad1041..1848a6a9 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -11,10 +11,9 @@ RUN apt-get update && apt-get install -y nodejs
 
 # Install Yarn and Typescript globally
 RUN npm install --global yarn typescript
-RUN yarn global add serverless@^3.38.0 --prefix /usr/local
+RUN yarn global add serverless@^3 --prefix /usr/local
 
 # Install AWS CLI
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-RUN unzip awscliv2.zip
-RUN ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update
-RUN aws --version
+ARG AWS_CLI_VERSION=2.17.60
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip"
+RUN unzip awscliv2.zip && ./aws/install

From 19518f24a70a4d74bc2619f8077fd161adf2a51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?jordan=20gonz=C3=A1lez?=
 <30836115+duncanista@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:17:48 -0400
Subject: [PATCH 9/9] update image building and aws cli install

---
 .gitlab-ci.yml     | 10 +++++-----
 .gitlab/Dockerfile |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fa84bee..4eeb2a8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,11 +11,11 @@ ci image:
   image: registry.ddbuild.io/images/docker:20.10
   tags: ["arch:arm64"]
   needs: []
-  # rules:
-  #   - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
-  #     changes:
-  #       - .gitlab/Dockerfile
-  #     when: on_success
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE == "push"'
+      changes:
+        - .gitlab/Dockerfile
+      when: on_success
   variables:
     DOCKER_TARGET: ${DOCKER_TARGET_IMAGE}:${DOCKER_TARGET_VERSION}
   script:
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 1848a6a9..adb16858 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -14,6 +14,5 @@ RUN npm install --global yarn typescript
 RUN yarn global add serverless@^3 --prefix /usr/local
 
 # Install AWS CLI
-ARG AWS_CLI_VERSION=2.17.60
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip"
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
 RUN unzip awscliv2.zip && ./aws/install