@aws/nx-plugin 0.1.6 → 0.2.0

package/src/infra/app/__snapshots__/generator.spec.ts.snap

@@ -2,18 +2,7 @@
 
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
-  "@aws/pdk": "^0.25.7",
-  "aws-cdk": "^2.166.0",
-  "aws-cdk-lib": "^2.166.0",
-  "constructs": "^10.4.2",
-  "esbuild": "^0.24.0",
-  "source-map-support": "^0.5.21",
-}
-`;
-
-exports[`infra generator > should add required dependencies to package.json > dependencies 2`] = `
-{
-  "@aws/pdk": "^0.25.7",
+  "@cdklabs/cdk-validator-cfnguard": "^0.0.60",
   "aws-cdk": "^2.166.0",
   "aws-cdk-lib": "^2.166.0",
   "constructs": "^10.4.2",
@@ -23,81 +12,35 @@ exports[`infra generator > should add required dependencies to package.json > de
 `;
 
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
-{
-  "@eslint/js": "^9.8.0",
-  "@nx/eslint": "20.0.10",
-  "@nx/eslint-plugin": "20.0.10",
-  "eslint": "^9.8.0",
-  "eslint-config-prettier": "^9.0.0",
-  "tsx": "^4.19.2",
-  "typescript-eslint": "^8.0.0",
-}
-`;
-
-exports[`infra generator > should add required dependencies to package.json > dev-dependencies 2`] = `
 {
   "@eslint/js": "^9.8.0",
   "@nx/eslint": "20.3.1",
   "@nx/eslint-plugin": "20.3.1",
+  "@nx/js": "20.3.1",
+  "@nx/vite": "20.3.1",
+  "@nx/web": "20.3.1",
+  "@swc-node/register": "~1.9.1",
+  "@swc/core": "~1.5.7",
+  "@swc/helpers": "~0.5.11",
+  "@vitest/coverage-v8": "^1.0.4",
+  "@vitest/ui": "^1.3.1",
   "eslint": "^9.8.0",
   "eslint-config-prettier": "^9.0.0",
+  "eslint-plugin-prettier": "^5.2.2",
+  "jsdom": "~22.1.0",
+  "prettier": "^3.4.2",
   "tsx": "^4.19.2",
+  "typescript": "~5.6.2",
   "typescript-eslint": "^8.13.0",
+  "vite": "^5.0.0",
+  "vitest": "^1.3.1",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
   "dependencies": {
-    "@aws/pdk": "^0.25.7",
-    "aws-cdk": "^2.166.0",
-    "aws-cdk-lib": "^2.166.0",
-    "constructs": "^10.4.2",
-    "esbuild": "^0.24.0",
-    "source-map-support": "^0.5.21",
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.8.0",
-    "@nx/eslint": "20.0.10",
-    "@nx/eslint-plugin": "20.0.10",
-    "eslint": "^9.8.0",
-    "eslint-config-prettier": "^9.0.0",
-    "tsx": "^4.19.2",
-    "typescript-eslint": "^8.0.0",
-  },
-  "name": "@proj/source",
-  "type": "module",
-}
-`;
-
-exports[`infra generator > should add required dependencies to package.json > package-json 2`] = `
-{
-  "dependencies": {
-    "@aws/pdk": "^0.25.7",
-    "aws-cdk": "^2.166.0",
-    "aws-cdk-lib": "^2.166.0",
-    "constructs": "^10.4.2",
-    "esbuild": "^0.24.0",
-    "source-map-support": "^0.5.21",
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.8.0",
-    "@nx/eslint": "20.3.1",
-    "@nx/eslint-plugin": "20.3.1",
-    "eslint": "^9.8.0",
-    "eslint-config-prettier": "^9.0.0",
-    "tsx": "^4.19.2",
-    "typescript-eslint": "^8.13.0",
-  },
-  "name": "@proj/source",
-  "type": "module",
-}
-`;
-
-exports[`infra generator > should add required dependencies to package.json > package-json 3`] = `
-{
-  "dependencies": {
-    "@aws/pdk": "^0.25.7",
+    "@cdklabs/cdk-validator-cfnguard": "^0.0.60",
     "aws-cdk": "^2.166.0",
     "aws-cdk-lib": "^2.166.0",
     "constructs": "^10.4.2",
@@ -108,10 +51,24 @@ exports[`infra generator > should add required dependencies to package.json > pa
     "@eslint/js": "^9.8.0",
     "@nx/eslint": "20.3.1",
     "@nx/eslint-plugin": "20.3.1",
+    "@nx/js": "20.3.1",
+    "@nx/vite": "20.3.1",
+    "@nx/web": "20.3.1",
+    "@swc-node/register": "~1.9.1",
+    "@swc/core": "~1.5.7",
+    "@swc/helpers": "~0.5.11",
+    "@vitest/coverage-v8": "^1.0.4",
+    "@vitest/ui": "^1.3.1",
     "eslint": "^9.8.0",
     "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.2.2",
+    "jsdom": "~22.1.0",
+    "prettier": "^3.4.2",
     "tsx": "^4.19.2",
+    "typescript": "~5.6.2",
     "typescript-eslint": "^8.13.0",
+    "vite": "^5.0.0",
+    "vitest": "^1.3.1",
   },
   "name": "@proj/source",
   "type": "module",
@@ -193,12 +150,12 @@ exports[`infra generator > should configure project.json with correct targets >
       "executor": "@nx/eslint:lint",
     },
     "test": {
-      "executor": "@nx/jest:jest",
+      "executor": "@nx/vite:test",
       "options": {
-        "jestConfig": "packages/test/jest.config.ts",
+        "reportsDirectory": "../../coverage/packages/test",
       },
       "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}",
+        "{options.reportsDirectory}",
       ],
     },
   },
@@ -275,43 +232,24 @@ exports[`infra generator > should generate consistent file content across runs >
   }
 }
 ",
-  "src/main.ts": "import { CdkGraph, FilterPreset, Filters } from '@aws/pdk/cdk-graph';
-import { CdkGraphDiagramPlugin } from '@aws/pdk/cdk-graph-plugin-diagram';
-import { CdkGraphThreatComposerPlugin } from '@aws/pdk/cdk-graph-plugin-threat-composer';
-import { AwsPrototypingChecks, PDKNag } from '@aws/pdk/pdk-nag';
+  "src/main.ts": "import { App } from 'aws-cdk-lib';
 import { ApplicationStack } from './stacks/application-stack.js';
+import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
 
-/* eslint-disable @typescript-eslint/no-floating-promises */
-(async () => {
-  const app = PDKNag.app({
-    nagPacks: [new AwsPrototypingChecks()],
-  });
-
-  // Use this to deploy your own sandbox environment (assumes your CLI credentials)
-  new ApplicationStack(app, 'test-sandbox', {
-    env: {
-      account: process.env.CDK_DEFAULT_ACCOUNT,
-      region: process.env.CDK_DEFAULT_REGION,
-    },
-  });
-
-  const graph = new CdkGraph(app, {
-    plugins: [
-      new CdkGraphDiagramPlugin({
-        defaults: {
-          filterPlan: {
-            preset: FilterPreset.COMPACT,
-            filters: [{ store: Filters.pruneCustomResources() }],
-          },
-        },
-      }),
-      new CdkGraphThreatComposerPlugin(),
-    ],
-  });
+const app = new App({
+  policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
+});
+
+// Use this to deploy your own sandbox environment (assumes your CLI credentials)
+new ApplicationStack(app, 'test-sandbox', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: process.env.CDK_DEFAULT_REGION,
+  },
+  crossRegionReferences: true,
+});
 
-  app.synth();
-  await graph.report();
-})();
+app.synth();
 ",
   "src/stacks/application-stack.ts": "import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
@@ -413,43 +351,24 @@ exports[`infra generator > should generate files with correct content > cdk-json
 `;
 
 exports[`infra generator > should generate files with correct content > main-ts 1`] = `
-"import { CdkGraph, FilterPreset, Filters } from '@aws/pdk/cdk-graph';
-import { CdkGraphDiagramPlugin } from '@aws/pdk/cdk-graph-plugin-diagram';
-import { CdkGraphThreatComposerPlugin } from '@aws/pdk/cdk-graph-plugin-threat-composer';
-import { AwsPrototypingChecks, PDKNag } from '@aws/pdk/pdk-nag';
+"import { App } from 'aws-cdk-lib';
 import { ApplicationStack } from './stacks/application-stack.js';
+import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
 
-/* eslint-disable @typescript-eslint/no-floating-promises */
-(async () => {
-  const app = PDKNag.app({
-    nagPacks: [new AwsPrototypingChecks()],
-  });
-
-  // Use this to deploy your own sandbox environment (assumes your CLI credentials)
-  new ApplicationStack(app, 'test-sandbox', {
-    env: {
-      account: process.env.CDK_DEFAULT_ACCOUNT,
-      region: process.env.CDK_DEFAULT_REGION,
-    },
-  });
-
-  const graph = new CdkGraph(app, {
-    plugins: [
-      new CdkGraphDiagramPlugin({
-        defaults: {
-          filterPlan: {
-            preset: FilterPreset.COMPACT,
-            filters: [{ store: Filters.pruneCustomResources() }],
-          },
-        },
-      }),
-      new CdkGraphThreatComposerPlugin(),
-    ],
-  });
+const app = new App({
+  policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
+});
 
-  app.synth();
-  await graph.report();
-})();
+// Use this to deploy your own sandbox environment (assumes your CLI credentials)
+new ApplicationStack(app, 'test-sandbox', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: process.env.CDK_DEFAULT_REGION,
+  },
+  crossRegionReferences: true,
+});
+
+app.synth();
 "
 `;
 
@@ -544,10 +463,10 @@ exports[`infra generator > should generate files with correct content > project-
       "executor": "@nx/eslint:lint"
     },
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "executor": "@nx/vite:test",
+      "outputs": ["{options.reportsDirectory}"],
       "options": {
-        "jestConfig": "packages/test/jest.config.ts"
+        "reportsDirectory": "../../coverage/packages/test"
       }
     },
     "compile": {
@@ -570,43 +489,24 @@ exports[`infra generator > should generate files with correct content > project-
   }
 }
 ",
-  "src/main.ts": "import { CdkGraph, FilterPreset, Filters } from '@aws/pdk/cdk-graph';
-import { CdkGraphDiagramPlugin } from '@aws/pdk/cdk-graph-plugin-diagram';
-import { CdkGraphThreatComposerPlugin } from '@aws/pdk/cdk-graph-plugin-threat-composer';
-import { AwsPrototypingChecks, PDKNag } from '@aws/pdk/pdk-nag';
+  "src/main.ts": "import { App } from 'aws-cdk-lib';
 import { ApplicationStack } from './stacks/application-stack.js';
+import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
 
-/* eslint-disable @typescript-eslint/no-floating-promises */
-(async () => {
-  const app = PDKNag.app({
-    nagPacks: [new AwsPrototypingChecks()],
-  });
-
-  // Use this to deploy your own sandbox environment (assumes your CLI credentials)
-  new ApplicationStack(app, 'test-sandbox', {
-    env: {
-      account: process.env.CDK_DEFAULT_ACCOUNT,
-      region: process.env.CDK_DEFAULT_REGION,
-    },
-  });
-
-  const graph = new CdkGraph(app, {
-    plugins: [
-      new CdkGraphDiagramPlugin({
-        defaults: {
-          filterPlan: {
-            preset: FilterPreset.COMPACT,
-            filters: [{ store: Filters.pruneCustomResources() }],
-          },
-        },
-      }),
-      new CdkGraphThreatComposerPlugin(),
-    ],
-  });
+const app = new App({
+  policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
+});
 
-  app.synth();
-  await graph.report();
-})();
+// Use this to deploy your own sandbox environment (assumes your CLI credentials)
+new ApplicationStack(app, 'test-sandbox', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: process.env.CDK_DEFAULT_REGION,
+  },
+  crossRegionReferences: true,
+});
+
+app.synth();
 ",
   "src/stacks/application-stack.ts": "import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
@@ -698,43 +598,24 @@ exports[`infra generator > should generate valid CDK application code > cdk-json
 `;
 
 exports[`infra generator > should generate valid CDK application code > main-ts-content 1`] = `
-"import { CdkGraph, FilterPreset, Filters } from '@aws/pdk/cdk-graph';
-import { CdkGraphDiagramPlugin } from '@aws/pdk/cdk-graph-plugin-diagram';
-import { CdkGraphThreatComposerPlugin } from '@aws/pdk/cdk-graph-plugin-threat-composer';
-import { AwsPrototypingChecks, PDKNag } from '@aws/pdk/pdk-nag';
+"import { App } from 'aws-cdk-lib';
 import { ApplicationStack } from './stacks/application-stack.js';
+import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
 
-/* eslint-disable @typescript-eslint/no-floating-promises */
-(async () => {
-  const app = PDKNag.app({
-    nagPacks: [new AwsPrototypingChecks()],
-  });
-
-  // Use this to deploy your own sandbox environment (assumes your CLI credentials)
-  new ApplicationStack(app, 'test-sandbox', {
-    env: {
-      account: process.env.CDK_DEFAULT_ACCOUNT,
-      region: process.env.CDK_DEFAULT_REGION,
-    },
-  });
-
-  const graph = new CdkGraph(app, {
-    plugins: [
-      new CdkGraphDiagramPlugin({
-        defaults: {
-          filterPlan: {
-            preset: FilterPreset.COMPACT,
-            filters: [{ store: Filters.pruneCustomResources() }],
-          },
-        },
-      }),
-      new CdkGraphThreatComposerPlugin(),
-    ],
-  });
+const app = new App({
+  policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
+});
+
+// Use this to deploy your own sandbox environment (assumes your CLI credentials)
+new ApplicationStack(app, 'test-sandbox', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: process.env.CDK_DEFAULT_REGION,
+  },
+  crossRegionReferences: true,
+});
 
-  app.synth();
-  await graph.report();
-})();
+app.synth();
 "
 `;
 
@@ -822,43 +703,24 @@ exports[`infra generator > should handle custom project names correctly > custom
   }
 }
 ",
-  "src/main.ts": "import { CdkGraph, FilterPreset, Filters } from '@aws/pdk/cdk-graph';
-import { CdkGraphDiagramPlugin } from '@aws/pdk/cdk-graph-plugin-diagram';
-import { CdkGraphThreatComposerPlugin } from '@aws/pdk/cdk-graph-plugin-threat-composer';
-import { AwsPrototypingChecks, PDKNag } from '@aws/pdk/pdk-nag';
+  "src/main.ts": "import { App } from 'aws-cdk-lib';
 import { ApplicationStack } from './stacks/application-stack.js';
+import { CfnGuardValidator, RuleSet } from ':proj/common-constructs';
 
-/* eslint-disable @typescript-eslint/no-floating-promises */
-(async () => {
-  const app = PDKNag.app({
-    nagPacks: [new AwsPrototypingChecks()],
-  });
-
-  // Use this to deploy your own sandbox environment (assumes your CLI credentials)
-  new ApplicationStack(app, 'custom-infra-sandbox', {
-    env: {
-      account: process.env.CDK_DEFAULT_ACCOUNT,
-      region: process.env.CDK_DEFAULT_REGION,
-    },
-  });
-
-  const graph = new CdkGraph(app, {
-    plugins: [
-      new CdkGraphDiagramPlugin({
-        defaults: {
-          filterPlan: {
-            preset: FilterPreset.COMPACT,
-            filters: [{ store: Filters.pruneCustomResources() }],
-          },
-        },
-      }),
-      new CdkGraphThreatComposerPlugin(),
-    ],
-  });
+const app = new App({
+  policyValidationBeta1: [new CfnGuardValidator(RuleSet.AWS_PROTOTYPING)],
+});
+
+// Use this to deploy your own sandbox environment (assumes your CLI credentials)
+new ApplicationStack(app, 'custom-infra-sandbox', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: process.env.CDK_DEFAULT_REGION,
+  },
+  crossRegionReferences: true,
+});
 
-  app.synth();
-  await graph.report();
-})();
+app.synth();
 ",
   "src/stacks/application-stack.ts": "import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
@@ -922,12 +784,12 @@ exports[`infra generator > should handle custom project names correctly > custom
       "executor": "@nx/eslint:lint",
     },
     "test": {
-      "executor": "@nx/jest:jest",
+      "executor": "@nx/vite:test",
       "options": {
-        "jestConfig": "packages/custom-infra/jest.config.ts",
+        "reportsDirectory": "../../coverage/packages/custom-infra",
       },
       "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}",
+        "{options.reportsDirectory}",
       ],
     },
   },

package/src/infra/app/files/app/README.md.template

@@ -0,0 +1,76 @@
+# <%= fullyQualifiedName %>
+This library was generated with [@aws/nx-plugin](https://github.com/awslabs/nx-plugin-for-aws/).
+
+## Building
+
+Run `<%= pkgMgrCmd %> nx build <%= fullyQualifiedName %> [--skip-nx-cache]` to build the application.
+
+## Running unit tests
+
+Run `<%= pkgMgrCmd %> nx test <%= fullyQualifiedName %>` to execute the unit tests via Vitest.
+
+### Updating snapshots
+
+To update snapshots, run the following command:
+
+`<%= pkgMgrCmd %> nx test <%= fullyQualifiedName %> --configuration=update-snapshot`
+
+## Run lint
+
+Run `<%= pkgMgrCmd %> nx lint <%= fullyQualifiedName %>`
+
+### Fixable issues
+
+You can also automatically fix some lint errors by running the following command:
+
+`<%= pkgMgrCmd %> nx lint <%= fullyQualifiedName %> --configuration=fix`
+
+## Deploy to AWS
+
+### Deploy all Stacks
+
+Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> --all`
+
+### Deploy a single Stack
+
+Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> [stackName]`
+
+### Hotswap deployment
+
+> [!CAUTION]
+> Not to be used in production deployments
+
+Use the --hotswap flag with the deploy target to attempt to update your AWS resources directly instead of generating an AWS CloudFormation change set and deploying it. Deployment falls back to AWS CloudFormation deployment if hot swapping is not possible.
+
+Currently hot swapping supports Lambda functions, Step Functions state machines, and Amazon ECS container images. The --hotswap flag also disables rollback (i.e., implies --no-rollback).
+
+Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> --hotswap --all`
+
+## Cfn Guard Suppressions
+
+There may be instances where you want to suppress certain rules on resources. You can do this in two ways:
+
+### Supress a rule on a given construct
+
+```typescript
+import { suppressRule } from '<%= scopeAlias %>common-constructs';
+
+...
+// suppresses the RULE_NAME for the given construct.
+suppressRule(construct, 'RULE_NAME');
+```
+
+### Supress a rule on a descendant construct
+
+```typescript
+import { suppressRule } from '<%= scopeAlias %>common-constructs';
+
+...
+// Supresses the RULE_NAME for the construct or any of its descendants if it is an instance of Bucket
+suppressRule(construct, 'RULE_NAME', (construct) => construct instanceof Bucket);
+```
+
+## Useful links
+
+- [Infra reference docs](TODO)
+- [Learn more about NX](https://nx.dev/getting-started/intro)

package/src/infra/app/files/app/src/main.ts.template

@@ -0,0 +1,18 @@
+import { App } from 'aws-cdk-lib';
+import { ApplicationStack } from './stacks/application-stack.js';
+import { CfnGuardValidator, RuleSet } from '<%= scopeAlias %>common-constructs';
+
+const app = new App({
+  policyValidationBeta1: [new CfnGuardValidator(RuleSet.<%= ruleSet %>)]
+});
+
+// Use this to deploy your own sandbox environment (assumes your CLI credentials)
+new ApplicationStack(app, '<%= name %>-sandbox', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: process.env.CDK_DEFAULT_REGION,
+  },
+  crossRegionReferences: true
+});
+
+app.synth();