@aws/nx-plugin 0.1.6 → 0.2.1

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",
@@ -25,55 +14,33 @@ 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",
+  "@nx/eslint": "20.4.0",
+  "@nx/eslint-plugin": "20.4.0",
+  "@nx/js": "20.4.0",
+  "@nx/vite": "20.4.0",
+  "@nx/web": "20.4.0",
+  "@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-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",
-  "eslint": "^9.8.0",
-  "eslint-config-prettier": "^9.0.0",
-  "tsx": "^4.19.2",
-  "typescript-eslint": "^8.13.0",
+  "typescript": "~5.7.2",
+  "typescript-eslint": "^8.19.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",
+    "@cdklabs/cdk-validator-cfnguard": "^0.0.60",
     "aws-cdk": "^2.166.0",
     "aws-cdk-lib": "^2.166.0",
     "constructs": "^10.4.2",
@@ -82,55 +49,43 @@ exports[`infra generator > should add required dependencies to package.json > pa
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "20.3.1",
-    "@nx/eslint-plugin": "20.3.1",
+    "@nx/eslint": "20.4.0",
+    "@nx/eslint-plugin": "20.4.0",
+    "@nx/js": "20.4.0",
+    "@nx/vite": "20.4.0",
+    "@nx/web": "20.4.0",
+    "@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-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",
-    "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",
+    "typescript": "~5.7.2",
+    "typescript-eslint": "^8.19.0",
+    "vite": "^5.0.0",
+    "vitest": "^1.3.1",
   },
   "name": "@proj/source",
   "type": "module",
+  "workspaces": [
+    "packages/*",
+    "packages/common/*",
+  ],
 }
 `;
 
 exports[`infra generator > should configure project.json with correct targets > build-target 1`] = `
 {
-  "cache": true,
   "dependsOn": [
-    "^build",
-  ],
-  "executor": "nx:run-commands",
-  "options": {
-    "command": "cdk synth",
-    "cwd": "packages/test",
-  },
-  "outputs": [
-    "{workspaceRoot}/dist/packages/test/cdk.out",
+    "lint",
+    "compile",
+    "test",
+    "synth",
   ],
 }
 `;
@@ -155,17 +110,11 @@ exports[`infra generator > should configure project.json with correct targets >
   "tags": [],
   "targets": {
     "build": {
-      "cache": true,
       "dependsOn": [
-        "^build",
-      ],
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "cdk synth",
-        "cwd": "packages/test",
-      },
-      "outputs": [
-        "{workspaceRoot}/dist/packages/test/cdk.out",
+        "lint",
+        "compile",
+        "test",
+        "synth",
       ],
     },
     "compile": {
@@ -174,9 +123,9 @@ exports[`infra generator > should configure project.json with correct targets >
         "assets": [
           "packages/test/*.md",
         ],
-        "main": "packages/test/src/index.ts",
+        "main": "packages/test/src/main.ts",
         "outputPath": "dist/packages/test",
-        "tsConfig": "packages/test/tsconfig.lib.json",
+        "tsConfig": "packages/test/tsconfig.json",
       },
       "outputs": [
         "{options.outputPath}",
@@ -192,13 +141,27 @@ exports[`infra generator > should configure project.json with correct targets >
     "lint": {
       "executor": "@nx/eslint:lint",
     },
+    "synth": {
+      "cache": true,
+      "dependsOn": [
+        "^build",
+      ],
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "cdk synth",
+        "cwd": "packages/test",
+      },
+      "outputs": [
+        "{workspaceRoot}/dist/packages/test/cdk.out",
+      ],
+    },
     "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 +238,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 +357,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();
 "
 `;
 
@@ -531,33 +456,36 @@ exports[`infra generator > should generate files with correct content > project-
   "tags": [],
   "targets": {
     "build": {
-      "cache": true,
-      "executor": "nx:run-commands",
-      "outputs": ["{workspaceRoot}/dist/packages/test/cdk.out"],
-      "dependsOn": ["^build"],
+      "dependsOn": ["lint", "compile", "test", "synth"]
+    },
+    "compile": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
       "options": {
-        "cwd": "packages/test",
-        "command": "cdk synth"
+        "outputPath": "dist/packages/test",
+        "main": "packages/test/src/main.ts",
+        "tsConfig": "packages/test/tsconfig.json",
+        "assets": ["packages/test/*.md"]
       }
     },
     "lint": {
       "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": {
-      "executor": "@nx/js:tsc",
-      "outputs": ["{options.outputPath}"],
+    "synth": {
+      "cache": true,
+      "executor": "nx:run-commands",
+      "outputs": ["{workspaceRoot}/dist/packages/test/cdk.out"],
+      "dependsOn": ["^build"],
       "options": {
-        "outputPath": "dist/packages/test",
-        "main": "packages/test/src/index.ts",
-        "tsConfig": "packages/test/tsconfig.lib.json",
-        "assets": ["packages/test/*.md"]
+        "cwd": "packages/test",
+        "command": "cdk synth"
       }
     },
     "deploy": {
@@ -570,43 +498,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)],
+});
+
+// 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';
@@ -698,43 +607,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 +712,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)],
+});
 
-  app.synth();
-  await graph.report();
-})();
+// 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();
 ",
   "src/stacks/application-stack.ts": "import * as cdk from 'aws-cdk-lib';
 import { Construct } from 'constructs';
@@ -884,17 +755,11 @@ exports[`infra generator > should handle custom project names correctly > custom
   "tags": [],
   "targets": {
     "build": {
-      "cache": true,
       "dependsOn": [
-        "^build",
-      ],
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "cdk synth",
-        "cwd": "packages/custom-infra",
-      },
-      "outputs": [
-        "{workspaceRoot}/dist/packages/custom-infra/cdk.out",
+        "lint",
+        "compile",
+        "test",
+        "synth",
       ],
     },
     "compile": {
@@ -903,9 +768,9 @@ exports[`infra generator > should handle custom project names correctly > custom
         "assets": [
           "packages/custom-infra/*.md",
         ],
-        "main": "packages/custom-infra/src/index.ts",
+        "main": "packages/custom-infra/src/main.ts",
         "outputPath": "dist/packages/custom-infra",
-        "tsConfig": "packages/custom-infra/tsconfig.lib.json",
+        "tsConfig": "packages/custom-infra/tsconfig.json",
       },
       "outputs": [
         "{options.outputPath}",
@@ -921,13 +786,27 @@ exports[`infra generator > should handle custom project names correctly > custom
     "lint": {
       "executor": "@nx/eslint:lint",
     },
+    "synth": {
+      "cache": true,
+      "dependsOn": [
+        "^build",
+      ],
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "cdk synth",
+        "cwd": "packages/custom-infra",
+      },
+      "outputs": [
+        "{workspaceRoot}/dist/packages/custom-infra/cdk.out",
+      ],
+    },
     "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}",
       ],
     },
   },