Merge branch 'main' into renovate/all

quakeservices · Nov 2, 2023 · 3eade3c · 3eade3c
2 parents 5ed65a0 + 7178309
commit 3eade3c
Show file tree

Hide file tree

Showing 13 changed files with 181 additions and 138 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -4,4 +4,15 @@
     "config:base",
     "group:all"
   ]
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^scripts/include/env-app$"
+      ],      
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s(?:ENV|ARG|export) .+?_VERSION[ =]\"?(?<currentValue>.+?)\"?\\s"
+      ]
+    }
+  ]  
 }
diff --git a/.github/workflows/build_container.yaml b/.github/workflows/build_container.yaml
@@ -53,5 +53,3 @@ jobs:
             "POETRY_VERSION=${{ env.POETRY_VERSION }}"
           push: true
           tags: ${{ env.CONTAINER_IMAGE_REVISION }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
diff --git a/.github/workflows/test_cdk.yaml b/.github/workflows/test_cdk.yaml
@@ -7,26 +7,28 @@ on:
     branches:
       - "main"
     paths:
-      - '.github/workflows/test_cdk.yaml'
       - '.github/workflows/lint_python.yaml'
       - '.github/workflows/lint_yaml.yaml'
-      - 'docker/Dockerfile.cdk'
+      - '.github/workflows/test_cdk.yaml'
       - 'deployment/**'
-      - 'test/unit/cdk/**'
-      - 'pyproject.toml'
+      - 'docker/Dockerfile.cdk'
       - 'poetry.lock'
+      - 'pyproject.toml'
+      - 'scripts/cdk/*'
+      - 'scripts/include/cdk'
+      - 'test/unit/cdk/**'
   pull_request:
-    branches:
-      - "main"
     paths:
-      - '.github/workflows/test_cdk.yaml'
       - '.github/workflows/lint_python.yaml'
       - '.github/workflows/lint_yaml.yaml'
-      - 'docker/Dockerfile.cdk'
+      - '.github/workflows/test_cdk.yaml'
       - 'deployment/**'
-      - 'test/unit/cdk/**'
-      - 'pyproject.toml'
+      - 'docker/Dockerfile.cdk'
       - 'poetry.lock'
+      - 'pyproject.toml'
+      - 'scripts/cdk/*'
+      - 'scripts/include/cdk'
+      - 'test/unit/cdk/**'
 
 jobs:
   build:

diff --git a/.github/workflows/test_master.yaml b/.github/workflows/test_master.yaml
@@ -17,8 +17,6 @@ on:
       - 'pyproject.toml'
       - 'poetry.lock'
   pull_request:
-    branches:
-      - "main"
     paths:
       - '.github/workflows/test_master.yaml'
       - '.github/workflows/lint_python.yaml'

diff --git a/scripts/cdk/bootstrap b/scripts/cdk/bootstrap
@@ -4,5 +4,5 @@ set -euo pipefail
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
 ACCOUNT=$(aws sts get-caller-identity | jq -r '.Account')
-scripts/include/cdk cdk bootstrap "aws://${ACCOUNT}/us-west-2"
-scripts/include/cdk cdk bootstrap "aws://${ACCOUNT}/us-east-1"
+scripts/include/cdk bootstrap "aws://${ACCOUNT}/us-west-2"
+scripts/include/cdk bootstrap "aws://${ACCOUNT}/us-east-1"
diff --git a/scripts/cdk/deploy b/scripts/cdk/deploy
@@ -3,4 +3,4 @@ set -euo pipefail
 
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
-scripts/include/cdk cdk deploy --app ./app.py
+scripts/include/cdk deploy --app ./app.py
diff --git a/scripts/cdk/ls b/scripts/cdk/ls
@@ -3,4 +3,4 @@ set -euo pipefail
 
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
-scripts/include/cdk cdk ls
+scripts/include/cdk ls
diff --git a/scripts/cdk/synth b/scripts/cdk/synth
@@ -3,4 +3,4 @@ set -euo pipefail
 
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
-scripts/include/cdk cdk synth
+scripts/include/cdk synth
diff --git a/scripts/include/build b/scripts/include/build
@@ -6,11 +6,11 @@ cd "$(git rev-parse --show-toplevel)" || exit
 CONTAINER=${1:-}
 source scripts/include/env-container-build "$CONTAINER"
 
-if [ "$CONTAINER_SKIP_BUILD" != "TRUE" ]; then
+if [ "$CONTAINER_SKIP_BUILD" == "TRUE" ]; then
+  echo "+++ Skipped build for ${CONTAINER_IMAGE_REVISION} +++"
+else
   echo "+++ Building ${CONTAINER_IMAGE_REVISION} +++"
   $CONTAINER_COMMAND build \
                      "${CONTAINER_BUILD_OPTIONS[@]}" \
                      --tag "${CONTAINER_IMAGE_REVISION}"
-else
-  echo "+++ Skipped build for ${CONTAINER_IMAGE_REVISION} +++"
 fi
diff --git a/scripts/include/cdk b/scripts/include/cdk
@@ -3,8 +3,12 @@ set -euo pipefail
 
 cd "$(git rev-parse --show-toplevel)" || exit 1
 
-source scripts/include/build-env
-scripts/build-cdk > /dev/null
+source scripts/include/build cdk >/dev/null 2>&1
+source scripts/include/env-container-run
+
+CONTAINER_AWS_OPTIONS+=(
+  --env JSII_SILENCE_WARNING_UNTESTED_NODE_VERSION=True
+)
 
 # shellcheck disable=SC2206
 CONTAINER_RUN_OPTIONS+=(
@@ -16,5 +20,5 @@ CONTAINER_RUN_OPTIONS+=(
 $CONTAINER_COMMAND run \
                    "${CONTAINER_RUN_OPTIONS[@]}" \
                    "${CONTAINER_AWS_OPTIONS[@]}" \
-                   "${APP_NAME}/cdk:latest" \
+                   "${CONTAINER_IMAGE_REVISION}" \
                    "$@"
diff --git a/scripts/include/env-app b/scripts/include/env-app
@@ -3,11 +3,6 @@ set -euo pipefail
 
 cd "$(git rev-parse --show-toplevel)" || exit
 
-if ! test -f pyproject.toml; then
-  echo "Missing pyproject.toml"
-  exit 1;
-fi
-
 #
 # General app variables
 #
@@ -21,9 +16,12 @@ export MASTER_HEALTHCHECK="8080/tcp"
 #
 # Depenency versions
 #
-CDK_VERSION=$(awk '/^aws-cdk-lib = / {gsub(/"/, "", $3); gsub(/\^/, "", $3); print $3}' pyproject.toml)
-POETRY_VERSION=$(awk '/^poetry = / {gsub(/"/, "", $3); gsub(/\^/, "", $3); print $3}' pyproject.toml)
-PIP_VERSION=$(awk '/^pip = / {gsub(/"/, "", $3); gsub(/\^/, "", $3); print $3}' pyproject.toml)
+# renovate: datasource=pypi depName=aws-cdk-lib
+export CDK_VERSION="2.103.1"
+# renovate: datasource=pypi depName=pip
+export PIP_VERSION="23.3.1"
+# renovate: datasource=pypi depName=poetry
+export POETRY_VERSION="1.6.1"
 
 export CDK_VERSION
 export POETRY_VERSION