From 36ef17ba3e3e5a90a2efd8d63e498d38f364e37e Mon Sep 17 00:00:00 2001 From: Di Chen Date: Wed, 30 Mar 2022 10:04:09 +0800 Subject: [PATCH 1/2] draft --- scripts/build-package | 5 +++-- scripts/mk-config | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/build-package b/scripts/build-package index b45fda81..6d47df8a 100755 --- a/scripts/build-package +++ b/scripts/build-package @@ -1,10 +1,11 @@ #!/bin/bash -set -e - +set -x pip install --require-hashes -r requirements.txt --target ./package pip install --no-deps --target ./package . cp ./configuration/exodus-lambda-deploy.yaml ./package scripts/mk-config > ./package/lambda_config.json +ls -al . +echo $EXODUS_LAMBDA_VERSION aws cloudformation package \ --template ./package/exodus-lambda-deploy.yaml \ --s3-bucket $PROJECT-pipeline-artifacts \ diff --git a/scripts/mk-config b/scripts/mk-config index 39cac37d..f6978df1 100755 --- a/scripts/mk-config +++ b/scripts/mk-config @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -x export ORIGIN_RESPONSE_LOGGER_LEVEL=${ORIGIN_RESPONSE_LOGGER_LEVEL:-WARNING} export ORIGIN_REQUEST_LOGGER_LEVEL=${ORIGIN_REQUEST_LOGGER_LEVEL:-WARNING} @@ -13,5 +13,7 @@ export EXODUS_TABLE=${EXODUS_TABLE:-$PROJECT-cdn-$ENV_TYPE} export EXODUS_CONFIG_TABLE=${EXODUS_CONFIG_TABLE:-$PROJECT-config-$ENV_TYPE} export EXODUS_SECRET_ARN=${EXODUS_SECRET_ARN} export EXODUS_KEY_ID=${EXODUS_KEY_ID} +export EXODUS_LAMBDA_VERSION="${EXODUS_LAMBDA_VERSION:-$(date -u --iso=s) ${CODEBUILD_RESOLVED_SOURCE_VERSION}}" envsubst < ./configuration/lambda_config.template +echo $EXODUS_LAMBDA_VERSION From 56de80df4c1ccf896f03292cf65e704bfa2b43f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 22:19:28 +0000 Subject: [PATCH 2/2] build(deps): bump zipp from 3.5.0 to 3.8.0 Bumps [zipp](https://github.com/jaraco/zipp) from 3.5.0 to 3.8.0. - [Release notes](https://github.com/jaraco/zipp/releases) - [Changelog](https://github.com/jaraco/zipp/blob/main/CHANGES.rst) - [Commits](https://github.com/jaraco/zipp/compare/v3.5.0...v3.8.0) --- updated-dependencies: - dependency-name: zipp dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- test-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 7ef1ad1d..551496b8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -285,9 +285,9 @@ wcwidth==0.2.5 \ wrapt==1.12.1 \ --hash=sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7 # via astroid -zipp==3.5.0 \ - --hash=sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 \ - --hash=sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4 +zipp==3.8.0 \ + --hash=sha256:56bf8aadb83c24db6c4b577e13de374ccfb67da2078beba1d037c17980bf43ad \ + --hash=sha256:c4f6e5bbf48e74f7a38e7cc5b0480ff42b0ae5178957d564d18932525d5cf099 # via importlib-metadata # WARNING: The following packages were not pinned, but pip requires them to be