From b692214400610b8f0047b69e2ffab5cae619d915 Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Mon, 13 Jun 2022 14:10:35 +0200 Subject: [PATCH 1/6] chore: add auto-merge for deps update --- .gitattributes | 8 +++++ .github/pull_request_template.md | 1 + .github/workflows/auto-approve.yml | 22 ++++++++++++++ .github/workflows/build.yml | 8 ++--- .github/workflows/release.yml | 6 ++-- .github/workflows/upgrade-main.yml | 9 +++--- .gitignore | 8 +++++ .mergify.yml | 27 +++++++++++++++++ .npmignore | 1 + .projen/files.json | 8 +++++ .projen/tasks.json | 48 ++++-------------------------- .projenrc.js | 11 +++++++ package.json | 1 - 13 files changed, 101 insertions(+), 57 deletions(-) create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/auto-approve.yml create mode 100644 .mergify.yml diff --git a/.gitattributes b/.gitattributes index fb0de1f..ed4cff5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,7 +3,15 @@ *.snap linguist-generated /.eslintrc.json linguist-generated /.gitattributes linguist-generated +/.github/pull_request_template.md linguist-generated +/.github/workflows/auto-approve.yml linguist-generated +/.github/workflows/build.yml linguist-generated +/.github/workflows/pull-request-lint.yml linguist-generated +/.github/workflows/release.yml linguist-generated +/.github/workflows/stale.yml linguist-generated +/.github/workflows/upgrade-main.yml linguist-generated /.gitignore linguist-generated +/.mergify.yml linguist-generated /.npmignore linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..11d479b --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1 @@ +Fixes # \ No newline at end of file diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml new file mode 100644 index 0000000..b62c812 --- /dev/null +++ b/.github/workflows/auto-approve.yml @@ -0,0 +1,22 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +name: auto-approve +on: + pull_request_target: + types: + - labeled + - opened + - synchronize + - reopened + - ready_for_review +jobs: + approve: + runs-on: ubuntu-latest + permissions: + pull-requests: write + if: contains(github.event.pull_request.labels.*.name, 'auto-approve') && + (github.event.pull_request.user.login == 'am29d') + steps: + - uses: hmarr/auto-approve-action@v2.1.0 + with: + github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c135279..5a41bc2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,5 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + name: build on: pull_request: {} @@ -17,10 +19,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - - name: Setup Node.js - uses: actions/setup-node@v2.2.0 - with: - node-version: 14 - name: Install dependencies run: yarn install --check-files - name: give user docker permission so we can run tests @@ -84,7 +82,7 @@ jobs: - name: Push changes run: |-2 git add . - git commit -m -s "chore: self mutation" + git commit -s -m "chore: self mutation" git push origin HEAD:${{ github.event.pull_request.head.ref }} package-js: needs: build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2bc6b9..9eb2aa7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,3 +1,5 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + name: release on: push: @@ -22,10 +24,6 @@ jobs: run: |- git config user.name "github-actions" git config user.email "github-actions@github.com" - - name: Setup Node.js - uses: actions/setup-node@v2.2.0 - with: - node-version: 14 - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: give user docker permission so we can run tests diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml index bed1ed3..ac458f5 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-main.yml @@ -1,3 +1,5 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + name: upgrade-main on: workflow_dispatch: {} @@ -16,10 +18,6 @@ jobs: uses: actions/checkout@v2 with: ref: main - - name: Setup Node.js - uses: actions/setup-node@v2.2.0 - with: - node-version: 14 - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies @@ -68,7 +66,7 @@ jobs: id: create-pr uses: peter-evans/create-pull-request@v3 with: - token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + token: ${{ secrets.AUTOMATION_TOKEN }} commit-message: >- chore(deps): upgrade dependencies @@ -85,6 +83,7 @@ jobs: *Automatically created by projen via the "upgrade-main" workflow* branch: github-actions/upgrade-main title: "chore(deps): upgrade dependencies" + labels: auto-approve,auto-merge body: >- Upgrades project dependencies. See details in [workflow run]. diff --git a/.gitignore b/.gitignore index cf49900..0a42d2e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ !/.projen/tasks.json !/.projen/deps.json !/.projen/files.json +!/.github/workflows/pull-request-lint.yml +!/.github/workflows/auto-approve.yml +!/.github/workflows/stale.yml !/package.json !/LICENSE !/.npmignore @@ -33,8 +36,12 @@ jspm_packages/ /test-reports/ junit.xml /coverage/ +!/.github/workflows/build.yml /dist/changelog.md /dist/version.txt +!/.github/workflows/release.yml +!/.mergify.yml +!/.github/pull_request_template.md !/test/ !/tsconfig.dev.json !/src/ @@ -44,3 +51,4 @@ junit.xml .jsii tsconfig.json !/API.md +!/.github/workflows/upgrade-main.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..891c7aa --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,27 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +queue_rules: + - name: default + conditions: + - "#approved-reviews-by>=1" + - -label~=(do-not-merge) + - status-success=build + - status-success=package-js + - status-success=package-python +pull_request_rules: + - name: Automatic merge on approval and successful build + actions: + delete_head_branch: {} + queue: + method: squash + name: default + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} + conditions: + - "#approved-reviews-by>=1" + - -label~=(do-not-merge) + - status-success=build + - status-success=package-js + - status-success=package-python diff --git a/.npmignore b/.npmignore index b0a0a9e..efe7d67 100644 --- a/.npmignore +++ b/.npmignore @@ -5,6 +5,7 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt +/.mergify.yml /test/ /tsconfig.dev.json /src/ diff --git a/.projen/files.json b/.projen/files.json index 8178609..0e6ca93 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -2,7 +2,15 @@ "files": [ ".eslintrc.json", ".gitattributes", + ".github/pull_request_template.md", + ".github/workflows/auto-approve.yml", + ".github/workflows/build.yml", + ".github/workflows/pull-request-lint.yml", + ".github/workflows/release.yml", + ".github/workflows/stale.yml", + ".github/workflows/upgrade-main.yml", ".gitignore", + ".mergify.yml", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/.projen/tasks.json b/.projen/tasks.json index 1b11a1b..92c50d0 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -260,61 +260,25 @@ }, "steps": [ { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --dep dev --upgrade --target=minor" }, { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --dep optional --upgrade --target=minor" }, { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --dep peer --upgrade --target=minor" }, { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --dep prod --upgrade --target=minor" }, { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --dep bundle --upgrade --target=minor" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade @types/jest @types/node @types/prettier @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk-lib constructs eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit jsii jsii-diff jsii-docgen json-schema npm-check-updates standard-version ts-jest typescript aws-cdk-lib constructs" - }, - { - "exec": "npx projen" - }, - { - "spawn": "post-upgrade" - } - ] - }, - "upgrade-projen": { - "name": "upgrade-projen", - "description": "upgrade projen", - "env": { - "CI": "0" - }, - "steps": [ - { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --filter='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --filter='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --filter='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --filter='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --filter='projen'" - }, - { - "exec": "yarn install --check-files" - }, - { - "exec": "yarn upgrade projen" + "exec": "yarn upgrade" }, { "exec": "npx projen" diff --git a/.projenrc.js b/.projenrc.js index dce6185..673f4b6 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -13,11 +13,22 @@ const project = new awscdk.AwsCdkConstructLibrary({ devDeps: [ '@types/prettier@2.6.0', // pin until breaking changes is resolved: https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60310 ], + depsUpgradeOptions: { + ignoreProjen: false, + workflowOptions: { + labels: ['auto-approve', 'auto-merge'], + secret: 'AUTOMATION_TOKEN', + }, + }, github: false, publishToPypi: { distName: 'cdk-lambda-powertools-python-layer', module: 'cdk_lambda_powertools_python_layer', }, + autoApproveOptions: { + secret: 'PROJEN_GITHUB_TOKEN', + allowedUsernames: ['am29d'], + }, license: 'MIT-0', copyrightOwner: 'Amazon.com, Inc. or its affiliates. All Rights Reserved.', }); diff --git a/package.json b/package.json index 953f60a..d235baa 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "test:watch": "npx projen test:watch", "unbump": "npx projen unbump", "upgrade": "npx projen upgrade", - "upgrade-projen": "npx projen upgrade-projen", "watch": "npx projen watch", "projen": "npx projen" }, From 63566399c3dadfd6c4b663b2331983b08b38786f Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 12:47:10 +0200 Subject: [PATCH 2/6] fix: swap tokens for auto-approve --- .github/workflows/auto-approve.yml | 2 +- .github/workflows/upgrade-main.yml | 2 +- .projenrc.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index b62c812..3e99361 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -19,4 +19,4 @@ jobs: steps: - uses: hmarr/auto-approve-action@v2.1.0 with: - github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }} + github-token: ${{ secrets.AUTOMATION_TOKEN }} diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml index ac458f5..3bb709c 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-main.yml @@ -66,7 +66,7 @@ jobs: id: create-pr uses: peter-evans/create-pull-request@v3 with: - token: ${{ secrets.AUTOMATION_TOKEN }} + token: ${{ secrets.PROJEN_GITHUB_TOKEN }} commit-message: >- chore(deps): upgrade dependencies diff --git a/.projenrc.js b/.projenrc.js index 673f4b6..696f703 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -17,7 +17,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ ignoreProjen: false, workflowOptions: { labels: ['auto-approve', 'auto-merge'], - secret: 'AUTOMATION_TOKEN', + secret: 'PROJEN_GITHUB_TOKEN', }, }, github: false, @@ -26,7 +26,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ module: 'cdk_lambda_powertools_python_layer', }, autoApproveOptions: { - secret: 'PROJEN_GITHUB_TOKEN', + secret: 'AUTOMATION_TOKEN', allowedUsernames: ['am29d'], }, license: 'MIT-0', From 3c80dfefa3ed72b8105952ba735e20c02e0dc888 Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 13:04:36 +0200 Subject: [PATCH 3/6] fix: use 0 version to test invalid verison --- test/lambda-powertools-layer.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lambda-powertools-layer.test.ts b/test/lambda-powertools-layer.test.ts index 7d21521..be21b01 100644 --- a/test/lambda-powertools-layer.test.ts +++ b/test/lambda-powertools-layer.test.ts @@ -60,7 +60,7 @@ describe('with version configuration the construct', () => { test('fails with invalid version', () => { const stack = new Stack(); expect(() => new LambdaPowertoolsLayer(stack, 'PowertoolsLayerBadVersion', { - version: '12.222.21123', + version: '0.0.0', })).toThrow(/docker exited with status 1/); }); From d4abae1b4be8ed1811841de9f35568baccff7037 Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 13:13:39 +0200 Subject: [PATCH 4/6] fix: manual upgrade to reset deps --- .projen/deps.json | 14 +++- .projen/tasks.json | 52 +++++++------ package.json | 13 +++- yarn.lock | 179 ++++++++++++++++++++++++++++----------------- 4 files changed, 160 insertions(+), 98 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 1f2c47b..cdff216 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -6,7 +6,7 @@ }, { "name": "@types/node", - "version": "^12", + "version": "^14", "type": "build" }, { @@ -52,12 +52,13 @@ "type": "build" }, { - "name": "jest", + "name": "jest-junit", + "version": "^13", "type": "build" }, { - "name": "jest-junit", - "version": "^13", + "name": "jest", + "version": "^27", "type": "build" }, { @@ -72,6 +73,10 @@ "name": "jsii-docgen", "type": "build" }, + { + "name": "jsii-pacmak", + "type": "build" + }, { "name": "json-schema", "type": "build" @@ -92,6 +97,7 @@ }, { "name": "ts-jest", + "version": "^27", "type": "build" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index 92c50d0..8726a8c 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -31,7 +31,8 @@ "OUTFILE": "package.json", "CHANGELOG": "dist/changelog.md", "BUMPFILE": "dist/version.txt", - "RELEASETAG": "dist/releasetag.txt" + "RELEASETAG": "dist/releasetag.txt", + "RELEASE_TAG_PREFIX": "" }, "steps": [ { @@ -86,7 +87,7 @@ "description": "Only compile", "steps": [ { - "exec": "jsii --silence-warnings=reserved-word --no-fix-peer-dependencies" + "exec": "jsii --silence-warnings=reserved-word" } ] }, @@ -104,7 +105,19 @@ "description": "Generate API.md from .jsii manifest", "steps": [ { - "exec": "jsii-docgen" + "exec": "jsii-docgen -o API.md" + } + ] + }, + "eject": { + "name": "eject", + "description": "Remove projen from the project", + "env": { + "PROJEN_EJECTING": "true" + }, + "steps": [ + { + "spawn": "default" } ] }, @@ -122,10 +135,7 @@ "description": "Creates the distribution package", "steps": [ { - "exec": "mkdir -p dist" - }, - { - "exec": "rsync -a . dist --exclude .git --exclude node_modules" + "exec": "if [ ! -z ${CI} ]; then rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist; else npx projen package-all; fi" } ] }, @@ -146,10 +156,7 @@ "description": "Create js language bindings", "steps": [ { - "exec": "jsii_version=$(node -p \"JSON.parse(fs.readFileSync('.jsii')).jsiiVersion.split(' ')[0]\")" - }, - { - "exec": "npx jsii-pacmak@$jsii_version -v --target js" + "exec": "jsii-pacmak -v --target js" } ] }, @@ -158,10 +165,7 @@ "description": "Create python language bindings", "steps": [ { - "exec": "jsii_version=$(node -p \"JSON.parse(fs.readFileSync('.jsii')).jsiiVersion.split(' ')[0]\")" - }, - { - "exec": "npx jsii-pacmak@$jsii_version -v --target python" + "exec": "jsii-pacmak -v --target python" } ] }, @@ -244,7 +248,8 @@ "OUTFILE": "package.json", "CHANGELOG": "dist/changelog.md", "BUMPFILE": "dist/version.txt", - "RELEASETAG": "dist/releasetag.txt" + "RELEASETAG": "dist/releasetag.txt", + "RELEASE_TAG_PREFIX": "" }, "steps": [ { @@ -260,19 +265,22 @@ }, "steps": [ { - "exec": "npm-check-updates --dep dev --upgrade --target=minor" + "exec": "yarn upgrade npm-check-updates" + }, + { + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='@types/prettier,aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep optional --upgrade --target=minor" + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='@types/prettier,aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep peer --upgrade --target=minor" + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='@types/prettier,aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep prod --upgrade --target=minor" + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='@types/prettier,aws-cdk-lib,constructs'" }, { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor" + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='@types/prettier,aws-cdk-lib,constructs'" }, { "exec": "yarn install --check-files" @@ -293,7 +301,7 @@ "description": "Watch & compile in the background", "steps": [ { - "exec": "jsii -w --silence-warnings=reserved-word --no-fix-peer-dependencies" + "exec": "jsii -w --silence-warnings=reserved-word" } ] } diff --git a/package.json b/package.json index d235baa..040d29f 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "compile": "npx projen compile", "default": "npx projen default", "docgen": "npx projen docgen", + "eject": "npx projen eject", "eslint": "npx projen eslint", "package": "npx projen package", "package-all": "npx projen package-all", @@ -37,7 +38,7 @@ }, "devDependencies": { "@types/jest": "^27.5.2", - "@types/node": "^12", + "@types/node": "^14", "@types/prettier": "2.6.0", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -47,16 +48,17 @@ "eslint-import-resolver-node": "^0.3.6", "eslint-import-resolver-typescript": "^2.7.1", "eslint-plugin-import": "^2.26.0", - "jest": "^27.5.1", + "jest": "^27", "jest-junit": "^13", "jsii": "^1.60.1", "jsii-diff": "^1.60.1", "jsii-docgen": "^4.2.44", + "jsii-pacmak": "^1.60.1", "json-schema": "^0.4.0", "npm-check-updates": "^12", - "projen": "^0.50.21", + "projen": "^0.58.12", "standard-version": "^9", - "ts-jest": "^27.1.5", + "ts-jest": "^27", "typescript": "^4.7.3" }, "peerDependencies": { @@ -130,5 +132,8 @@ "rootDir": "src" } }, + "resolutions": { + "@types/prettier": "2.6.0" + }, "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 035ff94..a2ab89e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -836,26 +836,21 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.42.tgz#d7e8f22700efc94d125103075c074396b5f41f9b" integrity sha512-Q5BPGyGKcvQgAMbsr7qEGN/kIPN6zZecYYABeTDBizOsau+2NMdSVTar9UQw21A2+JyA2KRNDYaYrPB0Rpk2oQ== -"@types/node@^12": - version "12.20.55" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" - integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== +"@types/node@^14": + version "14.18.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.21.tgz#0155ee46f6be28b2ff0342ca1a9b9fd4468bef41" + integrity sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q== "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== -"@types/prettier@2.6.0": +"@types/prettier@2.6.0", "@types/prettier@^2.1.5": version "2.6.0" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759" integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== -"@types/prettier@^2.1.5": - version "2.6.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.3.tgz#68ada76827b0010d0db071f739314fa429943d0a" - integrity sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg== - "@types/stack-utils@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" @@ -874,13 +869,13 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz#fdf59c905354139046b41b3ed95d1609913d0758" - integrity sha512-6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw== + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.28.0.tgz#6204ac33bdd05ab27c7f77960f1023951115d403" + integrity sha512-DXVU6Cg29H2M6EybqSg2A+x8DgO9TCUBRp4QEXQHJceLS7ogVDP0g3Lkg/SZCqcvkAP/RruuQqK0gdlkgmhSUA== dependencies: - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/type-utils" "5.27.1" - "@typescript-eslint/utils" "5.27.1" + "@typescript-eslint/scope-manager" "5.28.0" + "@typescript-eslint/type-utils" "5.28.0" + "@typescript-eslint/utils" "5.28.0" debug "^4.3.4" functional-red-black-tree "^1.0.1" ignore "^5.2.0" @@ -889,68 +884,68 @@ tsutils "^3.21.0" "@typescript-eslint/parser@^5": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.27.1.tgz#3a4dcaa67e45e0427b6ca7bb7165122c8b569639" - integrity sha512-7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ== + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.28.0.tgz#639b101cad2bfb7ae16e69710ac95c42bd4eae33" + integrity sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA== dependencies: - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/typescript-estree" "5.27.1" + "@typescript-eslint/scope-manager" "5.28.0" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/typescript-estree" "5.28.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz#4d1504392d01fe5f76f4a5825991ec78b7b7894d" - integrity sha512-fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg== +"@typescript-eslint/scope-manager@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.28.0.tgz#ef9a5c68fecde72fd2ff8a84b9c120324826c1b9" + integrity sha512-LeBLTqF/he1Z+boRhSqnso6YrzcKMTQ8bO/YKEe+6+O/JGof9M0g3IJlIsqfrK/6K03MlFIlycbf1uQR1IjE+w== dependencies: - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/visitor-keys" "5.27.1" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/visitor-keys" "5.28.0" -"@typescript-eslint/type-utils@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz#369f695199f74c1876e395ebea202582eb1d4166" - integrity sha512-+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw== +"@typescript-eslint/type-utils@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.28.0.tgz#53ccc78fdcf0205ef544d843b84104c0e9c7ca8e" + integrity sha512-SyKjKh4CXPglueyC6ceAFytjYWMoPHMswPQae236zqe1YbhvCVQyIawesYywGiu98L9DwrxsBN69vGIVxJ4mQQ== dependencies: - "@typescript-eslint/utils" "5.27.1" + "@typescript-eslint/utils" "5.28.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.27.1.tgz#34e3e629501349d38be6ae97841298c03a6ffbf1" - integrity sha512-LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg== +"@typescript-eslint/types@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.28.0.tgz#cffd9bcdce28db6daaa146e48a0be4387a6f4e9d" + integrity sha512-2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA== -"@typescript-eslint/typescript-estree@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz#7621ee78607331821c16fffc21fc7a452d7bc808" - integrity sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw== +"@typescript-eslint/typescript-estree@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.28.0.tgz#3487d158d091ca2772b285e67412ff6d9797d863" + integrity sha512-9GX+GfpV+F4hdTtYc6OV9ZkyYilGXPmQpm6AThInpBmKJEyRSIjORJd1G9+bknb7OTFYL+Vd4FBJAO6T78OVqA== dependencies: - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/visitor-keys" "5.27.1" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/visitor-keys" "5.28.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.27.1.tgz#b4678b68a94bc3b85bf08f243812a6868ac5128f" - integrity sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w== +"@typescript-eslint/utils@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.28.0.tgz#b27a136eac300a48160b36d2aad0da44a1341b99" + integrity sha512-E60N5L0fjv7iPJV3UGc4EC+A3Lcj4jle9zzR0gW7vXhflO7/J29kwiTGITA2RlrmPokKiZbBy2DgaclCaEUs6g== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.27.1" - "@typescript-eslint/types" "5.27.1" - "@typescript-eslint/typescript-estree" "5.27.1" + "@typescript-eslint/scope-manager" "5.28.0" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/typescript-estree" "5.28.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.27.1": - version "5.27.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz#05a62666f2a89769dac2e6baa48f74e8472983af" - integrity sha512-xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ== +"@typescript-eslint/visitor-keys@5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.28.0.tgz#982bb226b763c48fc1859a60de33fbf939d40a0f" + integrity sha512-BtfP1vCor8cWacovzzPFOoeW4kBQxzmhxGoOpt0v1SFvG+nJ0cWaVdJk7cky1ArTcFHHKNIxyo2LLr3oNkSuXA== dependencies: - "@typescript-eslint/types" "5.27.1" + "@typescript-eslint/types" "5.28.0" eslint-visitor-keys "^3.3.0" "@xmldom/xmldom@^0.8.2": @@ -1422,7 +1417,7 @@ camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.2.0: +camelcase@^6.2.0, camelcase@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== @@ -1517,11 +1512,25 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +clone@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== + co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== +codemaker@^1.60.1: + version "1.60.1" + resolved "https://registry.yarnpkg.com/codemaker/-/codemaker-1.60.1.tgz#12264997e693aac35ea0840acef4e1a72078d60a" + integrity sha512-bNrmC1vUdyMKxi40fxewOOw0D/0lRHSqdJPWD643ncvqMapf+Ws8suFuX8gUPPwc7qYuOoMGSFW0geKiAAkmaw== + dependencies: + camelcase "^6.3.0" + decamelize "^5.0.1" + fs-extra "^10.1.0" + collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -1892,6 +1901,11 @@ decamelize@^1.1.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== +decamelize@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" + integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== + decimal.js@^10.2.1: version "10.3.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" @@ -2047,9 +2061,9 @@ duplexer3@^0.1.4: integrity sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA== electron-to-chromium@^1.4.147: - version "1.4.152" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.152.tgz#7dedbe8f3dc1c597088982a203f392e60f7ee90a" - integrity sha512-jk4Ju5SGZAQQJ1iI4Rgru7dDlvkQPLpNPWH9gIZmwCD4YteA5Bbk1xPcPDUf5jUYs3e1e80RXdi8XgKQZaigeg== + version "1.4.154" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.154.tgz#d69c60499fc467a6c59591d29183e520afbc78a1" + integrity sha512-GbV9djOkrnj6xmW+YYVVEI3VCQnJ0pnSTu7TW2JyjKd5cakoiSaG5R4RbEtfaD92GsY10DzbU3GYRe+IOA9kqA== emittery@^0.8.1: version "0.8.1" @@ -3725,7 +3739,7 @@ jest-worker@^27.5.1: merge-stream "^2.0.0" supports-color "^8.0.0" -jest@^27.5.1: +jest@^27: version "27.5.1" resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== @@ -3832,6 +3846,25 @@ jsii-docgen@^4.2.44: semver "^7.3.5" yargs "^16.2.0" +jsii-pacmak@^1.60.1: + version "1.60.1" + resolved "https://registry.yarnpkg.com/jsii-pacmak/-/jsii-pacmak-1.60.1.tgz#be16f7962678ae9bc138d811f4ea02e729b1d1b4" + integrity sha512-7EvFAdvg7bD4WAMECfOGLK2LJNjCOecyyJQA82TUS518+4TqXsF6geXCo1hCD1wYgd8c/28zhrF36/VWrdzudw== + dependencies: + "@jsii/check-node" "1.60.1" + "@jsii/spec" "^1.60.1" + clone "^2.1.2" + codemaker "^1.60.1" + commonmark "^0.30.0" + escape-string-regexp "^4.0.0" + fs-extra "^10.1.0" + jsii-reflect "^1.60.1" + jsii-rosetta "^1.60.1" + semver "^7.3.7" + spdx-license-list "^6.5.0" + xmlbuilder "^15.1.1" + yargs "^16.2.0" + jsii-reflect@^1.52.1, jsii-reflect@^1.60.1: version "1.60.1" resolved "https://registry.yarnpkg.com/jsii-reflect/-/jsii-reflect-1.60.1.tgz#530af049b6bbdfddb4a6e95731e80ec5e0f0c941" @@ -3844,7 +3877,7 @@ jsii-reflect@^1.52.1, jsii-reflect@^1.60.1: oo-ascii-tree "^1.60.1" yargs "^16.2.0" -jsii-rosetta@^1.52.1: +jsii-rosetta@^1.52.1, jsii-rosetta@^1.60.1: version "1.60.1" resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.60.1.tgz#75f50279e3b075498fa5b004508a84d2bd35d971" integrity sha512-HZbQXv1vkAfKQhOK22E6EoBmHD1aJGqRoAEhO7X1gnl0oDx83/on8GcLIJ/GW5YEWa4sTKgX2CsMKmbmMFJufA== @@ -4920,10 +4953,10 @@ progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -projen@^0.50.21: - version "0.50.34" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.50.34.tgz#07ed3e14a71d4302a210902c467c4900ef75d6b4" - integrity sha512-o1herymMR4LmYMkdmPh3yBY8TZtMB5HTVR5GptDFKeRKnLr1Kz9KV/ENx7TB0yy1msBQ33EmKC4/EBn+TxFzxg== +projen@^0.58.12: + version "0.58.12" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.58.12.tgz#7f32601ca72220d7ba5a05976be9ec8ffaeb145e" + integrity sha512-YONZnguoYsKubJaQKtjQlsSh2UEUU3aBbmIzETHhdilVLPRMWajrSDneas++/bftj3dWN/71I4899w0K79KhJQ== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" @@ -4932,10 +4965,10 @@ projen@^0.50.21: fs-extra "^9.1.0" glob "^7" ini "^2.0.0" - semver "^7.3.5" + semver "^7.3.7" shx "^0.3.4" xmlbuilder2 "^2.4.1" - yaml "^1.10.2" + yaml "2.0.0" yargs "^16.2.0" promise-inflight@^1.0.1: @@ -5748,7 +5781,7 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -ts-jest@^27.1.5: +ts-jest@^27: version "27.1.5" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.5.tgz#0ddf1b163fbaae3d5b7504a1e65c914a95cff297" integrity sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA== @@ -6145,6 +6178,11 @@ xmlbuilder2@^2.4.1: "@types/node" "*" js-yaml "3.14.0" +xmlbuilder@^15.1.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + xmlchars@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" @@ -6170,6 +6208,11 @@ yaml@1.10.2, yaml@^1.10.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== +yaml@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.0.0.tgz#cbc588ad58e0cd924cd3f5f2b1a9485103048e25" + integrity sha512-JbfdlHKGP2Ik9IHylzWlGd4pPK++EU46/IxMykphS2ZKw7a7h+dHNmcXObLgpRDriBY+rpWslldikckX8oruWQ== + yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" From 0c216cf86feb95a7f3e04a98ad682ef9e7ac5e64 Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 16:34:28 +0200 Subject: [PATCH 5/6] fix: uncomment deps upgrade to keep github folder --- .projenrc.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.projenrc.js b/.projenrc.js index 696f703..bad890c 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -13,13 +13,13 @@ const project = new awscdk.AwsCdkConstructLibrary({ devDeps: [ '@types/prettier@2.6.0', // pin until breaking changes is resolved: https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60310 ], - depsUpgradeOptions: { - ignoreProjen: false, - workflowOptions: { - labels: ['auto-approve', 'auto-merge'], - secret: 'PROJEN_GITHUB_TOKEN', - }, - }, + // depsUpgradeOptions: { + // ignoreProjen: false, + // workflowOptions: { + // labels: ['auto-approve', 'auto-merge'], + // secret: 'PROJEN_GITHUB_TOKEN', + // }, + // }, github: false, publishToPypi: { distName: 'cdk-lambda-powertools-python-layer', From 2cb0ede28f85f948587f0cb02926065f21f859f1 Mon Sep 17 00:00:00 2001 From: Alexander Melnyk Date: Tue, 14 Jun 2022 17:25:52 +0200 Subject: [PATCH 6/6] deps: fix auto approve (#58) * mergify true to keep stuff * revert * fix: recreate workflows and keep it --- .gitattributes | 8 -------- .gitignore | 8 -------- .npmignore | 1 - .projen/files.json | 8 -------- .projenrc.js | 11 ----------- 5 files changed, 36 deletions(-) diff --git a/.gitattributes b/.gitattributes index ed4cff5..fb0de1f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,15 +3,7 @@ *.snap linguist-generated /.eslintrc.json linguist-generated /.gitattributes linguist-generated -/.github/pull_request_template.md linguist-generated -/.github/workflows/auto-approve.yml linguist-generated -/.github/workflows/build.yml linguist-generated -/.github/workflows/pull-request-lint.yml linguist-generated -/.github/workflows/release.yml linguist-generated -/.github/workflows/stale.yml linguist-generated -/.github/workflows/upgrade-main.yml linguist-generated /.gitignore linguist-generated -/.mergify.yml linguist-generated /.npmignore linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated diff --git a/.gitignore b/.gitignore index 0a42d2e..cf49900 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,6 @@ !/.projen/tasks.json !/.projen/deps.json !/.projen/files.json -!/.github/workflows/pull-request-lint.yml -!/.github/workflows/auto-approve.yml -!/.github/workflows/stale.yml !/package.json !/LICENSE !/.npmignore @@ -36,12 +33,8 @@ jspm_packages/ /test-reports/ junit.xml /coverage/ -!/.github/workflows/build.yml /dist/changelog.md /dist/version.txt -!/.github/workflows/release.yml -!/.mergify.yml -!/.github/pull_request_template.md !/test/ !/tsconfig.dev.json !/src/ @@ -51,4 +44,3 @@ junit.xml .jsii tsconfig.json !/API.md -!/.github/workflows/upgrade-main.yml diff --git a/.npmignore b/.npmignore index efe7d67..b0a0a9e 100644 --- a/.npmignore +++ b/.npmignore @@ -5,7 +5,6 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt -/.mergify.yml /test/ /tsconfig.dev.json /src/ diff --git a/.projen/files.json b/.projen/files.json index 0e6ca93..8178609 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -2,15 +2,7 @@ "files": [ ".eslintrc.json", ".gitattributes", - ".github/pull_request_template.md", - ".github/workflows/auto-approve.yml", - ".github/workflows/build.yml", - ".github/workflows/pull-request-lint.yml", - ".github/workflows/release.yml", - ".github/workflows/stale.yml", - ".github/workflows/upgrade-main.yml", ".gitignore", - ".mergify.yml", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/.projenrc.js b/.projenrc.js index bad890c..dce6185 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -13,22 +13,11 @@ const project = new awscdk.AwsCdkConstructLibrary({ devDeps: [ '@types/prettier@2.6.0', // pin until breaking changes is resolved: https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60310 ], - // depsUpgradeOptions: { - // ignoreProjen: false, - // workflowOptions: { - // labels: ['auto-approve', 'auto-merge'], - // secret: 'PROJEN_GITHUB_TOKEN', - // }, - // }, github: false, publishToPypi: { distName: 'cdk-lambda-powertools-python-layer', module: 'cdk_lambda_powertools_python_layer', }, - autoApproveOptions: { - secret: 'AUTOMATION_TOKEN', - allowedUsernames: ['am29d'], - }, license: 'MIT-0', copyrightOwner: 'Amazon.com, Inc. or its affiliates. All Rights Reserved.', });