Merge branch 'main' into redshift

packages/awslint/.eslintrc.js

@@ -35,7 +35,6 @@ module.exports = {
   ignorePatterns: ['*.js', '*.d.ts', 'node_modules/', '*.generated.ts'],
   rules: {
     '@aws-cdk/no-core-construct': ['error'],
-    '@aws-cdk/no-qualified-construct': ['error'],
     '@aws-cdk/invalid-cfn-imports': ['error'],
     // Require use of the `import { foo } from 'bar';` form instead of `import foo = require('bar');`
     '@typescript-eslint/no-require-imports': ['error'],

tools/@aws-cdk/cdk-build-tools/config/eslintrc.js

@@ -42,7 +42,6 @@ module.exports = {
   ignorePatterns: ['*.js', '*.d.ts', 'node_modules/', '*.generated.ts'],
   rules: {
     '@aws-cdk/no-core-construct': ['error'],
-    '@aws-cdk/no-qualified-construct': ['error'],
     '@aws-cdk/invalid-cfn-imports': ['error'],
     '@aws-cdk/no-literal-partition': ['error'],
     // Require use of the `import { foo } from 'bar';` form instead of `import foo = require('bar');`

tools/@aws-cdk/eslint-plugin/README.md

@@ -4,10 +4,16 @@ Eslint plugin for the CDK repository. Contains rules that need to be applied spe
 
 ## Rules
 
+* `invalid-cfn-imports`: Ensures that imports of `Cfn<Resource>` L1 resources come from the stable 
+  `aws-cdk-lib` package and not the alpha packages. Rule only applies to alpha modules.
+
 * `no-core-construct`: Forbid the use of `Construct` and `IConstruct` from the "@aws-cdk/core" module.
   Instead use `Construct` and `IConstruct` from the "constructs" module.
   Rule only applies to typescript files under the `test/` folder.
 
+* `no-literal-partition`: Forbids the use of literal partitions (usually `aws`). Instead, use
+  `Aws.PARTITION` to ensure that the code works for other partitions too.
+
 ## How to add new rules
 
 * Make a new file in `lib/rules`. It should export one function called `create`. The

tools/@aws-cdk/eslint-plugin/lib/index.ts

@@ -1,6 +1,5 @@
 export const rules = {
   'no-core-construct': require('./rules/no-core-construct'),
-  'no-qualified-construct': require('./rules/no-qualified-construct'),
   'invalid-cfn-imports': require('./rules/invalid-cfn-imports'),
   'no-literal-partition': require('./rules/no-literal-partition'),
 };

tools/@aws-cdk/pkglint/.eslintrc.js

@@ -35,7 +35,6 @@ module.exports = {
   ignorePatterns: ['*.js', '*.d.ts', 'node_modules/', '*.generated.ts'],
   rules: {
     '@aws-cdk/no-core-construct': ['error'],
-    '@aws-cdk/no-qualified-construct': ['error'],
     '@aws-cdk/invalid-cfn-imports': ['error'],
     // Require use of the `import { foo } from 'bar';` form instead of `import foo = require('bar');`
     '@typescript-eslint/no-require-imports': ['error'],