Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: namespace all private packages #16689

Merged
merged 6 commits into from
Sep 29, 2021
Merged

chore: namespace all private packages #16689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c99b1c5
chore: namespace all private packages
RomainMuller Sep 28, 2021
eed25d3
Fix linter rules, etc... to match new naming
RomainMuller Sep 28, 2021
de8a77d
Merge remote-tracking branch 'origin/master' into rmuller/private-pac…
RomainMuller Sep 28, 2021
494a46d
explicit trailing space
RomainMuller Sep 29, 2021
d109026
Merge branch 'master' into rmuller/private-packages
RomainMuller Sep 29, 2021
a3577aa
fixup tools path
RomainMuller Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/pr-linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
uses: actions/checkout@v2

- name: Install & Build prlint
run: cd tools/prlint && yarn install --frozen-lockfile && yarn build+test
run: cd tools/@aws-cdk/prlint && yarn install --frozen-lockfile && yarn build+test

- name: Validate
uses: ./tools/prlint
uses: ./tools/@aws-cdk/prlint
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO_ROOT: ${{ github.workspace }}
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ The following linters are used:

#### eslint

All packages in the repo use a standard base configuration found at [eslintrc.js](tools/cdk-build-tools/config/eslintrc.js).
All packages in the repo use a standard base configuration found at [eslintrc.js](tools/@aws-cdk/cdk-build-tools/config/eslintrc.js).
This can be customized for any package by modifying the `.eslintrc` file found at its root.

If you're using the VS Code and would like to see eslint violations on it, install the [eslint
Expand Down Expand Up @@ -780,7 +780,7 @@ the feature flag.
A couple of [jest helper methods] are available for use with unit tests. These help run unit tests that test
behaviour when flags are enabled or disabled in the two major versions.

[jest helper methods]: https://github.com/aws/aws-cdk/blob/master/tools/cdk-build-tools/lib/feature-flag.ts
[jest helper methods]: https://github.com/aws/aws-cdk/blob/master/tools/@aws-cdk/cdk-build-tools/lib/feature-flag.ts

## Versioning and Release

Expand Down
1 change: 1 addition & 0 deletions lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"packages/@monocdk-experiment/*",
"packages/@aws-cdk/*/lambda-packages/*",
"tools/*",
"tools/@aws-cdk/*",
"scripts/script-tests"
],
"rejectCycles": "true",
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"include": "dependencies/node-version"
},
"scripts": {
"pkglint": "lerna --scope pkglint run build && lerna run pkglint",
"pkglint": "lerna --scope @aws-cdk/pkglint run build && lerna run pkglint",
"build": "./build.sh",
"pack": "./pack.sh",
"compat": "./scripts/check-api-compatibility.sh",
Expand Down Expand Up @@ -64,7 +64,8 @@
"packages/@monocdk-experiment/*",
"packages/@aws-cdk/*/lambda-packages/*",
"tools/*",
"scripts/script-tests"
"tools/@aws-cdk/*",
"scripts/@aws-cdk/script-tests"
],
"nohoist": [
"**/jszip",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-containers/ecs-service-extensions/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk-containers/ecs-service-extensions/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config');
const baseConfig = require('../../../tools/@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = {
...baseConfig,
coverageThreshold: {
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk-containers/ecs-service-extensions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"jest": "^26.6.3",
"pkglint": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@aws-cdk/assert-internal": "0.0.0"
},
"dependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk-containers/ecs-service-extensions/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@
"path": "../../@aws-cdk/assert"
},
{
"path": "../../../tools/cdk-build-tools"
"path": "../../../tools/@aws-cdk/cdk-build-tools"
},
{
"path": "../../../tools/cdk-integ-tools"
"path": "../../../tools/@aws-cdk/cdk-integ-tools"
},
{
"path": "../../../tools/cfn2ts"
"path": "../../../tools/@aws-cdk/cfn2ts"
},
{
"path": "../../../tools/pkglint"
"path": "../../../tools/@aws-cdk/pkglint"
}
],
"_generated_by_jsii_": "Generated by jsii - safe to delete, and ideally should be in .gitignore"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/alexa-ask/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/alexa-ask/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
10 changes: 5 additions & 5 deletions packages/@aws-cdk/alexa-ask/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
"@aws-cdk/assertions": "0.0.0"
"@aws-cdk/assertions": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/app-delivery/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config');
const baseConfig = require('../../../tools/@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
14 changes: 7 additions & 7 deletions packages/@aws-cdk/app-delivery/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@
"@aws-cdk/aws-codepipeline-actions": "0.0.0",
"@aws-cdk/aws-events": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"constructs": "^3.3.69"
},
"devDependencies": {
"@aws-cdk/assert-internal": "0.0.0",
"@aws-cdk/aws-s3": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"fast-check": "^2.17.0",
"jest": "^26.6.3",
"pkglint": "0.0.0",
"@aws-cdk/assert-internal": "0.0.0"
"jest": "^26.6.3"
},
"repository": {
"type": "git",
Expand All @@ -92,9 +92,9 @@
"@aws-cdk/aws-codepipeline-actions": "0.0.0",
"@aws-cdk/aws-events": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/cloud-assembly-schema": "0.0.0",
"constructs": "^3.3.69"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert-internal/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert-internal/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = {
...baseConfig,
coverageThreshold: {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/assert-internal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"jest": "^26.6.3",
"pkglint": "0.0.0",
"ts-jest": "^26.5.6"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assert/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = {
...baseConfig,
coverageThreshold: {
Expand Down
8 changes: 4 additions & 4 deletions packages/@aws-cdk/assert/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
},
"license": "Apache-2.0",
"devDependencies": {
"aws-cdk-migration": "0.0.0",
"@aws-cdk/assert-internal": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"aws-cdk-migration": "0.0.0",
"constructs": "^3.3.69",
"jest": "^26.6.3",
"pkglint": "0.0.0",
"@aws-cdk/assert-internal": "0.0.0",
"ts-jest": "^26.5.6"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assertions/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = {
...baseConfig,
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assertions/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = {
...baseConfig,
coverageThreshold: {
Expand Down
19 changes: 15 additions & 4 deletions packages/@aws-cdk/assertions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfnspec": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24",
"constructs": "^3.3.69",
"jest": "^26.6.3",
"pkglint": "0.0.0",
"ts-jest": "^26.5.6"
},
"dependencies": {
Expand Down Expand Up @@ -107,7 +107,18 @@
"node": ">= 10.13.0 <13 || >=13.7.0"
},
"nozem": {
"ostools": ["dirname", "cd", "bash", "rm", "xargs", "sed", "mkdir", "rsync", "cat", "find"],
"ostools": [
"dirname",
"cd",
"bash",
"rm",
"xargs",
"sed",
"mkdir",
"rsync",
"cat",
"find"
],
"additionalDirs": [
"../cfnspec/lib",
"ARTIFACTS:../cfnspec/spec",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/assets/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
4 changes: 2 additions & 2 deletions packages/@aws-cdk/assets/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const baseConfig = require('../../../tools/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
const baseConfig = require('../../../tools/@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
10 changes: 5 additions & 5 deletions packages/@aws-cdk/assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assertions": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cdk-integ-tools": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24",
"@types/sinon": "^9.0.11",
"aws-cdk": "0.0.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"jest": "^26.6.3",
"pkglint": "0.0.0",
"sinon": "^9.2.4",
"ts-mock-imports": "^1.3.7",
"@aws-cdk/assertions": "0.0.0"
"ts-mock-imports": "^1.3.7"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-accessanalyzer/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-accessanalyzer/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-accessanalyzer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
"@aws-cdk/assertions": "0.0.0"
"@aws-cdk/assertions": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-acmpca/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-acmpca/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-acmpca/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
"@aws-cdk/assertions": "0.0.0"
"@aws-cdk/assertions": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amazonmq/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amazonmq/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
10 changes: 5 additions & 5 deletions packages/@aws-cdk/aws-amazonmq/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/jest": "^26.0.24",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
"pkglint": "0.0.0",
"@aws-cdk/assertions": "0.0.0"
"@aws-cdk/assertions": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/cfn2ts": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^26.0.24"
},
"dependencies": {
"@aws-cdk/core": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amplify/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const baseConfig = require('cdk-build-tools/config/eslintrc');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc');
baseConfig.parserOptions.project = __dirname + '/tsconfig.json';
module.exports = baseConfig;
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-amplify/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const baseConfig = require('cdk-build-tools/config/jest.config');
const baseConfig = require('@aws-cdk/cdk-build-tools/config/jest.config');
module.exports = baseConfig;
Loading