From 591220ffb87a9f54c4f0c2e730b16f1be3a749d6 Mon Sep 17 00:00:00 2001 From: Kendra Neil <53584728+TheRealAmazonKendra@users.noreply.github.com> Date: Mon, 5 Aug 2024 12:56:52 -0700 Subject: [PATCH 01/31] chore: create release branches for v2 and v3 --- .gitattributes | 2 + .github/workflows/release-v2-main.yml | 78 +++++++++++++++++++++++ .github/workflows/release.yml | 2 +- .github/workflows/upgrade-v2-main.yml | 89 +++++++++++++++++++++++++++ .gitignore | 2 + .projen/files.json | 2 + .projen/tasks.json | 29 ++++++++- .projenrc.ts | 9 ++- jest.config.json | 6 +- package.json | 1 + 10 files changed, 215 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/release-v2-main.yml create mode 100644 .github/workflows/upgrade-v2-main.yml diff --git a/.gitattributes b/.gitattributes index 59a693a..66b916d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,8 +7,10 @@ /.github/workflows/auto-approve.yml linguist-generated /.github/workflows/build.yml linguist-generated /.github/workflows/pull-request-lint.yml linguist-generated +/.github/workflows/release-v2-main.yml linguist-generated /.github/workflows/release.yml linguist-generated /.github/workflows/upgrade-main.yml linguist-generated +/.github/workflows/upgrade-v2-main.yml linguist-generated /.gitignore linguist-generated /.mergify.yml linguist-generated /.npmignore linguist-generated diff --git a/.github/workflows/release-v2-main.yml b/.github/workflows/release-v2-main.yml new file mode 100644 index 0000000..d5214a2 --- /dev/null +++ b/.github/workflows/release-v2-main.yml @@ -0,0 +1,78 @@ +# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". + +name: release-v2-main +on: + push: + branches: + - v2-main + workflow_dispatch: {} +jobs: + release: + runs-on: ubuntu-latest + permissions: + contents: write + outputs: + latest_commit: ${{ steps.git_remote.outputs.latest_commit }} + tag_exists: ${{ steps.check_tag_exists.outputs.exists }} + env: + CI: "true" + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Set git identity + run: |- + git config user.name "github-actions" + git config user.email "github-actions@github.com" + - name: Install dependencies + run: yarn install --check-files --frozen-lockfile + - name: release:v2-main + run: npx projen release:v2-main + - name: Check if version has already been tagged + id: check_tag_exists + run: |- + TAG=$(cat dist/releasetag.txt) + ([ ! -z "$TAG" ] && git ls-remote -q --exit-code --tags origin $TAG && (echo "exists=true" >> $GITHUB_OUTPUT)) || (echo "exists=false" >> $GITHUB_OUTPUT) + cat $GITHUB_OUTPUT + - name: Check for new commits + id: git_remote + run: |- + echo "latest_commit=$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" >> $GITHUB_OUTPUT + cat $GITHUB_OUTPUT + - name: Backup artifact permissions + if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} + run: cd dist && getfacl -R . > permissions-backup.acl + continue-on-error: true + - name: Upload artifact + if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} + uses: actions/upload-artifact@v4 + with: + name: build-artifact + path: dist + overwrite: true + release_github: + name: Publish to GitHub Releases + needs: release + runs-on: ubuntu-latest + permissions: + contents: write + if: needs.release.outputs.tag_exists != 'true' && needs.release.outputs.latest_commit == github.sha + steps: + - uses: actions/setup-node@v4 + with: + node-version: 18.x + - name: Download build artifacts + uses: actions/download-artifact@v4 + with: + name: build-artifact + path: dist + - name: Restore build artifact permissions + run: cd dist && setfacl --restore=permissions-backup.acl + continue-on-error: true + - name: Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ github.repository }} + GITHUB_REF: ${{ github.sha }} + run: 'echo "DRY RUN: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi"' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd1016e..3c5a0a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -75,4 +75,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_REF: ${{ github.sha }} - run: 'echo "DRY RUN: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi"' + run: 'echo "DRY RUN: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF -p 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi"' diff --git a/.github/workflows/upgrade-v2-main.yml b/.github/workflows/upgrade-v2-main.yml new file mode 100644 index 0000000..c65a3d6 --- /dev/null +++ b/.github/workflows/upgrade-v2-main.yml @@ -0,0 +1,89 @@ +# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". + +name: upgrade-v2-main +on: + workflow_dispatch: {} + schedule: + - cron: 0 0 * * * +jobs: + upgrade: + name: Upgrade + runs-on: ubuntu-latest + permissions: + contents: read + outputs: + patch_created: ${{ steps.create_patch.outputs.patch_created }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: v2-main + - name: Install dependencies + run: yarn install --check-files --frozen-lockfile + - name: Upgrade dependencies + run: npx projen upgrade + - name: Find mutations + id: create_patch + run: |- + git add . + git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ + - name: Upload patch + if: steps.create_patch.outputs.patch_created + uses: actions/upload-artifact@v4 + with: + name: .repo.patch + path: .repo.patch + overwrite: true + pr: + name: Create Pull Request + needs: upgrade + runs-on: ubuntu-latest + permissions: + contents: read + if: ${{ needs.upgrade.outputs.patch_created }} + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + ref: v2-main + - name: Download patch + uses: actions/download-artifact@v4 + with: + name: .repo.patch + path: ${{ runner.temp }} + - name: Apply patch + run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' + - name: Set git identity + run: |- + git config user.name "github-actions" + git config user.email "github-actions@github.com" + - name: Create Pull Request + id: create-pr + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + commit-message: |- + chore(deps): upgrade dependencies + + Upgrades project dependencies. See details in [workflow run]. + + [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + + ------ + + *Automatically created by projen via the "upgrade-v2-main" workflow* + branch: github-actions/upgrade-v2-main + title: "chore(deps): upgrade dependencies" + labels: auto-approve + body: |- + Upgrades project dependencies. See details in [workflow run]. + + [Workflow Run]: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} + + ------ + + *Automatically created by projen via the "upgrade-v2-main" workflow* + author: github-actions + committer: github-actions + signoff: true diff --git a/.gitignore b/.gitignore index 230933c..c0fb610 100644 --- a/.gitignore +++ b/.gitignore @@ -42,8 +42,10 @@ junit.xml /dist/changelog.md /dist/version.txt !/.github/workflows/release.yml +!/.github/workflows/release-v2-main.yml !/.mergify.yml !/.github/workflows/upgrade-main.yml +!/.github/workflows/upgrade-v2-main.yml !/.github/pull_request_template.md !/test/ !/tsconfig.json diff --git a/.projen/files.json b/.projen/files.json index d2f2bc6..1e2e44e 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -6,8 +6,10 @@ ".github/workflows/auto-approve.yml", ".github/workflows/build.yml", ".github/workflows/pull-request-lint.yml", + ".github/workflows/release-v2-main.yml", ".github/workflows/release.yml", ".github/workflows/upgrade-main.yml", + ".github/workflows/upgrade-v2-main.yml", ".gitignore", ".mergify.yml", ".npmignore", diff --git a/.projen/tasks.json b/.projen/tasks.json index 6f10672..b1ae082 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -159,7 +159,34 @@ "name": "release", "description": "Prepare a release from \"main\" branch", "env": { - "RELEASE": "true" + "RELEASE": "true", + "MAJOR": "3", + "PRERELEASE": "rc" + }, + "steps": [ + { + "exec": "rm -fr dist" + }, + { + "spawn": "bump" + }, + { + "spawn": "build" + }, + { + "spawn": "unbump" + }, + { + "exec": "git diff --ignore-space-at-eol --exit-code" + } + ] + }, + "release:v2-main": { + "name": "release:v2-main", + "description": "Prepare a release from \"v2-main\" branch", + "env": { + "RELEASE": "true", + "MAJOR": "2" }, "steps": [ { diff --git a/.projenrc.ts b/.projenrc.ts index d13b7dc..92fc68c 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -1,9 +1,16 @@ import { typescript } from 'projen'; const project = new typescript.TypeScriptProject({ - defaultReleaseBranch: 'main', name: 'cdk-assets', projenrcTs: true, publishDryRun: true, + defaultReleaseBranch: 'main', + majorVersion: 3, + prerelease: 'rc', + releaseBranches: { + 'v2-main': { + majorVersion: 2, + }, + }, autoApproveUpgrades: true, autoApproveOptions: { allowedUsernames: ['aws-cdk-automation'], diff --git a/jest.config.json b/jest.config.json index abb8468..47c9b85 100644 --- a/jest.config.json +++ b/jest.config.json @@ -3,8 +3,10 @@ "verbose": true, "maxWorkers": "50%", "testMatch": [ - "/lib/**/__tests__/**/*.ts?(x)", - "/@(test|lib)/**/*(*.)@(spec|test).ts?(x)" + "/@(lib|test)/**/*(*.)@(spec|test).ts?(x)", + "/@(lib|test)/**/__tests__/**/*.ts?(x)", + "/@(projenrc)/**/*(*.)@(spec|test).ts?(x)", + "/@(projenrc)/**/__tests__/**/*.ts?(x)" ], "clearMocks": true, "collectCoverage": true, diff --git a/package.json b/package.json index 3998420..d7b5ad9 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "post-upgrade": "npx projen post-upgrade", "pre-compile": "npx projen pre-compile", "release": "npx projen release", + "release:v2-main": "npx projen release:v2-main", "test": "npx projen test", "test:watch": "npx projen test:watch", "unbump": "npx projen unbump", From bf4baf3c5501e34ab5ed10b2eb4b275c06124661 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Tue, 6 Aug 2024 03:21:34 +0300 Subject: [PATCH 02/31] chore(deps): upgrade dependencies (#4) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10257976005 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d7b5ad9..a8c4f0d 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "typescript": "^5.5.4" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "^2.147.0", + "@aws-cdk/cloud-assembly-schema": "^2.151.0", "@aws-cdk/cx-api": "^2.151.0", "archiver": "^5.3.2", "aws-sdk": "^2.1668.0", diff --git a/yarn.lock b/yarn.lock index effe267..5e36d7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,7 +10,7 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@aws-cdk/cloud-assembly-schema@^2.147.0": +"@aws-cdk/cloud-assembly-schema@^2.151.0": version "2.151.0" resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.151.0.tgz#87b3ae5dd486b47b735abae8b62b0601ca7794a4" integrity sha512-JGAqB+wzgSQAyN+mxpfOEDS/aW88wwDU2R5Xbe0hIT4ObfSjzAqdeWFG5IEWgwNxCARTyCO0S5FqIShR7aZqSg== From 37b9c0548389605f666ef07caf7fbc78f199a646 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Wed, 7 Aug 2024 03:21:33 +0300 Subject: [PATCH 03/31] chore(deps): upgrade dependencies (#6) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10275852420 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 4 ++-- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index a8c4f0d..f0339fd 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jszip": "^3.10.1", "mock-fs": "^4.14.0", "prettier": "^3.3.3", - "projen": "^0.84.13", + "projen": "^0.85.0", "standard-version": "^9", "ts-jest": "^29.2.4", "ts-node": "^10.9.2", @@ -62,7 +62,7 @@ "@aws-cdk/cloud-assembly-schema": "^2.151.0", "@aws-cdk/cx-api": "^2.151.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1668.0", + "aws-sdk": "^2.1669.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 5e36d7c..cabd7f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -841,9 +841,9 @@ "@types/yargs-parser" "*" "@types/yargs@^17.0.8": - version "17.0.32" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229" - integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog== + version "17.0.33" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d" + integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA== dependencies: "@types/yargs-parser" "*" @@ -1177,10 +1177,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1668.0: - version "2.1668.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1668.0.tgz#100fc94f5ab962e7363672857401452a2455e00e" - integrity sha512-4Vcg3KjNZDHbvG4DI6jusN0DUPpRy3E/tBb6CA6ojlS2V1X5zljU9tkspICtbxXdY1gPFmKUe5COPc34XHG1RA== +aws-sdk@^2.1669.0: + version "2.1669.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1669.0.tgz#23aae49658cd199b08b59d9b36cb51a1ab71ed96" + integrity sha512-ua3AfvS2rUiOpf9choxNXLKE3T70yY6klGovdekXd5ZTwzDXQoYw1dokfArIub/2BM9Dmgi/bFq/crnz83tX0w== dependencies: buffer "4.9.2" events "1.1.1" @@ -1897,9 +1897,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz#cd477c830dd6fca41fbd5465c1ff6ce08ac22343" - integrity sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA== + version "1.5.5" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.5.tgz#03bfdf422bdd2c05ee2657efedde21264a1a566b" + integrity sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA== emittery@^0.13.1: version "0.13.1" @@ -4101,10 +4101,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@^0.84.13: - version "0.84.13" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.84.13.tgz#f9b4b16d0efdcbec62b4429e06fa5344ce7bf0a2" - integrity sha512-N9XocN5wcYg5ZeyQwr76sxRPncdXdkIrlOJhISFtI9jMZxEU6D+ms/oKLCc85+KwJH9qbhrR/+5h6Nys54n0kA== +projen@^0.85.0: + version "0.85.0" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.85.0.tgz#ce182db7e37a7784172a49d037693ce2a272d561" + integrity sha512-5W4+h/f5eDENFVeOdAGnuZQD88BSCNy7gxYUge9L87qlbvOR3cKF9fzEguFryGcBJKN6AtCjACsdMwHyNE4xPQ== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" From 0471c782fd69b36458162c63c95b61694be43663 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Thu, 8 Aug 2024 03:21:35 +0300 Subject: [PATCH 04/31] chore(deps): upgrade dependencies (#8) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10293667126 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index f0339fd..d7744f0 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@aws-cdk/cloud-assembly-schema": "^2.151.0", "@aws-cdk/cx-api": "^2.151.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1669.0", + "aws-sdk": "^2.1670.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index cabd7f7..4bf5941 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1177,10 +1177,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1669.0: - version "2.1669.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1669.0.tgz#23aae49658cd199b08b59d9b36cb51a1ab71ed96" - integrity sha512-ua3AfvS2rUiOpf9choxNXLKE3T70yY6klGovdekXd5ZTwzDXQoYw1dokfArIub/2BM9Dmgi/bFq/crnz83tX0w== +aws-sdk@^2.1670.0: + version "2.1670.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1670.0.tgz#5b09589193c47915e98d8eb17aba1a85de4fd033" + integrity sha512-OvHPuCKubcp5u0xbfqxSYjGnNiK38ZF52Gsog185UgaO4LfGL51QXs974XLub4rztLa3/qOGynKI3bpFsbSQoA== dependencies: buffer "4.9.2" events "1.1.1" @@ -1381,9 +1381,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001646: - version "1.0.30001649" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001649.tgz#3ec700309ca0da2b0d3d5fb03c411b191761c992" - integrity sha512-fJegqZZ0ZX8HOWr6rcafGr72+xcgJKI9oWfDW5DrD7ExUtgZC7a7R7ZYmZqplh7XDocFdGeIFn7roAxhOeYrPQ== + version "1.0.30001650" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001650.tgz#dd1eba0938e39536d184c3c99b2569a13788bc16" + integrity sha512-fgEc7hP/LB7iicdXHUI9VsBsMZmUmlVJeQP2qqQW+3lkqVhbmjEU8zp+h5stWeilX+G7uXuIUIIlWlDw9jdt8g== case@^1.6.3: version "1.6.3" From 858b890158d5961aa125cbac6c7f82607b82b99d Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Fri, 9 Aug 2024 03:21:23 +0300 Subject: [PATCH 05/31] chore(deps): upgrade dependencies (#10) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10311424404 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index d7744f0..229d786 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@aws-cdk/cloud-assembly-schema": "^2.151.0", "@aws-cdk/cx-api": "^2.151.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1670.0", + "aws-sdk": "^2.1671.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 4bf5941..afbb402 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1177,10 +1177,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1670.0: - version "2.1670.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1670.0.tgz#5b09589193c47915e98d8eb17aba1a85de4fd033" - integrity sha512-OvHPuCKubcp5u0xbfqxSYjGnNiK38ZF52Gsog185UgaO4LfGL51QXs974XLub4rztLa3/qOGynKI3bpFsbSQoA== +aws-sdk@^2.1671.0: + version "2.1671.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1671.0.tgz#b142e94698444a0f4a1f3492dd776869ddd54540" + integrity sha512-dOtL61cWZDNNqgrXc+DP5ge8ARBv4HMM71XFLHSi2+1/24YUw3f6uc+0OVE7bVmUMxb6+3Xjsa04l8zhyB0sug== dependencies: buffer "4.9.2" events "1.1.1" @@ -1381,9 +1381,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001646: - version "1.0.30001650" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001650.tgz#dd1eba0938e39536d184c3c99b2569a13788bc16" - integrity sha512-fgEc7hP/LB7iicdXHUI9VsBsMZmUmlVJeQP2qqQW+3lkqVhbmjEU8zp+h5stWeilX+G7uXuIUIIlWlDw9jdt8g== + version "1.0.30001651" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz#52de59529e8b02b1aedcaaf5c05d9e23c0c28138" + integrity sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg== case@^1.6.3: version "1.6.3" From d3ebf87e1ba72781fa876cbb9fe459d981691db5 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Sat, 10 Aug 2024 03:21:09 +0300 Subject: [PATCH 06/31] chore(deps): upgrade dependencies (#12) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10327336851 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 2 +- yarn.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 229d786..3473774 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@aws-cdk/cloud-assembly-schema": "^2.151.0", "@aws-cdk/cx-api": "^2.151.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1671.0", + "aws-sdk": "^2.1672.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index afbb402..fe4d44e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -798,16 +798,16 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "22.1.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.1.0.tgz#6d6adc648b5e03f0e83c78dc788c2b037d0ad94b" - integrity sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw== + version "22.2.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b" + integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ== dependencies: undici-types "~6.13.0" "@types/node@^18": - version "18.19.43" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.43.tgz#fe01bb599b60bb3279c26d0fdb751d2f3e299ae0" - integrity sha512-Mw/YlgXnyJdEwLoFv2dpuJaDFriX+Pc+0qOBJ57jC1H6cDxIj2xc5yUrdtArDVG0m+KV6622a4p2tenEqB3C/g== + version "18.19.44" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.44.tgz#875a8322d17ff12bf82b3af8c07b9310a00e72f8" + integrity sha512-ZsbGerYg72WMXUIE9fYxtvfzLEuq6q8mKERdWFnqTmOvudMxnz+CBNRoOwJ2kNpFOncrKjT1hZwxjlFgQ9qvQA== dependencies: undici-types "~5.26.4" @@ -1177,10 +1177,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1671.0: - version "2.1671.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1671.0.tgz#b142e94698444a0f4a1f3492dd776869ddd54540" - integrity sha512-dOtL61cWZDNNqgrXc+DP5ge8ARBv4HMM71XFLHSi2+1/24YUw3f6uc+0OVE7bVmUMxb6+3Xjsa04l8zhyB0sug== +aws-sdk@^2.1672.0: + version "2.1672.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1672.0.tgz#7526f12bda7b56a16c84e82f14dbb4b34a2b233f" + integrity sha512-en4uaVWE/wPa9YsF2XAYtKP0hLQ10s93/nWe+SQ8Yox1xrDn1Tr32MMOtSLRXLxPRKcvmI7Yzw7jiQMgs1jqBQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -1897,9 +1897,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.5.tgz#03bfdf422bdd2c05ee2657efedde21264a1a566b" - integrity sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA== + version "1.5.6" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.6.tgz#c81d9938b5a877314ad370feb73b4e5409b36abd" + integrity sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw== emittery@^0.13.1: version "0.13.1" From 8193654255dc8778dddf05b9bd362b19a47af8be Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Sun, 11 Aug 2024 03:23:28 +0300 Subject: [PATCH 07/31] chore(deps): upgrade dependencies (#14) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10335506332 ------ *Automatically created by projen via the "upgrade-main" workflow* --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index fe4d44e..97d2c4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4899,9 +4899,9 @@ typescript@^5.5.4: integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== uglify-js@^3.1.4: - version "3.19.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.1.tgz#2d5df6a0872c43da43187968308d7741d44b8056" - integrity sha512-y/2wiW+ceTYR2TSSptAhfnEtpLaQ4Ups5zrjB2d3kuVxHj16j/QJwPl5PvuGy9uARb39J0+iKxcRPvtpsx4A4A== + version "3.19.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.19.2.tgz#319ae26a5fbd18d03c7dc02496cfa1d6f1cd4307" + integrity sha512-S8KA6DDI47nQXJSi2ctQ629YzwOVs+bQML6DAtvy0wgNdpi+0ySpQK0g2pxBq2xfF2z3YCscu7NNA8nXT9PlIQ== unbox-primitive@^1.0.2: version "1.0.2" From 22c788edbd6a3362b95402d436cbcfd19a3c4022 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Tue, 13 Aug 2024 03:22:40 +0300 Subject: [PATCH 08/31] chore(deps): upgrade dependencies (#16) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10361382461 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 3473774..adecc04 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@aws-cdk/cloud-assembly-schema": "^2.151.0", "@aws-cdk/cx-api": "^2.151.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1672.0", + "aws-sdk": "^2.1673.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 97d2c4c..455a15e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1177,10 +1177,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1672.0: - version "2.1672.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1672.0.tgz#7526f12bda7b56a16c84e82f14dbb4b34a2b233f" - integrity sha512-en4uaVWE/wPa9YsF2XAYtKP0hLQ10s93/nWe+SQ8Yox1xrDn1Tr32MMOtSLRXLxPRKcvmI7Yzw7jiQMgs1jqBQ== +aws-sdk@^2.1673.0: + version "2.1673.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1673.0.tgz#08dd3196c0f305457a184ec0e86b15de08026505" + integrity sha512-7tcc+y7XmCt2aq3vq46xpJTDMNqukFhJOXsQuuwsMZiydZpGG7l7wbpTOtfFhktieSjLg4V9eyznpnZNz5aooA== dependencies: buffer "4.9.2" events "1.1.1" @@ -2697,9 +2697,9 @@ ieee754@^1.1.13, ieee754@^1.1.4: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.2.0, ignore@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" - integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== + version "5.3.2" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" + integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== immediate@~3.0.5: version "3.0.6" From ef81c90b37721d49984dc2f83d2bb20ee2644147 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Tue, 13 Aug 2024 21:45:38 +0300 Subject: [PATCH 09/31] chore(deps): upgrade dependencies (#19) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10375384595 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 2 +- yarn.lock | 58 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index adecc04..4a326e5 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@aws-cdk/cloud-assembly-schema": "^2.151.0", "@aws-cdk/cx-api": "^2.151.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1673.0", + "aws-sdk": "^2.1674.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 455a15e..1a87565 100644 --- a/yarn.lock +++ b/yarn.lock @@ -165,14 +165,28 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-class-properties@^7.8.3": +"@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== dependencies: "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-syntax-import-meta@^7.8.3": +"@babel/plugin-syntax-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-import-attributes@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz#b4f9ea95a79e6912480c4b626739f86a076624ca" + integrity sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A== + dependencies: + "@babel/helper-plugin-utils" "^7.24.7" + +"@babel/plugin-syntax-import-meta@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== @@ -193,7 +207,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.24.7" -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== @@ -207,7 +221,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-numeric-separator@^7.8.3": +"@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== @@ -235,7 +249,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-top-level-await@^7.8.3": +"@babel/plugin-syntax-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== @@ -1177,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1673.0: - version "2.1673.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1673.0.tgz#08dd3196c0f305457a184ec0e86b15de08026505" - integrity sha512-7tcc+y7XmCt2aq3vq46xpJTDMNqukFhJOXsQuuwsMZiydZpGG7l7wbpTOtfFhktieSjLg4V9eyznpnZNz5aooA== +aws-sdk@^2.1674.0: + version "2.1674.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1674.0.tgz#0c5abb9a1a3bbf2969108dbfc0738c843098bcf3" + integrity sha512-VTijN8+pKrf4sfM2t+ISXjypJ+k3AiP6OMzyLoWJ7jfMBtBfWbQc1rN07OndNb0CZRBBukOHoBhYDPuyae+/1Q== dependencies: buffer "4.9.2" events "1.1.1" @@ -1228,22 +1249,25 @@ babel-plugin-jest-hoist@^29.6.3: "@types/babel__traverse" "^7.0.6" babel-preset-current-node-syntax@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b" - integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30" + integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-import-attributes" "^7.24.7" + "@babel/plugin-syntax-import-meta" "^7.10.4" "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" babel-preset-jest@^29.6.3: version "29.6.3" From f4629fd9853efe056efbe1f346df8aedd6e0112d Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Thu, 15 Aug 2024 03:21:34 +0300 Subject: [PATCH 10/31] chore(deps): upgrade dependencies (#21) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10396583277 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 4 ++-- yarn.lock | 44 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 4a326e5..0413f45 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,9 @@ }, "dependencies": { "@aws-cdk/cloud-assembly-schema": "^2.151.0", - "@aws-cdk/cx-api": "^2.151.0", + "@aws-cdk/cx-api": "^2.151.1", "archiver": "^5.3.2", - "aws-sdk": "^2.1674.0", + "aws-sdk": "^2.1675.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 1a87565..9861d89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,17 +11,17 @@ "@jridgewell/trace-mapping" "^0.3.24" "@aws-cdk/cloud-assembly-schema@^2.151.0": - version "2.151.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.151.0.tgz#87b3ae5dd486b47b735abae8b62b0601ca7794a4" - integrity sha512-JGAqB+wzgSQAyN+mxpfOEDS/aW88wwDU2R5Xbe0hIT4ObfSjzAqdeWFG5IEWgwNxCARTyCO0S5FqIShR7aZqSg== + version "2.151.1" + resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.151.1.tgz#0147543e8b6f3cf647f06159c7c3e43cdaab1597" + integrity sha512-iGvr1sTuTTedNnNivJRKW6r889KSLJRrJBXciWDIAEWn7FS3Zcn6Z8yl/gx9L25kZ/6gKlH6YRipZ7chyysFmw== dependencies: jsonschema "^1.4.1" semver "^7.6.2" -"@aws-cdk/cx-api@^2.151.0": - version "2.151.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.151.0.tgz#f2e518840f8ba04f710f2a6933844510bff8a31c" - integrity sha512-O2DFC5LA9jqCV9ZmXquL51sU+To5eMRfg7aHQwVAhyADFhGNsi2WLe4+ISwJokYSNQzkgU9VYQcAUZvA/gUZnw== +"@aws-cdk/cx-api@^2.151.1": + version "2.151.1" + resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.151.1.tgz#77e7eccf784d6c369241859dcef69e593bf16fe0" + integrity sha512-pkDgjncFjtw/Y2kaW5Y5msU/TcUPyohx+FDNGw/lHrW74t7NKf+ydxRPAxN/FbAweX2aWlpEqpHU5iatZflBUg== dependencies: semver "^7.6.2" @@ -819,11 +819,11 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "22.2.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.2.0.tgz#7cf046a99f0ba4d628ad3088cb21f790df9b0c5b" - integrity sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ== + version "22.3.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.3.0.tgz#7f8da0e2b72c27c4f9bd3cb5ef805209d04d4f9e" + integrity sha512-nrWpWVaDZuaVc5X84xJ0vNrLvomM205oQyLsRt7OHNZbSHslcWsvgFR7O7hire2ZonjLrWBbedmotmIlJDVd6g== dependencies: - undici-types "~6.13.0" + undici-types "~6.18.2" "@types/node@^18": version "18.19.44" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1674.0: - version "2.1674.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1674.0.tgz#0c5abb9a1a3bbf2969108dbfc0738c843098bcf3" - integrity sha512-VTijN8+pKrf4sfM2t+ISXjypJ+k3AiP6OMzyLoWJ7jfMBtBfWbQc1rN07OndNb0CZRBBukOHoBhYDPuyae+/1Q== +aws-sdk@^2.1675.0: + version "2.1675.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1675.0.tgz#8cde066706a99b3645fa0671e30cbb2bfcefa196" + integrity sha512-gkqNAP0m3gDpnZCKL2OLdwAG+SjYT9MURGfTkixAWHIPDYD4OQf3sCcZNBTTTeOvOXus/tJIpgafKHD9DCIOCQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -1921,9 +1921,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.6" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.6.tgz#c81d9938b5a877314ad370feb73b4e5409b36abd" - integrity sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw== + version "1.5.7" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.7.tgz#425d2a7f76ecfa564fdca1040d11fb1979851f3c" + integrity sha512-6FTNWIWMxMy/ZY6799nBlPtF1DFDQ6VQJ7yyDP27SJNt5lwtQ5ufqVvHylb3fdQefvRcgA3fKcFMJi9OLwBRNw== emittery@^0.13.1: version "0.13.1" @@ -4942,10 +4942,10 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -undici-types@~6.13.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5" - integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg== +undici-types@~6.18.2: + version "6.18.2" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.18.2.tgz#8b678cf939d4fc9ec56be3c68ed69c619dee28b0" + integrity sha512-5ruQbENj95yDYJNS3TvcaxPMshV7aizdv/hWYjGIKoANWKjhWNBsr2YEuYZKodQulB1b8l7ILOuDQep3afowQQ== universalify@^2.0.0: version "2.0.1" From bffb501b7076ea4998bbe92e063a9fe48de573bd Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Fri, 16 Aug 2024 03:21:38 +0300 Subject: [PATCH 11/31] chore(deps): upgrade dependencies (#23) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10412445470 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 6 +++--- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 0413f45..f283bb4 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,10 @@ "typescript": "^5.5.4" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "^2.151.0", - "@aws-cdk/cx-api": "^2.151.1", + "@aws-cdk/cloud-assembly-schema": "^2.151.1", + "@aws-cdk/cx-api": "^2.152.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1675.0", + "aws-sdk": "^2.1676.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 9861d89..c87387d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,18 +10,18 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@aws-cdk/cloud-assembly-schema@^2.151.0": - version "2.151.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.151.1.tgz#0147543e8b6f3cf647f06159c7c3e43cdaab1597" - integrity sha512-iGvr1sTuTTedNnNivJRKW6r889KSLJRrJBXciWDIAEWn7FS3Zcn6Z8yl/gx9L25kZ/6gKlH6YRipZ7chyysFmw== +"@aws-cdk/cloud-assembly-schema@^2.151.1": + version "2.152.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.152.0.tgz#c3d6c7b0ed2020371f064788e983456b99479d81" + integrity sha512-G+MmjKDCcQJkwc/4V+QzYH3K+tK3NeZu7SzSbPOHtMDmcf2kcqqWwKORyUVP5Jhb5vvIwfeXOV2xXboOxVToRg== dependencies: jsonschema "^1.4.1" semver "^7.6.2" -"@aws-cdk/cx-api@^2.151.1": - version "2.151.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.151.1.tgz#77e7eccf784d6c369241859dcef69e593bf16fe0" - integrity sha512-pkDgjncFjtw/Y2kaW5Y5msU/TcUPyohx+FDNGw/lHrW74t7NKf+ydxRPAxN/FbAweX2aWlpEqpHU5iatZflBUg== +"@aws-cdk/cx-api@^2.152.0": + version "2.152.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.152.0.tgz#f30044fd286c204e61f07f419946d140b35c454b" + integrity sha512-csGzSD5Fa7Sh9F7EYSLvWeNmFTfatE78pFFlxxGEGKGsiz+Wb4yY94QlicUGo0N2iFJSW8u9sS5IeenQ+HPKQg== dependencies: semver "^7.6.2" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1675.0: - version "2.1675.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1675.0.tgz#8cde066706a99b3645fa0671e30cbb2bfcefa196" - integrity sha512-gkqNAP0m3gDpnZCKL2OLdwAG+SjYT9MURGfTkixAWHIPDYD4OQf3sCcZNBTTTeOvOXus/tJIpgafKHD9DCIOCQ== +aws-sdk@^2.1676.0: + version "2.1676.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1676.0.tgz#90f792112cd7ca85cce068ea08c04e933576f959" + integrity sha512-Kzg9931GroRG6uLoUEF5Pcp005D1xilgQ8ntH0fKFxiYKGkQqkU/3JkV6k7jNRzouxTypaozzXYVNXsHRgH6JA== dependencies: buffer "4.9.2" events "1.1.1" @@ -1921,9 +1921,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.7" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.7.tgz#425d2a7f76ecfa564fdca1040d11fb1979851f3c" - integrity sha512-6FTNWIWMxMy/ZY6799nBlPtF1DFDQ6VQJ7yyDP27SJNt5lwtQ5ufqVvHylb3fdQefvRcgA3fKcFMJi9OLwBRNw== + version "1.5.8" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.8.tgz#0a3225b305212f347be48f159a3c0a117d5e9801" + integrity sha512-4Nx0gP2tPNBLTrFxBMHpkQbtn2hidPVr/+/FTtcCiBYTucqc70zRyVZiOLj17Ui3wTO7SQ1/N+hkHYzJjBzt6A== emittery@^0.13.1: version "0.13.1" From 44047f8bd99604fd43221457c17b31338a3b1ac3 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Sat, 17 Aug 2024 03:20:48 +0300 Subject: [PATCH 12/31] chore(deps): upgrade dependencies (#25) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10427873300 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 4 ++-- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index f283bb4..bff1d9b 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,10 @@ "typescript": "^5.5.4" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "^2.151.1", + "@aws-cdk/cloud-assembly-schema": "^2.152.0", "@aws-cdk/cx-api": "^2.152.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1676.0", + "aws-sdk": "^2.1677.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index c87387d..6831d07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,7 +10,7 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@aws-cdk/cloud-assembly-schema@^2.151.1": +"@aws-cdk/cloud-assembly-schema@^2.152.0": version "2.152.0" resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.152.0.tgz#c3d6c7b0ed2020371f064788e983456b99479d81" integrity sha512-G+MmjKDCcQJkwc/4V+QzYH3K+tK3NeZu7SzSbPOHtMDmcf2kcqqWwKORyUVP5Jhb5vvIwfeXOV2xXboOxVToRg== @@ -819,11 +819,11 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "22.3.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.3.0.tgz#7f8da0e2b72c27c4f9bd3cb5ef805209d04d4f9e" - integrity sha512-nrWpWVaDZuaVc5X84xJ0vNrLvomM205oQyLsRt7OHNZbSHslcWsvgFR7O7hire2ZonjLrWBbedmotmIlJDVd6g== + version "22.4.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.4.0.tgz#c295fe1d6f5f58916cc61dbef8cf65b5b9b71de9" + integrity sha512-49AbMDwYUz7EXxKU/r7mXOsxwFr4BYbvB7tWYxVuLdb2ibd30ijjXINSMAHiEEZk5PCRBmW1gUeisn2VMKt3cQ== dependencies: - undici-types "~6.18.2" + undici-types "~6.19.2" "@types/node@^18": version "18.19.44" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1676.0: - version "2.1676.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1676.0.tgz#90f792112cd7ca85cce068ea08c04e933576f959" - integrity sha512-Kzg9931GroRG6uLoUEF5Pcp005D1xilgQ8ntH0fKFxiYKGkQqkU/3JkV6k7jNRzouxTypaozzXYVNXsHRgH6JA== +aws-sdk@^2.1677.0: + version "2.1677.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1677.0.tgz#22953f892067956bddcd0f9f0f7bff9fd735d01c" + integrity sha512-hIwHr+sfKwS40+AA6yNGR4I0xYGK6tZ9wrg1YmhQRQ5q12KmdXgau6rFNa2VizUxdMlwumgixncvNk4m8Ffx8g== dependencies: buffer "4.9.2" events "1.1.1" @@ -1921,9 +1921,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.8" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.8.tgz#0a3225b305212f347be48f159a3c0a117d5e9801" - integrity sha512-4Nx0gP2tPNBLTrFxBMHpkQbtn2hidPVr/+/FTtcCiBYTucqc70zRyVZiOLj17Ui3wTO7SQ1/N+hkHYzJjBzt6A== + version "1.5.10" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.10.tgz#2791f966880389f96078d5e784b0d500f71abd14" + integrity sha512-C3RDERDjrNW262GCRvpoer3a0Ksd66CtgDLxMHhzShQ8fhL4kwnpVXsJPAKg9xJjIROXUbLBrvtOzVAjALMIWA== emittery@^0.13.1: version "0.13.1" @@ -4942,10 +4942,10 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -undici-types@~6.18.2: - version "6.18.2" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.18.2.tgz#8b678cf939d4fc9ec56be3c68ed69c619dee28b0" - integrity sha512-5ruQbENj95yDYJNS3TvcaxPMshV7aizdv/hWYjGIKoANWKjhWNBsr2YEuYZKodQulB1b8l7ILOuDQep3afowQQ== +undici-types@~6.19.2: + version "6.19.6" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.6.tgz#e218c3df0987f4c0e0008ca00d6b6472d9b89b36" + integrity sha512-e/vggGopEfTKSvj4ihnOLTsqhrKRN3LeO6qSN/GxohhuRv8qH9bNQ4B8W7e/vFL+0XTnmHPB4/kegunZGA4Org== universalify@^2.0.0: version "2.0.1" From bc6b26c3dd09677b72085cc9e2382d50e2b7835a Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Sun, 18 Aug 2024 03:23:20 +0300 Subject: [PATCH 13/31] chore(deps): upgrade dependencies (#27) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10436277052 ------ *Automatically created by projen via the "upgrade-main" workflow* --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6831d07..3b8aac4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1921,9 +1921,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.10" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.10.tgz#2791f966880389f96078d5e784b0d500f71abd14" - integrity sha512-C3RDERDjrNW262GCRvpoer3a0Ksd66CtgDLxMHhzShQ8fhL4kwnpVXsJPAKg9xJjIROXUbLBrvtOzVAjALMIWA== + version "1.5.11" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.11.tgz#258077f1077a1c72f2925cd5b326c470a7f5adef" + integrity sha512-R1CccCDYqndR25CaXFd6hp/u9RaaMcftMkphmvuepXr5b1vfLkRml6aWVeBhXJ7rbevHkKEMJtz8XqPf7ffmew== emittery@^0.13.1: version "0.13.1" From 7e83fd84c8bde422f117bc96492dc5bb3f8d3eae Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Tue, 20 Aug 2024 03:21:17 +0300 Subject: [PATCH 14/31] chore(deps): upgrade dependencies (#30) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10462960595 ------ *Automatically created by projen via the "upgrade-main" workflow* --- .projen/tasks.json | 2 +- package.json | 4 ++-- yarn.lock | 40 ++++++++++++++++++++-------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.projen/tasks.json b/.projen/tasks.json index b1ae082..adf8d23 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -39,7 +39,7 @@ "builtin": "release/bump-version" } ], - "condition": "! git log --oneline -1 | grep -q \"chore(release):\"" + "condition": "git log --oneline -1 | grep -qv \"chore(release):\"" }, "clobber": { "name": "clobber", diff --git a/package.json b/package.json index bff1d9b..0a118ac 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jszip": "^3.10.1", "mock-fs": "^4.14.0", "prettier": "^3.3.3", - "projen": "^0.85.0", + "projen": "^0.85.2", "standard-version": "^9", "ts-jest": "^29.2.4", "ts-node": "^10.9.2", @@ -62,7 +62,7 @@ "@aws-cdk/cloud-assembly-schema": "^2.152.0", "@aws-cdk/cx-api": "^2.152.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1677.0", + "aws-sdk": "^2.1678.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 3b8aac4..780de54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -819,16 +819,16 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "22.4.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.4.0.tgz#c295fe1d6f5f58916cc61dbef8cf65b5b9b71de9" - integrity sha512-49AbMDwYUz7EXxKU/r7mXOsxwFr4BYbvB7tWYxVuLdb2ibd30ijjXINSMAHiEEZk5PCRBmW1gUeisn2VMKt3cQ== + version "22.4.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.4.1.tgz#9b595d292c65b94c20923159e2ce947731b6fdce" + integrity sha512-1tbpb9325+gPnKK0dMm+/LMriX0vKxf6RnB0SZUqfyVkQ4fMgUSySqhxE/y8Jvs4NyF1yHzTfG9KlnkIODxPKg== dependencies: undici-types "~6.19.2" "@types/node@^18": - version "18.19.44" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.44.tgz#875a8322d17ff12bf82b3af8c07b9310a00e72f8" - integrity sha512-ZsbGerYg72WMXUIE9fYxtvfzLEuq6q8mKERdWFnqTmOvudMxnz+CBNRoOwJ2kNpFOncrKjT1hZwxjlFgQ9qvQA== + version "18.19.45" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.45.tgz#a9ebfe4c316a356be7ca11f753ecb2feda6d6bdf" + integrity sha512-VZxPKNNhjKmaC1SUYowuXSRSMGyQGmQjvvA1xE4QZ0xce2kLtEhPDS+kqpCPBZYgqblCLQ2DAjSzmgCM5auvhA== dependencies: undici-types "~5.26.4" @@ -1182,9 +1182,9 @@ arrify@^1.0.1: integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== async@^3.2.3, async@^3.2.4: - version "3.2.5" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" - integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + version "3.2.6" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== at-least-node@^1.0.0: version "1.0.0" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1677.0: - version "2.1677.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1677.0.tgz#22953f892067956bddcd0f9f0f7bff9fd735d01c" - integrity sha512-hIwHr+sfKwS40+AA6yNGR4I0xYGK6tZ9wrg1YmhQRQ5q12KmdXgau6rFNa2VizUxdMlwumgixncvNk4m8Ffx8g== +aws-sdk@^2.1678.0: + version "2.1678.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1678.0.tgz#fa313cfc1e0fc8a69a00c4803eca7c6b08527685" + integrity sha512-7+MNi7hholVrQYBu8bVbfzOBHxKlC63BfuxUwwMaUrFN1hok4pdB0QsEvL6YHwZtF+3Bq5zhONImnT2Q7W15yg== dependencies: buffer "4.9.2" events "1.1.1" @@ -4125,10 +4125,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@^0.85.0: - version "0.85.0" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.85.0.tgz#ce182db7e37a7784172a49d037693ce2a272d561" - integrity sha512-5W4+h/f5eDENFVeOdAGnuZQD88BSCNy7gxYUge9L87qlbvOR3cKF9fzEguFryGcBJKN6AtCjACsdMwHyNE4xPQ== +projen@^0.85.2: + version "0.85.2" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.85.2.tgz#5e5ac64d4c37b089d3d17adc22e0ec418e2e0a31" + integrity sha512-YTEC/MjrnPR+regYBl3CR41+eL7s43DjBKfxZxndTY59m1WjXpTJVzv846nU59dKHqmXf4MyITHC67gs4hgWdg== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" @@ -4943,9 +4943,9 @@ undici-types@~5.26.4: integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== undici-types@~6.19.2: - version "6.19.6" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.6.tgz#e218c3df0987f4c0e0008ca00d6b6472d9b89b36" - integrity sha512-e/vggGopEfTKSvj4ihnOLTsqhrKRN3LeO6qSN/GxohhuRv8qH9bNQ4B8W7e/vFL+0XTnmHPB4/kegunZGA4Org== + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== universalify@^2.0.0: version "2.0.1" From 27c20711c5acf67f13dbf3ea9c8b1c70948ed9bf Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Wed, 21 Aug 2024 03:21:38 +0300 Subject: [PATCH 15/31] chore(deps): upgrade dependencies (#32) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10481180148 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 4 ++-- yarn.lock | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 0a118ac..0d6d822 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,9 @@ }, "dependencies": { "@aws-cdk/cloud-assembly-schema": "^2.152.0", - "@aws-cdk/cx-api": "^2.152.0", + "@aws-cdk/cx-api": "^2.153.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1678.0", + "aws-sdk": "^2.1679.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 780de54..d92cacb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,17 +11,17 @@ "@jridgewell/trace-mapping" "^0.3.24" "@aws-cdk/cloud-assembly-schema@^2.152.0": - version "2.152.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.152.0.tgz#c3d6c7b0ed2020371f064788e983456b99479d81" - integrity sha512-G+MmjKDCcQJkwc/4V+QzYH3K+tK3NeZu7SzSbPOHtMDmcf2kcqqWwKORyUVP5Jhb5vvIwfeXOV2xXboOxVToRg== + version "2.153.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.153.0.tgz#43d86b52f4fd9aa5ad384d30e7001e116917dab2" + integrity sha512-m304DL4pIfY7N3qWcXzkpKEUL/kqpOdmPgGvWrx5JDW5/oxT5xByzBiWyNTU3u+IlEcaPXndKI02dUMbVJ3bSA== dependencies: jsonschema "^1.4.1" semver "^7.6.2" -"@aws-cdk/cx-api@^2.152.0": - version "2.152.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.152.0.tgz#f30044fd286c204e61f07f419946d140b35c454b" - integrity sha512-csGzSD5Fa7Sh9F7EYSLvWeNmFTfatE78pFFlxxGEGKGsiz+Wb4yY94QlicUGo0N2iFJSW8u9sS5IeenQ+HPKQg== +"@aws-cdk/cx-api@^2.153.0": + version "2.153.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.153.0.tgz#3115624a66a0eb4b5409b696916859d851ba856e" + integrity sha512-64NWRwjgAHuMQ9FyBmuNDMUUa26vNlhmgXZwccw7iH/8VhfksY8KWlcpWp2hUSSpByoSIBjpF6zngr0/uJmwsw== dependencies: semver "^7.6.2" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1678.0: - version "2.1678.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1678.0.tgz#fa313cfc1e0fc8a69a00c4803eca7c6b08527685" - integrity sha512-7+MNi7hholVrQYBu8bVbfzOBHxKlC63BfuxUwwMaUrFN1hok4pdB0QsEvL6YHwZtF+3Bq5zhONImnT2Q7W15yg== +aws-sdk@^2.1679.0: + version "2.1679.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1679.0.tgz#f6a9462902e381ffaf95a4d9be0c6d1cd90dd31e" + integrity sha512-76zSe/U7+5hzyGD7KAs71of1r6tRhrq+tXsOYbCDKPVqqtjxQiy88n0AC0Tcjx29nQSegydyjHxg27YJlcCXOg== dependencies: buffer "4.9.2" events "1.1.1" @@ -1921,9 +1921,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.11" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.11.tgz#258077f1077a1c72f2925cd5b326c470a7f5adef" - integrity sha512-R1CccCDYqndR25CaXFd6hp/u9RaaMcftMkphmvuepXr5b1vfLkRml6aWVeBhXJ7rbevHkKEMJtz8XqPf7ffmew== + version "1.5.12" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.12.tgz#ee31756eaa2e06f2aa606f170b7ad06dd402b4e4" + integrity sha512-tIhPkdlEoCL1Y+PToq3zRNehUaKp3wBX/sr7aclAWdIWjvqAe/Im/H0SiCM4c1Q8BLPHCdoJTol+ZblflydehA== emittery@^0.13.1: version "0.13.1" @@ -4518,9 +4518,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.18" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326" - integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ== + version "3.0.20" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz#e44ed19ed318dd1e5888f93325cee800f0f51b89" + integrity sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw== split2@^3.0.0: version "3.2.2" From ecd13a11087ac57a1a13ab3134cc94f6ef74c88a Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Thu, 22 Aug 2024 03:21:27 +0300 Subject: [PATCH 16/31] chore(deps): upgrade dependencies (#34) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10499497071 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 4 ++-- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 0d6d822..3144486 100644 --- a/package.json +++ b/package.json @@ -59,10 +59,10 @@ "typescript": "^5.5.4" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "^2.152.0", + "@aws-cdk/cloud-assembly-schema": "^2.153.0", "@aws-cdk/cx-api": "^2.153.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1679.0", + "aws-sdk": "^2.1680.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index d92cacb..0d5aceb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,7 +10,7 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@aws-cdk/cloud-assembly-schema@^2.152.0": +"@aws-cdk/cloud-assembly-schema@^2.153.0": version "2.153.0" resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-2.153.0.tgz#43d86b52f4fd9aa5ad384d30e7001e116917dab2" integrity sha512-m304DL4pIfY7N3qWcXzkpKEUL/kqpOdmPgGvWrx5JDW5/oxT5xByzBiWyNTU3u+IlEcaPXndKI02dUMbVJ3bSA== @@ -819,9 +819,9 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/node@*": - version "22.4.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.4.1.tgz#9b595d292c65b94c20923159e2ce947731b6fdce" - integrity sha512-1tbpb9325+gPnKK0dMm+/LMriX0vKxf6RnB0SZUqfyVkQ4fMgUSySqhxE/y8Jvs4NyF1yHzTfG9KlnkIODxPKg== + version "22.5.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.0.tgz#10f01fe9465166b4cab72e75f60d8b99d019f958" + integrity sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg== dependencies: undici-types "~6.19.2" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1679.0: - version "2.1679.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1679.0.tgz#f6a9462902e381ffaf95a4d9be0c6d1cd90dd31e" - integrity sha512-76zSe/U7+5hzyGD7KAs71of1r6tRhrq+tXsOYbCDKPVqqtjxQiy88n0AC0Tcjx29nQSegydyjHxg27YJlcCXOg== +aws-sdk@^2.1680.0: + version "2.1680.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1680.0.tgz#02f4007deb7b3729be72699098d185b51330a072" + integrity sha512-XHNyhvVB49DC7Ea7+Gsvy4B+xP7tyry6Gw3b9g/DcilA1xmxxRzu8VE9GJ2rP4jYMc/TkX9FHkp5WLo57sITZA== dependencies: buffer "4.9.2" events "1.1.1" @@ -1921,9 +1921,9 @@ ejs@^3.1.10: jake "^10.8.5" electron-to-chromium@^1.5.4: - version "1.5.12" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.12.tgz#ee31756eaa2e06f2aa606f170b7ad06dd402b4e4" - integrity sha512-tIhPkdlEoCL1Y+PToq3zRNehUaKp3wBX/sr7aclAWdIWjvqAe/Im/H0SiCM4c1Q8BLPHCdoJTol+ZblflydehA== + version "1.5.13" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6" + integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q== emittery@^0.13.1: version "0.13.1" @@ -2835,9 +2835,9 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" - integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== + version "2.15.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: hasown "^2.0.2" From e32e76357ec05cdd24fba4c259e140de70ecad82 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Fri, 23 Aug 2024 03:21:31 +0300 Subject: [PATCH 17/31] chore(deps): upgrade dependencies (#36) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10517607562 ------ *Automatically created by projen via the "upgrade-main" workflow* --- .gitattributes | 1 + package.json | 6 ++-- yarn.lock | 80 +++++++++++++++++++++++++------------------------- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.gitattributes b/.gitattributes index 66b916d..617909a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,6 @@ # ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". +* text=auto eol=lf *.snap linguist-generated /.eslintrc.json linguist-generated /.gitattributes linguist-generated diff --git a/package.json b/package.json index 3144486..c1e744c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jszip": "^3.10.1", "mock-fs": "^4.14.0", "prettier": "^3.3.3", - "projen": "^0.85.2", + "projen": "^0.86.0", "standard-version": "^9", "ts-jest": "^29.2.4", "ts-node": "^10.9.2", @@ -60,9 +60,9 @@ }, "dependencies": { "@aws-cdk/cloud-assembly-schema": "^2.153.0", - "@aws-cdk/cx-api": "^2.153.0", + "@aws-cdk/cx-api": "^2.154.0", "archiver": "^5.3.2", - "aws-sdk": "^2.1680.0", + "aws-sdk": "^2.1681.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index 0d5aceb..e339c21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,10 +18,10 @@ jsonschema "^1.4.1" semver "^7.6.2" -"@aws-cdk/cx-api@^2.153.0": - version "2.153.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.153.0.tgz#3115624a66a0eb4b5409b696916859d851ba856e" - integrity sha512-64NWRwjgAHuMQ9FyBmuNDMUUa26vNlhmgXZwccw7iH/8VhfksY8KWlcpWp2hUSSpByoSIBjpF6zngr0/uJmwsw== +"@aws-cdk/cx-api@^2.154.0": + version "2.154.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.154.0.tgz#f2de6e0c4bb66dbbd331f1d713f91ddf08160b7a" + integrity sha512-v/Ey/R3qmCpVNsVIU+Ivmyyn2sThZuBztPWgYKo6w4SYa0z6yzuf7cDn6VtTadVrNBcVCG4BG6S7zrvVRKNZ7w== dependencies: semver "^7.6.2" @@ -34,9 +34,9 @@ picocolors "^1.0.0" "@babel/compat-data@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5" - integrity sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ== + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" + integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ== "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9": version "7.25.2" @@ -59,12 +59,12 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.25.0", "@babel/generator@^7.7.2": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e" - integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw== +"@babel/generator@^7.25.0", "@babel/generator@^7.25.4", "@babel/generator@^7.7.2": + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.4.tgz#1dc63c1c9caae9e6dc24e264eac254eb25005669" + integrity sha512-NFtZmZsyzDPJnk9Zg3BbTfKKc9UlHYzD0E//p2Z3B9nCwwtJW9T0gVbCz8+fBngnn4zf1Dr3IK8PHQQHq0lDQw== dependencies: - "@babel/types" "^7.25.0" + "@babel/types" "^7.25.4" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" @@ -98,7 +98,7 @@ "@babel/helper-validator-identifier" "^7.24.7" "@babel/traverse" "^7.25.2" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.8.0": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.7", "@babel/helper-plugin-utils@^7.24.8", "@babel/helper-plugin-utils@^7.8.0": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== @@ -144,12 +144,12 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065" - integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.25.0", "@babel/parser@^7.25.4": + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.4.tgz#af4f2df7d02440286b7de57b1c21acfb2a6f257a" + integrity sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA== dependencies: - "@babel/types" "^7.25.2" + "@babel/types" "^7.25.4" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -264,11 +264,11 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.24.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz#58d458271b4d3b6bb27ee6ac9525acbb259bad1c" - integrity sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA== + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz#04db9ce5a9043d9c635e75ae7969a2cd50ca97ff" + integrity sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg== dependencies: - "@babel/helper-plugin-utils" "^7.24.7" + "@babel/helper-plugin-utils" "^7.24.8" "@babel/template@^7.25.0", "@babel/template@^7.3.3": version "7.25.0" @@ -280,22 +280,22 @@ "@babel/types" "^7.25.0" "@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490" - integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ== + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.4.tgz#648678046990f2957407e3086e97044f13c3e18e" + integrity sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg== dependencies: "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/parser" "^7.25.3" + "@babel/generator" "^7.25.4" + "@babel/parser" "^7.25.4" "@babel/template" "^7.25.0" - "@babel/types" "^7.25.2" + "@babel/types" "^7.25.4" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.3.3": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125" - integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.4", "@babel/types@^7.3.3": + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.4.tgz#6bcb46c72fdf1012a209d016c07f769e10adcb5f" + integrity sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ== dependencies: "@babel/helper-string-parser" "^7.24.8" "@babel/helper-validator-identifier" "^7.24.7" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1680.0: - version "2.1680.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1680.0.tgz#02f4007deb7b3729be72699098d185b51330a072" - integrity sha512-XHNyhvVB49DC7Ea7+Gsvy4B+xP7tyry6Gw3b9g/DcilA1xmxxRzu8VE9GJ2rP4jYMc/TkX9FHkp5WLo57sITZA== +aws-sdk@^2.1681.0: + version "2.1681.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1681.0.tgz#2b4252bef42ad6c3036a58d0f1405b76edef7413" + integrity sha512-oeCr0muJraT+g7ceTMlJcidVayPMfT69EEvDIWMbeBIHqbLOJVtpsF577VZJNEh2Zkj+8DivR69kWdu+Y9JSyQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -4125,10 +4125,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@^0.85.2: - version "0.85.2" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.85.2.tgz#5e5ac64d4c37b089d3d17adc22e0ec418e2e0a31" - integrity sha512-YTEC/MjrnPR+regYBl3CR41+eL7s43DjBKfxZxndTY59m1WjXpTJVzv846nU59dKHqmXf4MyITHC67gs4hgWdg== +projen@^0.86.0: + version "0.86.0" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.86.0.tgz#7141b03ac6837dc7f902ffe08558424f74fefe1c" + integrity sha512-7iqeGd2FdTInE/PVuWFZzjOqsQL8dLDdn54H3mK5CIYQqu9EAjrdMqDOHFZjDrNUz2bbau74jWCQW4tasAznOQ== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" From 3051c9cfa273eb33da0646d46f3042a92b94ab71 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Sat, 24 Aug 2024 03:20:50 +0300 Subject: [PATCH 18/31] chore(deps): upgrade dependencies (#39) Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdklabs/cdk-assets/actions/runs/10534036294 ------ *Automatically created by projen via the "upgrade-main" workflow* --- package.json | 6 ++--- yarn.lock | 62 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index c1e744c..86a98b1 100644 --- a/package.json +++ b/package.json @@ -54,15 +54,15 @@ "prettier": "^3.3.3", "projen": "^0.86.0", "standard-version": "^9", - "ts-jest": "^29.2.4", + "ts-jest": "^29.2.5", "ts-node": "^10.9.2", "typescript": "^5.5.4" }, "dependencies": { "@aws-cdk/cloud-assembly-schema": "^2.153.0", - "@aws-cdk/cx-api": "^2.154.0", + "@aws-cdk/cx-api": "^2.154.1", "archiver": "^5.3.2", - "aws-sdk": "^2.1681.0", + "aws-sdk": "^2.1682.0", "glob": "^7.2.3", "mime": "^2.6.0", "yargs": "^16.2.0" diff --git a/yarn.lock b/yarn.lock index e339c21..12eb8bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18,10 +18,10 @@ jsonschema "^1.4.1" semver "^7.6.2" -"@aws-cdk/cx-api@^2.154.0": - version "2.154.0" - resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.154.0.tgz#f2de6e0c4bb66dbbd331f1d713f91ddf08160b7a" - integrity sha512-v/Ey/R3qmCpVNsVIU+Ivmyyn2sThZuBztPWgYKo6w4SYa0z6yzuf7cDn6VtTadVrNBcVCG4BG6S7zrvVRKNZ7w== +"@aws-cdk/cx-api@^2.154.1": + version "2.154.1" + resolved "https://registry.yarnpkg.com/@aws-cdk/cx-api/-/cx-api-2.154.1.tgz#3607765de711cb40c61334c5c432b3a1bfb7301e" + integrity sha512-3yQdbsqEW3CraC+YeERFG2kGiRmy/R+u6TXY4aK4A/LJKfkX1ZPxImI343ixj9J2DUQwIwTUqvYnJQqA5O1sCQ== dependencies: semver "^7.6.2" @@ -60,9 +60,9 @@ semver "^6.3.1" "@babel/generator@^7.25.0", "@babel/generator@^7.25.4", "@babel/generator@^7.7.2": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.4.tgz#1dc63c1c9caae9e6dc24e264eac254eb25005669" - integrity sha512-NFtZmZsyzDPJnk9Zg3BbTfKKc9UlHYzD0E//p2Z3B9nCwwtJW9T0gVbCz8+fBngnn4zf1Dr3IK8PHQQHq0lDQw== + version "7.25.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.5.tgz#b31cf05b3fe8c32d206b6dad03bb0aacbde73450" + integrity sha512-abd43wyLfbWoxC6ahM8xTkqLpGB2iWBVyuKC9/srhFunCd1SDNrV1s72bBpK4hLj8KLzHBBcOblvLQZBNw9r3w== dependencies: "@babel/types" "^7.25.4" "@jridgewell/gen-mapping" "^0.3.5" @@ -1198,10 +1198,10 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -aws-sdk@^2.1681.0: - version "2.1681.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1681.0.tgz#2b4252bef42ad6c3036a58d0f1405b76edef7413" - integrity sha512-oeCr0muJraT+g7ceTMlJcidVayPMfT69EEvDIWMbeBIHqbLOJVtpsF577VZJNEh2Zkj+8DivR69kWdu+Y9JSyQ== +aws-sdk@^2.1682.0: + version "2.1682.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1682.0.tgz#26cad9496d53af440b3d8dd1c95965e1af3ed530" + integrity sha512-Kh4nXRKvidlNXwKA8V4aoMW2F4UeCj9J4sumQxUQE6EpHlSsdCGZTPoGcMcKp/kAlS+iuJtuQIOP2aXZWdGczQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -1328,7 +1328,7 @@ browserslist@^4.23.1: node-releases "^2.0.18" update-browserslist-db "^1.1.0" -bs-logger@0.x: +bs-logger@^0.2.6: version "0.2.6" resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog== @@ -3632,7 +3632,7 @@ lodash.isplainobject@^4.0.6: resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== -lodash.memoize@4.x: +lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== @@ -3673,7 +3673,7 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" -make-error@1.x, make-error@^1.1.1: +make-error@^1.1.1, make-error@^1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -3723,9 +3723,9 @@ merge2@^1.3.0, merge2@^1.4.1: integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== micromatch@^4.0.4: - version "4.0.7" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" - integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== + version "4.0.8" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" + integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== dependencies: braces "^3.0.3" picomatch "^2.3.1" @@ -4782,20 +4782,20 @@ ts-api-utils@^1.3.0: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== -ts-jest@^29.2.4: - version "29.2.4" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.4.tgz#38ccf487407d7a63054a72689f6f99b075e296e5" - integrity sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw== +ts-jest@^29.2.5: + version "29.2.5" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.5.tgz#591a3c108e1f5ebd013d3152142cb5472b399d63" + integrity sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA== dependencies: - bs-logger "0.x" + bs-logger "^0.2.6" ejs "^3.1.10" - fast-json-stable-stringify "2.x" + fast-json-stable-stringify "^2.1.0" jest-util "^29.0.0" json5 "^2.2.3" - lodash.memoize "4.x" - make-error "1.x" - semver "^7.5.3" - yargs-parser "^21.0.1" + lodash.memoize "^4.1.2" + make-error "^1.3.6" + semver "^7.6.3" + yargs-parser "^21.1.1" ts-node@^10.9.2: version "10.9.2" @@ -4827,9 +4827,9 @@ tsconfig-paths@^3.15.0: strip-bom "^3.0.0" tslib@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" - integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== + version "2.7.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" + integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -5149,7 +5149,7 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^21.0.1, yargs-parser@^21.1.1: +yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== From 2260990e9754eb85d995a76e9c0b3a5b9732fd76 Mon Sep 17 00:00:00 2001 From: Sumu Date: Sat, 24 Aug 2024 17:40:34 -0400 Subject: [PATCH 19/31] feat: add session tags to ClientOptions interface Signed-off-by: Sumu --- lib/aws.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/aws.ts b/lib/aws.ts index 567d018..cd66123 100644 --- a/lib/aws.ts +++ b/lib/aws.ts @@ -18,6 +18,7 @@ export interface ClientOptions { region?: string; assumeRoleArn?: string; assumeRoleExternalId?: string; + assumeRoleSessionTags?: { [key: string]: string }; quiet?: boolean; } From 02892e2323747f9444d666b6100d74c685b0815c Mon Sep 17 00:00:00 2001 From: Sumu Date: Sat, 24 Aug 2024 17:49:54 -0400 Subject: [PATCH 20/31] add session tags to assumeRole function Signed-off-by: Sumu --- lib/aws.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/aws.ts b/lib/aws.ts index cd66123..ff48951 100644 --- a/lib/aws.ts +++ b/lib/aws.ts @@ -119,7 +119,8 @@ export class DefaultAwsClient implements IAws { credentials = await this.assumeRole( options.region, options.assumeRoleArn, - options.assumeRoleExternalId + options.assumeRoleExternalId, + options.assumeRoleSessionTags ); } @@ -141,13 +142,23 @@ export class DefaultAwsClient implements IAws { private async assumeRole( region: string | undefined, roleArn: string, - externalId?: string + externalId?: string, + sessionTags?: { [key: string]: string } ): Promise { + const parsedTags = sessionTags + ? Object.entries(sessionTags).map(([key, value]) => ({ + Key: key, + Value: value, + })) + : []; + return new this.AWS.ChainableTemporaryCredentials({ params: { RoleArn: roleArn, ExternalId: externalId, RoleSessionName: `cdk-assets-${safeUsername()}`, + Tags: parsedTags, + TransitiveTagKeys: sessionTags ? Object.keys(sessionTags) : [], }, stsConfig: { region, From 276ef6312e799c656299057029e9a3f9bad1578b Mon Sep 17 00:00:00 2001 From: iliapolo Date: Thu, 29 Aug 2024 09:25:47 +0300 Subject: [PATCH 21/31] better typing --- lib/private/handlers/container-images.ts | 5 ++++- lib/private/handlers/files.ts | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/lib/private/handlers/container-images.ts b/lib/private/handlers/container-images.ts index e0089f1..7a78ff5 100644 --- a/lib/private/handlers/container-images.ts +++ b/lib/private/handlers/container-images.ts @@ -105,7 +105,10 @@ export class ContainerImageAssetHandler implements IAssetHandler { const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws); const ecr = await this.host.aws.ecrClient({ - ...destination, + assumeRoleArn: destination.assumeRoleArn, + assumeRoleExternalId: destination.assumeRoleExternalId, + assumeRoleSessionTags: {}, + region: destination.region, quiet: options.quiet, }); const account = async () => (await this.host.aws.discoverCurrentAccount())?.accountId; diff --git a/lib/private/handlers/files.ts b/lib/private/handlers/files.ts index d08d178..ca67b6e 100644 --- a/lib/private/handlers/files.ts +++ b/lib/private/handlers/files.ts @@ -35,7 +35,10 @@ export class FileAssetHandler implements IAssetHandler { const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`; try { const s3 = await this.host.aws.s3Client({ - ...destination, + assumeRoleArn: destination.assumeRoleArn, + assumeRoleExternalId: destination.assumeRoleExternalId, + assumeRoleSessionTags: {}, + region: destination.region, quiet: true, }); this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`); @@ -53,14 +56,27 @@ export class FileAssetHandler implements IAssetHandler { public async publish(): Promise { const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws); const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`; - const s3 = await this.host.aws.s3Client(destination); + const s3 = await this.host.aws.s3Client({ + assumeRoleArn: destination.assumeRoleArn, + assumeRoleExternalId: destination.assumeRoleExternalId, + assumeRoleSessionTags: {}, + region: destination.region, + }); this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`); const bucketInfo = BucketInformation.for(this.host); // A thunk for describing the current account. Used when we need to format an error // message, not in the success case. - const account = async () => (await this.host.aws.discoverTargetAccount(destination))?.accountId; + const account = async () => + ( + await this.host.aws.discoverTargetAccount({ + assumeRoleArn: destination.assumeRoleArn, + assumeRoleExternalId: destination.assumeRoleExternalId, + assumeRoleSessionTags: {}, + region: destination.region, + }) + )?.accountId; switch (await bucketInfo.bucketOwnership(s3, destination.bucketName)) { case BucketOwnership.MINE: break; From 9ba3fd103adacf55a7f692add460b58c21cea936 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Thu, 29 Aug 2024 09:28:38 +0300 Subject: [PATCH 22/31] bring back type for session tags --- lib/private/handlers/container-images.ts | 2 +- lib/private/handlers/files.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/private/handlers/container-images.ts b/lib/private/handlers/container-images.ts index 7a78ff5..2e6cce4 100644 --- a/lib/private/handlers/container-images.ts +++ b/lib/private/handlers/container-images.ts @@ -107,7 +107,7 @@ export class ContainerImageAssetHandler implements IAssetHandler { const ecr = await this.host.aws.ecrClient({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: {}, + assumeRoleSessionTags: destination.assumeRoleSessionTags, region: destination.region, quiet: options.quiet, }); diff --git a/lib/private/handlers/files.ts b/lib/private/handlers/files.ts index ca67b6e..db26f82 100644 --- a/lib/private/handlers/files.ts +++ b/lib/private/handlers/files.ts @@ -37,7 +37,7 @@ export class FileAssetHandler implements IAssetHandler { const s3 = await this.host.aws.s3Client({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: {}, + assumeRoleSessionTags: destination.assumeRoleSessionTags, region: destination.region, quiet: true, }); @@ -59,7 +59,7 @@ export class FileAssetHandler implements IAssetHandler { const s3 = await this.host.aws.s3Client({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: {}, + assumeRoleSessionTags: destination.assumeRoleSessionTags, region: destination.region, }); this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`); @@ -73,7 +73,7 @@ export class FileAssetHandler implements IAssetHandler { await this.host.aws.discoverTargetAccount({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: {}, + assumeRoleSessionTags: destination.assumeRoleSessionTags, region: destination.region, }) )?.accountId; From bb4f087a930ab9caee4c606a3369d6341e875d52 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Sat, 31 Aug 2024 17:00:08 +0300 Subject: [PATCH 23/31] mid work --- lib/aws.ts | 29 +++--- lib/private/handlers/container-images.ts | 5 +- lib/private/handlers/files.ts | 6 +- test/aws.test.ts | 117 +++++++++++++++++++++++ test/docker-images.test.ts | 8 ++ test/files.test.ts | 12 ++- 6 files changed, 158 insertions(+), 19 deletions(-) create mode 100644 test/aws.test.ts diff --git a/lib/aws.ts b/lib/aws.ts index ff48951..4e5a523 100644 --- a/lib/aws.ts +++ b/lib/aws.ts @@ -14,11 +14,17 @@ export interface IAws { secretsManagerClient(options: ClientOptions): Promise; } +// Partial because `RoleSessionName` is required in STS, but we have a default value for it. +export type AssumeRoleAdditionalOptions = Partial< + // cloud-assembly-schema validates that `ExternalId` and `RoleArn` are not configured + Omit +>; + export interface ClientOptions { region?: string; assumeRoleArn?: string; assumeRoleExternalId?: string; - assumeRoleSessionTags?: { [key: string]: string }; + assumeRoleAdditionalOptions?: AssumeRoleAdditionalOptions; quiet?: boolean; } @@ -120,7 +126,7 @@ export class DefaultAwsClient implements IAws { options.region, options.assumeRoleArn, options.assumeRoleExternalId, - options.assumeRoleSessionTags + options.assumeRoleAdditionalOptions ); } @@ -143,22 +149,21 @@ export class DefaultAwsClient implements IAws { region: string | undefined, roleArn: string, externalId?: string, - sessionTags?: { [key: string]: string } + additionalOptions?: AssumeRoleAdditionalOptions ): Promise { - const parsedTags = sessionTags - ? Object.entries(sessionTags).map(([key, value]) => ({ - Key: key, - Value: value, - })) - : []; - + if ( + additionalOptions?.Tags && + additionalOptions.Tags.length > 0 && + !additionalOptions.TransitiveTagKeys + ) { + additionalOptions.TransitiveTagKeys = additionalOptions.Tags?.map((t) => t.Key); + } return new this.AWS.ChainableTemporaryCredentials({ params: { RoleArn: roleArn, ExternalId: externalId, RoleSessionName: `cdk-assets-${safeUsername()}`, - Tags: parsedTags, - TransitiveTagKeys: sessionTags ? Object.keys(sessionTags) : [], + // ...(additionalOptions ?? {}), }, stsConfig: { region, diff --git a/lib/private/handlers/container-images.ts b/lib/private/handlers/container-images.ts index 2e6cce4..6cae509 100644 --- a/lib/private/handlers/container-images.ts +++ b/lib/private/handlers/container-images.ts @@ -107,7 +107,8 @@ export class ContainerImageAssetHandler implements IAssetHandler { const ecr = await this.host.aws.ecrClient({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: destination.assumeRoleSessionTags, + assumeRoleAdditionalOptions: + destination.assumeRoleAdditionalOptions as AWS.STS.Types.AssumeRoleRequest, region: destination.region, quiet: options.quiet, }); @@ -129,7 +130,7 @@ export class ContainerImageAssetHandler implements IAssetHandler { destinationAlreadyExists: await this.destinationAlreadyExists(ecr, destination, imageUri), }; - return this.init; + return this.init!; } /** diff --git a/lib/private/handlers/files.ts b/lib/private/handlers/files.ts index db26f82..d3152ce 100644 --- a/lib/private/handlers/files.ts +++ b/lib/private/handlers/files.ts @@ -37,7 +37,7 @@ export class FileAssetHandler implements IAssetHandler { const s3 = await this.host.aws.s3Client({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: destination.assumeRoleSessionTags, + assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, region: destination.region, quiet: true, }); @@ -59,7 +59,7 @@ export class FileAssetHandler implements IAssetHandler { const s3 = await this.host.aws.s3Client({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: destination.assumeRoleSessionTags, + assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, region: destination.region, }); this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`); @@ -73,7 +73,7 @@ export class FileAssetHandler implements IAssetHandler { await this.host.aws.discoverTargetAccount({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleSessionTags: destination.assumeRoleSessionTags, + assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, region: destination.region, }) )?.accountId; diff --git a/test/aws.test.ts b/test/aws.test.ts new file mode 100644 index 0000000..8d6e498 --- /dev/null +++ b/test/aws.test.ts @@ -0,0 +1,117 @@ +import * as os from 'os'; +import { DefaultAwsClient } from '../lib'; + +afterEach(() => { + jest.requireActual('aws-sdk'); +}); + +beforeEach(() => { + jest.requireActual('aws-sdk'); +}); + +test('assumeRole passes the right parameters to STS', async () => { + // eslint-disable-next-line @typescript-eslint/no-require-imports + const AWS = require('aws-sdk'); + + jest.mock('aws-sdk', () => { + return { + STS: jest.fn().mockReturnValue({ + getCallerIdentity: jest.fn().mockReturnValue({ + promise: jest.fn().mockResolvedValue({ + Account: '123456789012', + Arn: 'arn:aws:iam::123456789012:role/my-role', + }), + }), + }), + ChainableTemporaryCredentials: jest.fn(), + }; + }); + const aws = new DefaultAwsClient(); + await withMocked(os, 'userInfo', async (userInfo) => { + userInfo.mockReturnValue({ + username: 'foo', + uid: 1, + gid: 1, + homedir: '/here', + shell: '/bin/sh', + }); + await aws.discoverTargetAccount({ + region: 'us-east-1', + assumeRoleArn: 'arn:aws:iam::123456789012:role/my-role', + assumeRoleExternalId: 'external-id', + assumeRoleAdditionalOptions: { + DurationSeconds: 3600, + }, + }); + expect(AWS.ChainableTemporaryCredentials).toHaveBeenCalledWith({ + params: { + ExternalId: 'external-id', + RoleArn: 'arn:aws:iam::123456789012:role/my-role', + DurationSeconds: 3600, + RoleSessionName: `cdk-assets-foo`, + }, + stsConfig: { + customUserAgent: 'cdk-assets', + region: 'us-east-1', + }, + }); + }); +}); + +test('assumeRole defaults session tags to all', async () => { + // eslint-disable-next-line @typescript-eslint/no-require-imports + require('aws-sdk'); + + jest.mock('aws-sdk', () => { + return { + STS: jest.fn().mockReturnValue({ + getCallerIdentity: jest.fn().mockReturnValue({ + promise: jest.fn().mockResolvedValue({ + Account: '123456789012', + Arn: 'arn:aws:iam::123456789012:role/my-role', + }), + }), + }), + ChainableTemporaryCredentials: jest.fn(), + }; + }); + + const aws = new DefaultAwsClient(); + + const account = await aws.discoverTargetAccount({}); + expect(account).toEqual({ + accountId: '123456789012', + partition: 'aws', + }); +}); + +export function withMocked( + obj: A, + key: K, + block: (fn: jest.Mocked[K]) => B +): B { + const original = obj[key]; + const mockFn = jest.fn(); + (obj as any)[key] = mockFn; + + let asyncFinally: boolean = false; + try { + const ret = block(mockFn as any); + if (!isPromise(ret)) { + return ret; + } + + asyncFinally = true; + return ret.finally(() => { + obj[key] = original; + }) as any; + } finally { + if (!asyncFinally) { + obj[key] = original; + } + } +} + +function isPromise(object: any): object is Promise { + return Promise.resolve(object) === object; +} diff --git a/test/docker-images.test.ts b/test/docker-images.test.ts index 4feedfe..91a7f6d 100644 --- a/test/docker-images.test.ts +++ b/test/docker-images.test.ts @@ -29,6 +29,10 @@ beforeEach(() => { theDestination: { region: 'us-north-50', assumeRoleArn: 'arn:aws:role', + assumeRoleExternalId: 'external-id', + assumeRoleAdditionalOptions: { + Tags: [{ Key: 'Departement', Value: 'Engineering' }], + }, repositoryName: 'repo', imageTag: 'abcdef', }, @@ -249,6 +253,10 @@ test('pass destination properties to AWS client', async () => { expect.objectContaining({ region: 'us-north-50', assumeRoleArn: 'arn:aws:role', + assumeRoleExternalId: 'external-id', + assumeRoleAdditionalOptions: { + Tags: [{ Key: 'Departement', Value: 'Engineering' }], + }, }) ); }); diff --git a/test/files.test.ts b/test/files.test.ts index e36e88a..35bbc57 100644 --- a/test/files.test.ts +++ b/test/files.test.ts @@ -1,6 +1,6 @@ jest.mock('child_process'); -import { Manifest } from '@aws-cdk/cloud-assembly-schema'; +import { FileDestination, Manifest } from '@aws-cdk/cloud-assembly-schema'; import * as mockfs from 'mock-fs'; import { FakeListener } from './fake-listener'; import { mockAws, mockedApiFailure, mockedApiResult, mockUpload } from './mock-aws'; @@ -9,9 +9,13 @@ import { AssetPublishing, AssetManifest } from '../lib'; const ABS_PATH = '/simple/cdk.out/some_external_file'; -const DEFAULT_DESTINATION = { +const DEFAULT_DESTINATION: FileDestination = { region: 'us-north-50', assumeRoleArn: 'arn:aws:role', + assumeRoleExternalId: 'external-id', + assumeRoleAdditionalOptions: { + Tags: [{ Key: 'Departement', Value: 'Engineering' }], + }, bucketName: 'some_bucket', objectKey: 'some_key', }; @@ -114,6 +118,10 @@ test('pass destination properties to AWS client', async () => { expect.objectContaining({ region: 'us-north-50', assumeRoleArn: 'arn:aws:role', + assumeRoleExternalId: 'external-id', + assumeRoleAdditionalOptions: { + Tags: [{ Key: 'Departement', Value: 'Engineering' }], + }, }) ); }); From 911260e1c5a4c83122ee3bbea9f6f872c6f8bfc3 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Sat, 31 Aug 2024 17:18:47 +0300 Subject: [PATCH 24/31] mid work --- lib/aws.ts | 2 +- test/aws.test.ts | 41 ++++++++++++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/lib/aws.ts b/lib/aws.ts index 4e5a523..a761c21 100644 --- a/lib/aws.ts +++ b/lib/aws.ts @@ -163,7 +163,7 @@ export class DefaultAwsClient implements IAws { RoleArn: roleArn, ExternalId: externalId, RoleSessionName: `cdk-assets-${safeUsername()}`, - // ...(additionalOptions ?? {}), + ...(additionalOptions ?? {}), }, stsConfig: { region, diff --git a/test/aws.test.ts b/test/aws.test.ts index 8d6e498..3282cbe 100644 --- a/test/aws.test.ts +++ b/test/aws.test.ts @@ -1,10 +1,6 @@ import * as os from 'os'; import { DefaultAwsClient } from '../lib'; -afterEach(() => { - jest.requireActual('aws-sdk'); -}); - beforeEach(() => { jest.requireActual('aws-sdk'); }); @@ -60,7 +56,7 @@ test('assumeRole passes the right parameters to STS', async () => { test('assumeRole defaults session tags to all', async () => { // eslint-disable-next-line @typescript-eslint/no-require-imports - require('aws-sdk'); + const AWS = require('aws-sdk'); jest.mock('aws-sdk', () => { return { @@ -75,13 +71,36 @@ test('assumeRole defaults session tags to all', async () => { ChainableTemporaryCredentials: jest.fn(), }; }); - const aws = new DefaultAwsClient(); - - const account = await aws.discoverTargetAccount({}); - expect(account).toEqual({ - accountId: '123456789012', - partition: 'aws', + await withMocked(os, 'userInfo', async (userInfo) => { + userInfo.mockReturnValue({ + username: 'foo', + uid: 1, + gid: 1, + homedir: '/here', + shell: '/bin/sh', + }); + await aws.discoverTargetAccount({ + region: 'us-east-1', + assumeRoleArn: 'arn:aws:iam::123456789012:role/my-role', + assumeRoleExternalId: 'external-id', + assumeRoleAdditionalOptions: { + Tags: [{ Key: 'Departement', Value: 'Engineering' }], + }, + }); + expect(AWS.ChainableTemporaryCredentials).toHaveBeenCalledWith({ + params: { + ExternalId: 'external-id', + RoleArn: 'arn:aws:iam::123456789012:role/my-role', + Tags: [{ Key: 'Departement', Value: 'Engineering' }], + TransitiveTagKeys: ['Departement'], + RoleSessionName: `cdk-assets-foo`, + }, + stsConfig: { + customUserAgent: 'cdk-assets', + region: 'us-east-1', + }, + }); }); }); From b81a4c62ca64bcfc70917adc974f2390c4f7b384 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Sat, 31 Aug 2024 17:24:23 +0300 Subject: [PATCH 25/31] mid work --- .github/workflows/release-v2-main.yml | 78 ------------------------ lib/private/handlers/container-images.ts | 2 +- 2 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 .github/workflows/release-v2-main.yml diff --git a/.github/workflows/release-v2-main.yml b/.github/workflows/release-v2-main.yml deleted file mode 100644 index d5214a2..0000000 --- a/.github/workflows/release-v2-main.yml +++ /dev/null @@ -1,78 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -name: release-v2-main -on: - push: - branches: - - v2-main - workflow_dispatch: {} -jobs: - release: - runs-on: ubuntu-latest - permissions: - contents: write - outputs: - latest_commit: ${{ steps.git_remote.outputs.latest_commit }} - tag_exists: ${{ steps.check_tag_exists.outputs.exists }} - env: - CI: "true" - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Set git identity - run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" - - name: Install dependencies - run: yarn install --check-files --frozen-lockfile - - name: release:v2-main - run: npx projen release:v2-main - - name: Check if version has already been tagged - id: check_tag_exists - run: |- - TAG=$(cat dist/releasetag.txt) - ([ ! -z "$TAG" ] && git ls-remote -q --exit-code --tags origin $TAG && (echo "exists=true" >> $GITHUB_OUTPUT)) || (echo "exists=false" >> $GITHUB_OUTPUT) - cat $GITHUB_OUTPUT - - name: Check for new commits - id: git_remote - run: |- - echo "latest_commit=$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" >> $GITHUB_OUTPUT - cat $GITHUB_OUTPUT - - name: Backup artifact permissions - if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - run: cd dist && getfacl -R . > permissions-backup.acl - continue-on-error: true - - name: Upload artifact - if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - uses: actions/upload-artifact@v4 - with: - name: build-artifact - path: dist - overwrite: true - release_github: - name: Publish to GitHub Releases - needs: release - runs-on: ubuntu-latest - permissions: - contents: write - if: needs.release.outputs.tag_exists != 'true' && needs.release.outputs.latest_commit == github.sha - steps: - - uses: actions/setup-node@v4 - with: - node-version: 18.x - - name: Download build artifacts - uses: actions/download-artifact@v4 - with: - name: build-artifact - path: dist - - name: Restore build artifact permissions - run: cd dist && setfacl --restore=permissions-backup.acl - continue-on-error: true - - name: Release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REPOSITORY: ${{ github.repository }} - GITHUB_REF: ${{ github.sha }} - run: 'echo "DRY RUN: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi"' diff --git a/lib/private/handlers/container-images.ts b/lib/private/handlers/container-images.ts index 6cae509..5407180 100644 --- a/lib/private/handlers/container-images.ts +++ b/lib/private/handlers/container-images.ts @@ -130,7 +130,7 @@ export class ContainerImageAssetHandler implements IAssetHandler { destinationAlreadyExists: await this.destinationAlreadyExists(ecr, destination, imageUri), }; - return this.init!; + return this.init; } /** From 211e526cffd70b498bb9edb4b6844d9445236f8f Mon Sep 17 00:00:00 2001 From: iliapolo Date: Sun, 1 Sep 2024 10:13:06 +0300 Subject: [PATCH 26/31] mid work --- .projen/deps.json | 4 ++++ .projen/tasks.json | 4 ++-- .projenrc.ts | 1 + package.json | 1 + yarn.lock | 7 +++++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 93f7293..bd6b033 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -16,6 +16,10 @@ "name": "@types/mime", "type": "build" }, + { + "name": "@types/mock-fs", + "type": "build" + }, { "name": "@types/node", "version": "^18", diff --git a/.projen/tasks.json b/.projen/tasks.json index c2d9d04..04b045b 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -245,13 +245,13 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/archiver,@types/glob,@types/jest,@types/mime,@types/yargs,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,fs-extra,graceful-fs,jest,jszip,mock-fs,prettier,projen,ts-jest,ts-node,typescript,@aws-cdk/cloud-assembly-schema,@aws-cdk/cx-api,archiver,aws-sdk,glob,mime,yargs" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/archiver,@types/glob,@types/jest,@types/mime,@types/mock-fs,@types/yargs,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,fs-extra,graceful-fs,jest,jszip,mock-fs,prettier,projen,ts-jest,ts-node,typescript,@aws-cdk/cloud-assembly-schema,@aws-cdk/cx-api,archiver,aws-sdk,glob,mime,yargs" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @types/archiver @types/glob @types/jest @types/mime @types/node @types/yargs @typescript-eslint/eslint-plugin @typescript-eslint/parser commit-and-tag-version constructs eslint-config-prettier eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint fs-extra graceful-fs jest jest-junit jszip mock-fs prettier projen ts-jest ts-node typescript @aws-cdk/cloud-assembly-schema @aws-cdk/cx-api archiver aws-sdk glob mime yargs" + "exec": "yarn upgrade @types/archiver @types/glob @types/jest @types/mime @types/mock-fs @types/node @types/yargs @typescript-eslint/eslint-plugin @typescript-eslint/parser commit-and-tag-version constructs eslint-config-prettier eslint-import-resolver-typescript eslint-plugin-import eslint-plugin-prettier eslint fs-extra graceful-fs jest jest-junit jszip mock-fs prettier projen ts-jest ts-node typescript @aws-cdk/cloud-assembly-schema @aws-cdk/cx-api archiver aws-sdk glob mime yargs" }, { "exec": "npx projen" diff --git a/.projenrc.ts b/.projenrc.ts index 81f208d..0e97088 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -32,6 +32,7 @@ const project = new typescript.TypeScriptProject({ '@types/glob', '@types/mime', '@types/yargs', + '@types/mock-fs', 'fs-extra', 'graceful-fs', 'jszip', diff --git a/package.json b/package.json index 56f763d..930047a 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "@types/glob": "^7.2.0", "@types/jest": "^29.5.12", "@types/mime": "^2.0.3", + "@types/mock-fs": "^4.13.4", "@types/node": "^18", "@types/yargs": "^15.0.19", "@typescript-eslint/eslint-plugin": "^7", diff --git a/yarn.lock b/yarn.lock index 3205bfb..5ed5862 100644 --- a/yarn.lock +++ b/yarn.lock @@ -823,6 +823,13 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== +"@types/mock-fs@^4.13.4": + version "4.13.4" + resolved "https://registry.yarnpkg.com/@types/mock-fs/-/mock-fs-4.13.4.tgz#e73edb4b4889d44d23f1ea02d6eebe50aa30b09a" + integrity sha512-mXmM0o6lULPI8z3XNnQCpL0BGxPwx1Ul1wXYEPBGl4efShyxW2Rln0JOPEWGyZaYZMM6OVXM/15zUuFMY52ljg== + dependencies: + "@types/node" "*" + "@types/node@*": version "22.5.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560" From 2e79a94338f0fefd6f9515384c2c90f2bdc31d76 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Sun, 1 Sep 2024 15:19:49 +0300 Subject: [PATCH 27/31] mid work --- lib/private/handlers/container-images.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/private/handlers/container-images.ts b/lib/private/handlers/container-images.ts index 5407180..39fce56 100644 --- a/lib/private/handlers/container-images.ts +++ b/lib/private/handlers/container-images.ts @@ -107,8 +107,7 @@ export class ContainerImageAssetHandler implements IAssetHandler { const ecr = await this.host.aws.ecrClient({ assumeRoleArn: destination.assumeRoleArn, assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleAdditionalOptions: - destination.assumeRoleAdditionalOptions as AWS.STS.Types.AssumeRoleRequest, + assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, region: destination.region, quiet: options.quiet, }); From d1281af25f984331d72b6f144e01792c6a00d458 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Tue, 3 Sep 2024 09:44:19 +0300 Subject: [PATCH 28/31] mid work --- lib/aws.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/aws.ts b/lib/aws.ts index a761c21..5238ca0 100644 --- a/lib/aws.ts +++ b/lib/aws.ts @@ -151,18 +151,14 @@ export class DefaultAwsClient implements IAws { externalId?: string, additionalOptions?: AssumeRoleAdditionalOptions ): Promise { - if ( - additionalOptions?.Tags && - additionalOptions.Tags.length > 0 && - !additionalOptions.TransitiveTagKeys - ) { - additionalOptions.TransitiveTagKeys = additionalOptions.Tags?.map((t) => t.Key); - } return new this.AWS.ChainableTemporaryCredentials({ params: { RoleArn: roleArn, ExternalId: externalId, RoleSessionName: `cdk-assets-${safeUsername()}`, + TransitiveTagKeys: additionalOptions?.Tags + ? additionalOptions.Tags.map((t) => t.Key) + : undefined, ...(additionalOptions ?? {}), }, stsConfig: { From fbc510a342d4cde7290250574f916e43dc0e05f2 Mon Sep 17 00:00:00 2001 From: iliapolo Date: Wed, 18 Sep 2024 14:01:54 +0300 Subject: [PATCH 29/31] mid work --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 930047a..06adb7a 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "typescript": "^5.5.4" }, "dependencies": { - "@aws-cdk/cloud-assembly-schema": "^36.0.21", + "@aws-cdk/cloud-assembly-schema": "^38.0.0", "@aws-cdk/cx-api": "^2.155.0", "archiver": "^5.3.2", "aws-sdk": "^2.1687.0", diff --git a/yarn.lock b/yarn.lock index 5ed5862..52ca484 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,10 +10,10 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -"@aws-cdk/cloud-assembly-schema@^36.0.21": - version "36.0.21" - resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-36.0.21.tgz#12cd81a30f14443bbf7e463cc8c6026edddf6f1c" - integrity sha512-MuuzRxWfrrIw2D2s5p5axwDiH7BrKsDBCKS8OCmVGe8yKAtF2Y9cNo1Z0q4wySMfbaa6hgqTXnigO6YTzLru1w== +"@aws-cdk/cloud-assembly-schema@^38.0.0": + version "38.0.0" + resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-38.0.0.tgz#dd5906087dd4251229e7e179fefd9ef1107e03f6" + integrity sha512-pZPnUO9BGYd9AtRX2abg+gf1DPYaaMySj2yPm/OZDKhVEZqj9aI3jRJB86ncPNtYBrHwxJdYM6HJGVcoUWEx8A== dependencies: jsonschema "^1.4.1" semver "^7.6.3" From 5c1ea4f7fc51193dd13049a8361f95a2df235127 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 18 Sep 2024 11:07:48 +0000 Subject: [PATCH 30/31] chore: self mutation Signed-off-by: github-actions --- yarn.lock | 7 ------- 1 file changed, 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index 29d74ac..ea75991 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,17 +10,10 @@ "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.24" -<<<<<<< HEAD "@aws-cdk/cloud-assembly-schema@^38.0.0": version "38.0.0" resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-38.0.0.tgz#dd5906087dd4251229e7e179fefd9ef1107e03f6" integrity sha512-pZPnUO9BGYd9AtRX2abg+gf1DPYaaMySj2yPm/OZDKhVEZqj9aI3jRJB86ncPNtYBrHwxJdYM6HJGVcoUWEx8A== -======= -"@aws-cdk/cloud-assembly-schema@^36.1.1": - version "36.1.1" - resolved "https://registry.yarnpkg.com/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-36.1.1.tgz#3fd870d4f422a34a50054df1c41e74a27e9f7b14" - integrity sha512-yCF4uTJ3jMtS3e/KKWYVgK2Y6YgdFE6LBQ/7RAAUBufdu+f0oJWFvTjPJPCms78dE71vmeYPuKprLpIsOOL1HQ== ->>>>>>> v2-main dependencies: jsonschema "^1.4.1" semver "^7.6.3" From 61c5a387b65e767dec909a254a72bd7cbaf5024d Mon Sep 17 00:00:00 2001 From: iliapolo Date: Wed, 18 Sep 2024 16:24:18 +0300 Subject: [PATCH 31/31] mid work --- lib/private/handlers/container-images.ts | 6 ++---- lib/private/handlers/files.ts | 24 ++++++------------------ lib/private/handlers/index.ts | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/private/handlers/container-images.ts b/lib/private/handlers/container-images.ts index 39fce56..b0ff312 100644 --- a/lib/private/handlers/container-images.ts +++ b/lib/private/handlers/container-images.ts @@ -1,6 +1,7 @@ import * as path from 'path'; import { DockerImageDestination } from '@aws-cdk/cloud-assembly-schema'; import type * as AWS from 'aws-sdk'; +import { destinationToClientOptions } from '.'; import { DockerImageManifestEntry } from '../../asset-manifest'; import { EventType } from '../../progress'; import { IAssetHandler, IHandlerHost, IHandlerOptions } from '../asset-handler'; @@ -105,10 +106,7 @@ export class ContainerImageAssetHandler implements IAssetHandler { const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws); const ecr = await this.host.aws.ecrClient({ - assumeRoleArn: destination.assumeRoleArn, - assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, - region: destination.region, + ...destinationToClientOptions(destination), quiet: options.quiet, }); const account = async () => (await this.host.aws.discoverCurrentAccount())?.accountId; diff --git a/lib/private/handlers/files.ts b/lib/private/handlers/files.ts index d3152ce..1716217 100644 --- a/lib/private/handlers/files.ts +++ b/lib/private/handlers/files.ts @@ -2,6 +2,7 @@ import { createReadStream, promises as fs } from 'fs'; import * as path from 'path'; import { FileAssetPackaging, FileSource } from '@aws-cdk/cloud-assembly-schema'; import * as mime from 'mime'; +import { destinationToClientOptions } from '.'; import { FileManifestEntry } from '../../asset-manifest'; import { EventType } from '../../progress'; import { zipDirectory } from '../archive'; @@ -35,10 +36,7 @@ export class FileAssetHandler implements IAssetHandler { const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`; try { const s3 = await this.host.aws.s3Client({ - assumeRoleArn: destination.assumeRoleArn, - assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, - region: destination.region, + ...destinationToClientOptions(destination), quiet: true, }); this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`); @@ -56,12 +54,9 @@ export class FileAssetHandler implements IAssetHandler { public async publish(): Promise { const destination = await replaceAwsPlaceholders(this.asset.destination, this.host.aws); const s3Url = `s3://${destination.bucketName}/${destination.objectKey}`; - const s3 = await this.host.aws.s3Client({ - assumeRoleArn: destination.assumeRoleArn, - assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, - region: destination.region, - }); + + const clientOptions = destinationToClientOptions(destination); + const s3 = await this.host.aws.s3Client(clientOptions); this.host.emitMessage(EventType.CHECK, `Check ${s3Url}`); const bucketInfo = BucketInformation.for(this.host); @@ -69,14 +64,7 @@ export class FileAssetHandler implements IAssetHandler { // A thunk for describing the current account. Used when we need to format an error // message, not in the success case. const account = async () => - ( - await this.host.aws.discoverTargetAccount({ - assumeRoleArn: destination.assumeRoleArn, - assumeRoleExternalId: destination.assumeRoleExternalId, - assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, - region: destination.region, - }) - )?.accountId; + (await this.host.aws.discoverTargetAccount(clientOptions))?.accountId; switch (await bucketInfo.bucketOwnership(s3, destination.bucketName)) { case BucketOwnership.MINE: break; diff --git a/lib/private/handlers/index.ts b/lib/private/handlers/index.ts index 0eccd0c..d45e660 100644 --- a/lib/private/handlers/index.ts +++ b/lib/private/handlers/index.ts @@ -1,3 +1,4 @@ +import { AwsDestination } from '@aws-cdk/cloud-assembly-schema'; import { ContainerImageAssetHandler } from './container-images'; import { FileAssetHandler } from './files'; import { @@ -6,6 +7,7 @@ import { FileManifestEntry, IManifestEntry, } from '../../asset-manifest'; +import type { ClientOptions } from '../../aws'; import { IAssetHandler, IHandlerHost, IHandlerOptions } from '../asset-handler'; export function makeAssetHandler( @@ -23,3 +25,15 @@ export function makeAssetHandler( throw new Error(`Unrecognized asset type: '${asset}'`); } + +export function destinationToClientOptions(destination: AwsDestination): ClientOptions { + // Explicitly build ClientOptions from AwsDestination. The fact they are structurally compatible is coincidental. + // This also enforces better type checking that cdk-assets depends on the appropriate version of + // @aws-cdk/cloud-assembly-schema. + return { + assumeRoleArn: destination.assumeRoleArn, + assumeRoleExternalId: destination.assumeRoleExternalId, + assumeRoleAdditionalOptions: destination.assumeRoleAdditionalOptions, + region: destination.region, + }; +}