@aws/nx-plugin 1.0.0-rc.0 → 1.0.0-rc.10

package/src/smithy/ts/api/schema.d.ts

@@ -3,17 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { TsProjectGeneratorSchema } from '../../../ts/lib/schema';
-import { IacProviderOption } from '../../../utils/iac';
+import { IacOption } from '../../../utils/iac';
 
 export interface TsSmithyApiGeneratorSchema {
   name: string;
   namespace?: string;
-  // Only API Gateway REST APIs are supported by Smithy
-  // https://smithy.io/2.0/languages/typescript/ts-ssdk/supported-endpoints.html#amazon-api-gateway-rest-apis-and-aws-lambda
-  computeType: 'ServerlessApiGatewayRestApi';
+  infra: 'rest-lambda' | 'none';
   integrationPattern?: 'isolated' | 'shared';
-  auth: 'IAM' | 'Cognito' | 'Custom';
+  auth: 'iam' | 'cognito' | 'custom';
   directory?: TsProjectGeneratorSchema['directory'];
   subDirectory?: TsProjectGeneratorSchema['subDirectory'];
-  iacProvider: IacProviderOption;
+  iac: IacOption;
 }

package/src/smithy/ts/api/schema.json

@@ -19,14 +19,6 @@
       "description": "The namespace for the Smithy API. Defaults to your monorepo scope",
       "x-prompt": "What namespace would you like your API to have? i.e: com.example"
     },
-    "computeType": {
-      "type": "string",
-      "description": "The type of compute to use to deploy this API.",
-      "default": "ServerlessApiGatewayRestApi",
-      "enum": ["ServerlessApiGatewayRestApi"],
-      "x-prompt": "What compute type would you like to deploy your API with?",
-      "x-priority": "internal"
-    },
     "integrationPattern": {
       "type": "string",
       "description": "How API Gateway integrations are generated for the API. Choose between isolated (default) and shared.",
@@ -51,9 +43,9 @@
     },
     "auth": {
       "type": "string",
-      "description": "The method used to authenticate with your API. Choose between IAM (default), Cognito or Custom.",
-      "default": "IAM",
-      "enum": ["IAM", "Cognito", "Custom"],
+      "description": "The method used to authenticate with your API. Choose between iam (default), cognito or custom.",
+      "default": "iam",
+      "enum": ["iam", "cognito", "custom"],
       "x-prompt": "How would you like users to authenticate with your API?",
       "x-priority": "important"
     },
@@ -70,13 +62,21 @@
       "description": "The sub directory the project is placed in. By default this is the project name.",
       "x-prompt": "Which sub directory do you want to create the project in? (By default this is the project name)"
     },
-    "iacProvider": {
+    "iac": {
       "type": "string",
       "description": "The preferred IaC provider. By default this is inherited from your initial selection.",
-      "enum": ["Inherit", "CDK", "Terraform"],
+      "enum": ["inherit", "cdk", "terraform"],
       "x-priority": "important",
-      "default": "Inherit",
-      "x-prompt": "Which provider would you like to manage your infrastructure? (default: Inherit)"
+      "default": "inherit",
+      "x-prompt": "Which provider would you like to manage your infrastructure? (default: inherit)"
+    },
+    "infra": {
+      "type": "string",
+      "description": "The type of infrastructure to use to deploy this API.",
+      "default": "rest-lambda",
+      "enum": ["rest-lambda", "none"],
+      "x-prompt": "What infrastructure would you like to deploy your API with?",
+      "x-priority": "internal"
     }
   },
   "required": ["name"]

package/src/terraform/project/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree, GeneratorCallback } from '@nx/devkit';
-import { TerraformProjectGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TerraformProjectGeneratorSchema } from './schema';
 export declare const TERRAFORM_PROJECT_GENERATOR_INFO: NxGeneratorInfo;
 export declare function terraformProjectGenerator(tree: Tree, schema: TerraformProjectGeneratorSchema): Promise<GeneratorCallback>;
 export default terraformProjectGenerator;

package/src/terraform/project/generator.js

@@ -7,17 +7,17 @@ exports.terraformProjectGenerator = terraformProjectGenerator;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const generator_1 = require("../../ts/lib/generator");
 const path_1 = require("path");
-const object_1 = require("../../utils/object");
-const nx_1 = require("../../utils/nx");
+const generator_1 = require("../../ts/lib/generator");
 const git_1 = require("../../utils/git");
-const versions_1 = require("../../utils/versions");
 const metrics_1 = require("../../utils/metrics");
-const shared_constructs_1 = require("../../utils/shared-constructs");
+const names_1 = require("../../utils/names");
+const nx_1 = require("../../utils/nx");
+const object_1 = require("../../utils/object");
 const py_1 = require("../../utils/py");
+const shared_constructs_1 = require("../../utils/shared-constructs");
 const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
-const names_1 = require("../../utils/names");
+const versions_1 = require("../../utils/versions");
 const NX_EXTEND_PLUGIN = '@nx-extend/terraform';
 exports.TERRAFORM_PROJECT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 async function terraformProjectGenerator(tree, schema) {
@@ -178,7 +178,7 @@ async function terraformProjectGenerator(tree, schema) {
             dependsOn: ['init'],
         },
     };
-    (0, devkit_1.addProjectConfiguration)(tree, lib.fullyQualifiedName, {
+    const projectConfiguration = {
         root: lib.dir,
         projectType: schema.type,
         sourceRoot: (0, devkit_1.joinPathFragments)(lib.dir, 'src'),
@@ -186,7 +186,12 @@ async function terraformProjectGenerator(tree, schema) {
             ...libTargets,
             ...(schema.type === 'application' ? applicationTargets : {}),
         }),
-    });
+    };
+    // Only create the project configuration on first run; skip it on re-run so
+    // existing project.json customisations are preserved.
+    if (!(0, nx_1.projectExists)(tree, lib.fullyQualifiedName)) {
+        (0, devkit_1.addProjectConfiguration)(tree, lib.fullyQualifiedName, projectConfiguration);
+    }
     (0, nx_1.addGeneratorMetadata)(tree, lib.fullyQualifiedName, exports.TERRAFORM_PROJECT_GENERATOR_INFO);
     (0, devkit_1.generateFiles)(tree, // the virtual file system
     (0, devkit_1.joinPathFragments)(__dirname, `./files/${schema.type}`), // path to the file templates
@@ -205,7 +210,7 @@ async function terraformProjectGenerator(tree, schema) {
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     // Ensure shared constructs for Terraform are created
-    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iacProvider: 'Terraform' });
+    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iac: 'terraform' });
     // Add Terraform metrics
     await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
         exports.TERRAFORM_PROJECT_GENERATOR_INFO,

package/src/terraform/project/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/terraform/project/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/terraform/project/generator.ts"],"names":[],"mappings":";;;AA4CA,8DAkRC;AA9TD;;;GAGG;AACH,uCAcoB;AACpB,+BAAsC;AACtC,sDAAyD;AACzD,yCAAkD;AAClD,iDAAsE;AACtE,6CAA8C;AAC9C,uCAKwB;AACxB,+CAAoD;AACpD,uCAA4C;AAC5C,qEAA0E;AAC1E,yFAGiD;AACjD,mDAAoD;AAGpD,MAAM,gBAAgB,GAAG,sBAAsB,CAAC;AACnC,QAAA,gCAAgC,GAC3C,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,KAAK,UAAU,yBAAyB,CAC7C,IAAU,EACV,MAAuC;IAEvC,sDAAsD;IACtD,MAAM,GAAG,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,MAAM,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE;QACxE,IAAI,EAAE,mDAAqB;KAC5B,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG,IAAA,eAAQ,EACvC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAC/B,IAAI,CAAC,IAAI,CACV,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACtB,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAC/B,wBAAwB,EACxB,MAAM,EACN,eAAe,CAChB,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC1D,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,OAAO,EACP,SAAS,EACT,qBAAqB,CACtB,CAAC;IAEF,2EAA2E;IAC3E,0EAA0E;IAC1E,MAAM,iBAAiB,GAAG,IAAA,eAAQ,EAChC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAC/B,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,kDAAoB,EAAE,KAAK,EAAE,SAAS,CAAC,CACpE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEtB,IAAA,qBAAe,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAEtE,MAAM,kBAAkB,GAEpB;QACF,KAAK,EAAE;YACL,QAAQ,EAAE,iBAAiB;YAC3B,oBAAoB,EAAE,KAAK;YAC3B,cAAc,EAAE;gBACd,GAAG,EAAE;oBACH,OAAO,EAAE,mBAAmB,SAAS,aAAa;iBACnD;aACF;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;aACzB;YACD,SAAS,EAAE,CAAC,MAAM,CAAC;SACpB;QACD,SAAS,EAAE;YACT,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI;gBACpB,QAAQ,EAAE,CAAC,sDAAsD,CAAC;gBAClE,GAAG,EAAE,iBAAiB;aACvB;SACF;QACD,mBAAmB,EAAE;YACnB,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI;gBACpB,OAAO,EAAE,4BAA4B,SAAS,oBAAoB;gBAClE,GAAG,EAAE,yBAAyB;aAC/B;SACF;QACD,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,mBAAmB,QAAQ,CAAC;SAC3D;QACD,MAAM,EAAE;YACN,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,iBAAiB;YAC3B,oBAAoB,EAAE,KAAK;YAC3B,cAAc,EAAE;gBACd,GAAG,EAAE;oBACH,OAAO,EAAE,4CAA4C;iBACtD;aACF;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;aACzB;YACD,SAAS,EAAE,CAAC,MAAM,CAAC;SACpB;QACD,IAAI,EAAE;YACJ,QAAQ,EAAE,iBAAiB;YAC3B,oBAAoB,EAAE,KAAK;YAC3B,cAAc,EAAE;gBACd,GAAG,EAAE;oBACH,GAAG,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;iBACvB;aACF;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI;gBACpB,QAAQ,EAAE,CAAC,iDAAiD,CAAC;gBAC7D,GAAG,EAAE,iBAAiB;aACvB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB;QACD,MAAM,EAAE;YACN,QAAQ,EAAE,iBAAiB;YAC3B,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE;gBACP,OAAO,EAAE,wBAAwB;gBACjC,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;aACzB;SACF;QACD,IAAI,EAAE;YACJ,QAAQ,EAAE,iBAAiB;YAC3B,oBAAoB,EAAE,KAAK;YAC3B,cAAc,EAAE;gBACd,GAAG,EAAE;oBACH,QAAQ,EAAE;wBACR,YAAY,SAAS,EAAE;wBACvB,gDAAgD,SAAS,aAAa;qBACvE;iBACF;aACF;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;gBACxB,QAAQ,EAAE,KAAK;aAChB;YACD,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC;SACtD;KACF,CAAC;IAEF,MAAM,UAAU,GAEZ;QACF,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;SAC3B;QACD,GAAG,EAAE;YACH,QAAQ,EAAE,iBAAiB;YAC3B,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE;gBACP,OAAO,EAAE,eAAe;gBACxB,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;aACzB;SACF;QACD,IAAI,EAAE;YACJ,QAAQ,EAAE,iBAAiB;YAC3B,oBAAoB,EAAE,KAAK;YAC3B,cAAc,EAAE;gBACd,GAAG,EAAE;oBACH,OAAO,EAAE,gBAAgB;iBAC1B;aACF;YACD,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;aACzB;SACF;QACD,IAAI,EAAE;YACJ,QAAQ,EAAE,iBAAiB;YAC3B,KAAK,EAAE,IAAI;YACX,OAAO,EAAE,CAAC,4CAA4C,CAAC;YACvD,OAAO,EAAE;gBACP,OAAO,EAAE,IAAA,eAAU,EACjB,SAAS,EACT,2DAA2D,qBAAqB,EAAE,CACnF;gBACD,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;aACzB;SACF;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,iBAAiB;YAC3B,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE;gBACP,OAAO,EAAE,oBAAoB;gBAC7B,cAAc,EAAE,IAAI;gBACpB,GAAG,EAAE,mBAAmB;aACzB;YACD,SAAS,EAAE,CAAC,MAAM,CAAC;SACpB;KACF,CAAC;IAEF,MAAM,oBAAoB,GAAG;QAC3B,IAAI,EAAE,GAAG,CAAC,GAAG;QACb,WAAW,EAAE,MAAM,CAAC,IAAI;QACxB,UAAU,EAAE,IAAA,0BAAiB,EAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC;QAC7C,OAAO,EAAE,IAAA,uBAAc,EAAC;YACtB,GAAG,UAAU;YACb,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7D,CAAC;KACH,CAAC;IAEF,2EAA2E;IAC3E,sDAAsD;IACtD,IAAI,CAAC,IAAA,kBAAa,EAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACjD,IAAA,gCAAuB,EAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;IAC9E,CAAC;IACD,IAAA,yBAAoB,EAClB,IAAI,EACJ,GAAG,CAAC,kBAAkB,EACtB,wCAAgC,CACjC,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EAAE,0BAA0B;IAChC,IAAA,0BAAiB,EAAC,SAAS,EAAE,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,6BAA6B;IACrF,GAAG,CAAC,GAAG,EAAE,gCAAgC;IACzC;QACE,iBAAiB;QACjB,cAAc,EAAE,IAAA,iBAAS,EAAC,GAAG,CAAC,kBAAkB,CAAC;KAClD,EACD;QACE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS;KAC/C,CACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IACE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,OAAO,CAAC,KAAK,QAAQ;QACnB,CAAC,CAAC,CAAC,KAAK,gBAAgB;QACxB,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,gBAAgB,CAClC,EACD,CAAC;QACD,MAAM,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC/D,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,qDAAqD;IACrD,MAAM,IAAA,6CAAyB,EAAC,IAAI,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAE5D,wBAAwB;IACxB,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE;QAC1C,wCAAgC;KACjC,CAAC,CAAC;IAEH,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,IAAA,uBAAY,EAAC;QACX,sBAAsB;QACtB,cAAc;QACd,KAAK;QACL,oBAAoB;QACpB,qBAAqB;QACrB,+BAA+B;QAC/B,yBAAyB;QACzB,8BAA8B;KAC/B,CAAC,CACH,CAAC;IAEF,gFAAgF;IAChF,sDAAsD;IACtD,8EAA8E;IAC9E,IAAI,IAAA,6BAAoB,GAAE,KAAK,KAAK,EAAE,CAAC;QACrC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,WAAW,EAAE,EAAE;YAC/C,WAAW,CAAC,SAAS,GAAG;gBACtB,GAAG,WAAW,CAAC,SAAS;gBACxB,GAAG,IAAA,uBAAY,EAAC,CAAC,YAAY,CAAC,CAAC;aAChC,CAAC;YACF,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AACD,kBAAe,yBAAyB,CAAC"}

package/src/trpc/backend/__snapshots__/generator.spec.ts.snap

@@ -2967,7 +2967,7 @@ export class IntegrationBuilder<
 "
 `;
 
-exports[`trpc backend generator > terraform iacProvider > should generate terraform files for HTTP API with Cognito auth and snapshot them > terraform-http-cognito-files 1`] = `
+exports[`trpc backend generator > terraform iac > should generate terraform files for HTTP API with Cognito auth and snapshot them > terraform-http-cognito-files 1`] = `
 {
   "http-api.tf": "# Core HTTP API Gateway module
 # This module creates the API Gateway HTTP API, stage, and logging resources
@@ -3620,7 +3620,7 @@ output "api_log_group_arn" {
 }
 `;
 
-exports[`trpc backend generator > terraform iacProvider > should generate terraform files for HTTP API with Custom auth and snapshot them > terraform-http-custom-files 1`] = `
+exports[`trpc backend generator > terraform iac > should generate terraform files for HTTP API with Custom auth and snapshot them > terraform-http-custom-files 1`] = `
 {
   "http-api.tf": "# Core HTTP API Gateway module
 # This module creates the API Gateway HTTP API, stage, and logging resources
@@ -4345,7 +4345,7 @@ output "api_log_group_arn" {
 }
 `;
 
-exports[`trpc backend generator > terraform iacProvider > should generate terraform files for HTTP API with IAM auth and snapshot them > terraform-http-iam-files 1`] = `
+exports[`trpc backend generator > terraform iac > should generate terraform files for HTTP API with IAM auth and snapshot them > terraform-http-iam-files 1`] = `
 {
   "http-api.tf": "# Core HTTP API Gateway module
 # This module creates the API Gateway HTTP API, stage, and logging resources
@@ -4975,7 +4975,7 @@ output "api_log_group_arn" {
 }
 `;
 
-exports[`trpc backend generator > terraform iacProvider > should generate terraform files for REST API with Cognito auth and snapshot them > terraform-rest-cognito-files 1`] = `
+exports[`trpc backend generator > terraform iac > should generate terraform files for REST API with Cognito auth and snapshot them > terraform-rest-cognito-files 1`] = `
 {
   "rest-api.tf": "# Core REST API Gateway module
 # This module creates the API Gateway REST API, deployment, stage, and logging resources
@@ -5771,7 +5771,7 @@ output "lambda_log_group_arn" {
 }
 `;
 
-exports[`trpc backend generator > terraform iacProvider > should generate terraform files for REST API with IAM auth and snapshot them > terraform-rest-iam-files 1`] = `
+exports[`trpc backend generator > terraform iac > should generate terraform files for REST API with IAM auth and snapshot them > terraform-rest-iam-files 1`] = `
 {
   "rest-api.tf": "# Core REST API Gateway module
 # This module creates the API Gateway REST API, deployment, stage, and logging resources
@@ -6559,7 +6559,7 @@ output "lambda_log_group_arn" {
 }
 `;
 
-exports[`trpc backend generator > terraform iacProvider > should generate terraform files for REST API with None auth and snapshot them > terraform-rest-none-files 1`] = `
+exports[`trpc backend generator > terraform iac > should generate terraform files for REST API with None auth and snapshot them > terraform-rest-none-files 1`] = `
 {
   "rest-api.tf": "# Core REST API Gateway module
 # This module creates the API Gateway REST API, deployment, stage, and logging resources

package/src/trpc/backend/files/src/client/index.ts.template

@@ -3,13 +3,13 @@ import {
   httpLink,
   HTTPLinkOptions,
 } from '@trpc/client';
-<%_ if (auth === 'IAM') { _%>
+<%_ if (auth === 'iam') { _%>
 import { AwsClient } from 'aws4fetch';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
 <%_ } _%>
 import { AppRouter } from "../router.js";
 
-<%_ if (auth === 'IAM') { %>
+<%_ if (auth === 'iam') { %>
 const credentialProvider = fromNodeProviderChain();
 
 const sigv4Fetch = (async (...args) => {
@@ -20,7 +20,7 @@ const sigv4Fetch = (async (...args) => {
 <%_ } _%>
 export interface <%= apiNameClassName %>ClientConfig {
   readonly url: string;
-  <%_ if (auth === 'Cognito') { _%>
+  <%_ if (auth === 'cognito') { _%>
   readonly token: string;
   <%_ } _%>
 }
@@ -28,9 +28,9 @@ export interface <%= apiNameClassName %>ClientConfig {
 export const create<%= apiNameClassName %>Client = (config: <%= apiNameClassName %>ClientConfig) => {
   const linkOptions: HTTPLinkOptions<any> = {
     url: config.url,
-    <%_ if (auth === 'IAM') { _%>
+    <%_ if (auth === 'iam') { _%>
     fetch: sigv4Fetch,
-    <%_ } else if (auth === 'Cognito') { _%>
+    <%_ } else if (auth === 'cognito') { _%>
     headers: {
       Authorization: `Bearer ${config.token}`,
     },

package/src/trpc/backend/files/src/handler.ts.template

@@ -1,6 +1,6 @@
 import {
   CreateAWSLambdaContextOptions,
-  <%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
+  <%_ if (infra === 'rest-lambda') { _%>
   awsLambdaStreamingRequestHandler,
   <%_ } else { _%>
   awsLambdaRequestHandler,
@@ -9,7 +9,7 @@ import {
 import type { <%- apiGatewayEventType %> } from 'aws-lambda';
 import { appRouter } from './router.js';
 
-<%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
+<%_ if (infra === 'rest-lambda') { _%>
 export const handler = awslambda.streamifyResponse(
   awsLambdaStreamingRequestHandler({
     router: appRouter,

package/src/trpc/backend/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { TsTrpcApiGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TsTrpcApiGeneratorSchema } from './schema';
 export declare const TRPC_BACKEND_GENERATOR_INFO: NxGeneratorInfo;
 export declare function tsTrpcApiGenerator(tree: Tree, options: TsTrpcApiGeneratorSchema): Promise<() => void>;
 export default tsTrpcApiGenerator;

package/src/trpc/backend/generator.js

@@ -8,43 +8,53 @@ const tslib_1 = require("tslib");
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const shared_constructs_1 = require("../../utils/shared-constructs");
 const generator_1 = tslib_1.__importDefault(require("../../ts/lib/generator"));
-const npm_scope_1 = require("../../utils/npm-scope");
-const versions_1 = require("../../utils/versions");
-const names_1 = require("../../utils/names");
+const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
+const bundle_1 = require("../../utils/bundle/bundle");
 const format_1 = require("../../utils/format");
-const pkg_manager_1 = require("../../utils/pkg-manager");
-const object_1 = require("../../utils/object");
-const nx_1 = require("../../utils/nx");
+const iac_1 = require("../../utils/iac");
 const metrics_1 = require("../../utils/metrics");
-const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
+const names_1 = require("../../utils/names");
+const npm_scope_1 = require("../../utils/npm-scope");
+const nx_1 = require("../../utils/nx");
+const object_1 = require("../../utils/object");
+const pkg_manager_1 = require("../../utils/pkg-manager");
 const port_1 = require("../../utils/port");
-const iac_1 = require("../../utils/iac");
-const bundle_1 = require("../../utils/bundle/bundle");
+const shared_constructs_1 = require("../../utils/shared-constructs");
+const versions_1 = require("../../utils/versions");
 exports.TRPC_BACKEND_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const VALID_TRPC_INTEGRATION_PERMUTATIONS = new Set([
-    'ServerlessApiGatewayRestApi::isolated',
-    'ServerlessApiGatewayRestApi::shared',
-    'ServerlessApiGatewayHttpApi::isolated',
-    'ServerlessApiGatewayHttpApi::shared',
+    'rest-lambda::isolated',
+    'rest-lambda::shared',
+    'http-lambda::isolated',
+    'http-lambda::shared',
+    'none::isolated',
+    'none::shared',
 ]);
 async function tsTrpcApiGenerator(tree, options) {
-    validateTrpcComputeTypeAndIntegrationPatternCombination(options);
-    const iacProvider = await (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
-    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-        iacProvider,
-    });
+    if (options.infra !== 'none') {
+        validateTrpcInfraAndIntegrationPatternCombination(options);
+    }
     const apiNamespace = (0, npm_scope_1.getNpmScopePrefix)(tree);
     const apiNameKebabCase = (0, names_1.kebabCase)(options.name);
     const apiNameClassName = (0, names_1.toClassName)(options.name);
     const backendName = apiNameKebabCase;
     const backendProjectName = `${apiNamespace}${backendName}`;
-    await (0, generator_1.default)(tree, {
-        name: backendName,
-        directory: options.directory,
-        subDirectory: options.subDirectory,
-    });
+    let projectExists;
+    try {
+        (0, nx_1.readProjectConfigurationUnqualified)(tree, backendProjectName);
+        projectExists = true;
+    }
+    catch {
+        projectExists = false;
+    }
+    if (!projectExists) {
+        await (0, generator_1.default)(tree, {
+            name: backendName,
+            directory: options.directory,
+            subDirectory: options.subDirectory,
+        });
+    }
     const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, backendProjectName);
     const backendRoot = projectConfig.root;
     const port = (0, port_1.assignPort)(tree, projectConfig, 2022);
@@ -59,29 +69,35 @@ async function tsTrpcApiGenerator(tree, options) {
         port,
         ...options,
     };
-    await (0, api_constructs_1.addApiGatewayInfra)(tree, {
-        apiProjectName: backendProjectName,
-        apiNameClassName,
-        apiNameKebabCase,
-        constructType: options.computeType === 'ServerlessApiGatewayHttpApi' ? 'http' : 'rest',
-        backend: {
-            type: 'trpc',
-            projectAlias: enhancedOptions.backendProjectAlias,
-            bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle'),
-            integrationPattern: getIntegrationPattern(options),
-            ...(options.auth === 'Custom' && {
-                authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle', 'authorizer'),
-            }),
-        },
-        auth: options.auth,
-        iacProvider,
-    });
+    if (options.infra !== 'none') {
+        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
+        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
+            iac,
+        });
+        await (0, api_constructs_1.addApiGatewayInfra)(tree, {
+            apiProjectName: backendProjectName,
+            apiNameClassName,
+            apiNameKebabCase,
+            constructType: options.infra === 'http-lambda' ? 'http' : 'rest',
+            backend: {
+                type: 'trpc',
+                projectAlias: enhancedOptions.backendProjectAlias,
+                bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle'),
+                integrationPattern: getIntegrationPattern(options),
+                ...(options.auth === 'custom' && {
+                    authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle', 'authorizer'),
+                }),
+            },
+            auth: options.auth,
+            iac,
+        });
+    }
     projectConfig.metadata = {
         ...projectConfig.metadata,
         apiName: options.name,
         apiType: 'trpc',
         auth: options.auth,
-        computeType: options.computeType,
+        infra: options.infra,
         integrationPattern: getIntegrationPattern(options),
     };
     projectConfig.targets.serve = {
@@ -93,6 +109,7 @@ async function tsTrpcApiGenerator(tree, options) {
         continuous: true,
     };
     projectConfig.targets['serve-local'] = {
+        ...projectConfig.targets['serve-local'],
         ...projectConfig.targets.serve,
         options: {
             ...projectConfig.targets.serve.options,
@@ -101,32 +118,34 @@ async function tsTrpcApiGenerator(tree, options) {
             },
         },
     };
-    await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
-        targetFilePath: 'src/handler.ts',
-        external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
-    });
-    if (options.auth === 'Custom') {
+    if (options.infra !== 'none') {
         await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
-            targetFilePath: 'src/authorizer.ts',
-            bundleOutputDir: 'authorizer',
-            external: [/@aws-sdk\/.*/],
+            targetFilePath: 'src/handler.ts',
+            external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
         });
+        if (options.auth === 'custom') {
+            await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
+                targetFilePath: 'src/authorizer.ts',
+                bundleOutputDir: 'authorizer',
+                external: [/@aws-sdk\/.*/],
+            });
+        }
+        (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
     }
-    (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
     projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
     (0, devkit_1.updateProjectConfiguration)(tree, projectConfig.name, projectConfig);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), backendRoot, enhancedOptions, {
         overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
     });
     tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'lib'));
-    if (options.auth === 'Custom') {
-        const authorizerType = options.computeType === 'ServerlessApiGatewayHttpApi' ? 'http' : 'rest';
+    if (options.infra !== 'none' && options.auth === 'custom') {
+        const authorizerType = options.infra === 'http-lambda' ? 'http' : 'rest';
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'cdk', 'authorizer', authorizerType), (0, devkit_1.joinPathFragments)(backendRoot, 'src'), {}, {
             overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
         });
     }
     // Remove streaming schema helper for HTTP APIs (API Gateway HTTP API doesn't support streaming)
-    if (options.computeType !== 'ServerlessApiGatewayRestApi') {
+    if (options.infra !== 'rest-lambda' && options.infra !== 'none') {
         tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'schema', 'z-async-iterable.ts'));
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
@@ -141,7 +160,7 @@ async function tsTrpcApiGenerator(tree, options) {
         '@trpc/client',
         'aws4fetch',
         '@aws-sdk/credential-providers',
-        ...(options.auth === 'Custom'
+        ...(options.auth === 'custom'
             ? ['@middy/core', '@aws-lambda-powertools/parser']
             : []),
     ]), (0, versions_1.withVersions)(['@types/aws-lambda', 'tsx', 'cors', '@types/cors']));
@@ -153,24 +172,24 @@ async function tsTrpcApiGenerator(tree, options) {
         (0, devkit_1.installPackagesTask)(tree);
     };
 }
-const validateTrpcComputeTypeAndIntegrationPatternCombination = (options) => {
+const validateTrpcInfraAndIntegrationPatternCombination = (options) => {
     const integrationPattern = getIntegrationPattern(options);
-    const permutation = `${options.computeType}::${integrationPattern}`;
+    const permutation = `${options.infra}::${integrationPattern}`;
     if (!VALID_TRPC_INTEGRATION_PERMUTATIONS.has(permutation)) {
-        throw new Error(`Invalid tRPC computeType/integrationPattern combination: ${options.computeType} + ${integrationPattern}.`);
+        throw new Error(`Invalid tRPC infra/integrationPattern combination: ${options.infra} + ${integrationPattern}.`);
     }
 };
 const getIntegrationPattern = (options) => {
     return options.integrationPattern ?? 'isolated';
 };
 const getApiGatewayEventType = (options) => {
-    if (options.computeType === 'ServerlessApiGatewayRestApi') {
+    if (options.infra === 'rest-lambda') {
         return 'APIGatewayProxyEvent';
     }
-    if (options.auth === 'IAM') {
+    if (options.auth === 'iam') {
         return 'APIGatewayProxyEventV2WithIAMAuthorizer';
     }
-    else if (options.auth === 'Cognito') {
+    else if (options.auth === 'cognito') {
         return 'APIGatewayProxyEventV2WithJWTAuthorizer';
     }
     return 'APIGatewayProxyEventV2';

package/src/trpc/backend/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}

package/src/trpc/backend/schema.d.ts

@@ -2,16 +2,16 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Linter } from '@nx/eslint';
-import { IacProviderOption } from '../../utils/iac';
+
 import { TsProjectGeneratorSchema } from '../../ts/lib/schema';
+import { IacOption } from '../../utils/iac';
 
 export interface TsTrpcApiGeneratorSchema {
   name: string;
-  computeType: 'ServerlessApiGatewayRestApi' | 'ServerlessApiGatewayHttpApi';
+  infra: 'rest-lambda' | 'http-lambda' | 'none';
   integrationPattern?: 'isolated' | 'shared';
-  auth: 'IAM' | 'Cognito' | 'Custom';
+  auth: 'iam' | 'cognito' | 'custom';
   directory?: TsProjectGeneratorSchema['directory'];
   subDirectory?: TsProjectGeneratorSchema['subDirectory'];
-  iacProvider: IacProviderOption;
+  iac: IacOption;
 }