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

package/src/utils/api-constructs/files/cdk/app/apis/rest/__apiNameKebabCase__.ts.template

@@ -19,10 +19,10 @@ import {
   <%_ if (['trpc', 'fastapi'].includes(backend.type)) { _%>
   ResponseTransferMode,
   <%_ } _%>
-  <%_ if (auth === 'Cognito') { _%>
+  <%_ if (auth === 'cognito') { _%>
   CognitoUserPoolsAuthorizer,
   <%_ } _%>
-  <%_ if (auth === 'Custom') { _%>
+  <%_ if (auth === 'custom') { _%>
   TokenAuthorizer,
   <%_ } _%>
 } from 'aws-cdk-lib/aws-apigateway';
@@ -32,12 +32,12 @@ import {
   PolicyStatement,
   Effect,
   AnyPrincipal,
-  <%_ if (auth === 'IAM') { _%>
+  <%_ if (auth === 'iam') { _%>
   IGrantable,
   Grant,
   <%_ } _%>
 } from 'aws-cdk-lib/aws-iam';
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
 import { IUserPool } from 'aws-cdk-lib/aws-cognito';
 <%_ } _%>
 import {
@@ -71,7 +71,7 @@ export interface <%= apiNameClassName %>Props<
    * Map of operation names to their API Gateway integrations
    */
   integrations: TIntegrations;
-  <%_ if (auth === 'Cognito') { _%>
+  <%_ if (auth === 'cognito') { _%>
   /**
    * Identity details for Cognito Authentication
    */
@@ -195,7 +195,7 @@ export class <%= apiNameClassName %><
     id: string,
     props: <%= apiNameClassName %>Props<TIntegrations>,
   ) {
-    <%_ if (auth === 'Custom') { _%>
+    <%_ if (auth === 'custom') { _%>
     const authorizerFunction = new Function(scope, '<%= apiNameClassName %>AuthorizerFunction', {
       <%_ if (['trpc', 'smithy'].includes(backend.type)) { _%>
       runtime: Runtime.NODEJS_LATEST,
@@ -228,14 +228,14 @@ export class <%= apiNameClassName %><
     super(scope, id, {
       apiName: '<%= apiNameClassName %>',
       defaultMethodOptions: {
-        <%_ if (auth === 'IAM') { _%>
+        <%_ if (auth === 'iam') { _%>
         authorizationType: AuthorizationType.IAM,
-        <%_ } else if (auth === 'Cognito') { _%>
+        <%_ } else if (auth === 'cognito') { _%>
         authorizationType: AuthorizationType.COGNITO,
         authorizer: new CognitoUserPoolsAuthorizer(scope, '<%= apiNameClassName %>Authorizer', {
           cognitoUserPools: [props.identity.userPool],
         }),
-        <%_ } else if (auth === 'Custom') { _%>
+        <%_ } else if (auth === 'custom') { _%>
         authorizationType: AuthorizationType.CUSTOM,
         authorizer: new TokenAuthorizer(scope, '<%= apiNameClassName %>TokenAuthorizer', {
           handler: authorizerFunction,
@@ -247,7 +247,7 @@ export class <%= apiNameClassName %><
       },
       policy: new PolicyDocument({
         statements: [
-          <%_ if (auth === 'IAM') { _%>
+          <%_ if (auth === 'iam') { _%>
           // Open up OPTIONS to allow browsers to make unauthenticated preflight requests
           new PolicyStatement({
             effect: Effect.ALLOW,
@@ -256,7 +256,7 @@ export class <%= apiNameClassName %><
             resources: ['execute-api:/*/OPTIONS/*'],
           }),
           <%_ } else { _%>
-          // Allow all callers to invoke the API in the resource policy<% if (auth === 'Cognito') { %>, since auth is handled by Cognito<% } else if (auth === 'Custom') { %>, since auth is handled by the Lambda Authorizer<% } %>
+          // Allow all callers to invoke the API in the resource policy<% if (auth === 'cognito') { %>, since auth is handled by Cognito<% } else if (auth === 'custom') { %>, since auth is handled by the Lambda Authorizer<% } %>
           new PolicyStatement({
             effect: Effect.ALLOW,
             principals: [new AnyPrincipal()],
@@ -308,7 +308,7 @@ export class <%= apiNameClassName %><
       }
     });
   }
-  <%_ if (auth === 'IAM') { _%>
+  <%_ if (auth === 'iam') { _%>
 
   /**
    * Grants IAM permissions to invoke any method on this API.

package/src/utils/api-constructs/files/terraform/app/apis/http/__apiNameKebabCase__/__apiNameKebabCase__.tf.template

@@ -9,7 +9,7 @@ terraform {
   }
 }
 
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
 # Authentication Configuration
 variable "user_pool_id" {
   description = "Cognito User Pool ID for authentication"
@@ -254,7 +254,7 @@ resource "aws_lambda_alias" "live" {
 }
 <%_ } _%>
 
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
 # Cognito User Pool Authorizer
 resource "aws_apigatewayv2_authorizer" "cognito_authorizer" {
   api_id           = module.http_api.api_id
@@ -267,7 +267,7 @@ resource "aws_apigatewayv2_authorizer" "cognito_authorizer" {
     issuer   = "https://cognito-idp.${data.aws_region.current.region}.amazonaws.com/${var.user_pool_id}"
   }
 }
-<%_ } else if (auth === 'Custom') { _%>
+<%_ } else if (auth === 'custom') { _%>
 # Custom Lambda Authorizer
 resource "aws_lambda_function" "authorizer_lambda" {
   #checkov:skip=CKV_AWS_117:Lambda function does not need to be in VPC for this use case
@@ -407,17 +407,17 @@ resource "aws_apigatewayv2_route" "proxy_routes" {
   route_key = "${each.key} /{proxy+}"
   target    = "integrations/${aws_apigatewayv2_integration.lambda_integration.id}"
 
-  <%_ if (auth === 'IAM') { _%>
+  <%_ if (auth === 'iam') { _%>
   authorization_type = "AWS_IAM"
-  <%_ } else if (auth === 'Cognito') { _%>
+  <%_ } else if (auth === 'cognito') { _%>
   authorization_type = "JWT"
   authorizer_id      = aws_apigatewayv2_authorizer.cognito_authorizer.id
-  <%_ } else if (auth === 'Custom') { _%>
+  <%_ } else if (auth === 'custom') { _%>
   authorization_type = "CUSTOM"
   authorizer_id      = aws_apigatewayv2_authorizer.custom_authorizer.id
   <%_ } _%>
 
-  depends_on = [aws_apigatewayv2_integration.lambda_integration<% if (auth === 'Cognito') { %>, aws_apigatewayv2_authorizer.cognito_authorizer<% } else if (auth === 'Custom') { %>, aws_apigatewayv2_authorizer.custom_authorizer<% } %>]
+  depends_on = [aws_apigatewayv2_integration.lambda_integration<% if (auth === 'cognito') { %>, aws_apigatewayv2_authorizer.cognito_authorizer<% } else if (auth === 'custom') { %>, aws_apigatewayv2_authorizer.custom_authorizer<% } %>]
 }
 
 # Add API url to runtime config

package/src/utils/api-constructs/files/terraform/app/apis/rest/__apiNameKebabCase__/__apiNameKebabCase__.tf.template

@@ -9,7 +9,7 @@ terraform {
   }
 }
 
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
 # Authentication Configuration
 variable "user_pool_id" {
   description = "Cognito User Pool ID for authentication"
@@ -251,7 +251,7 @@ resource "aws_lambda_alias" "live" {
 }
 <%_ } _%>
 
-<%_ if (auth === 'Cognito') { _%>
+<%_ if (auth === 'cognito') { _%>
 # Cognito User Pool Authorizer
 resource "aws_api_gateway_authorizer" "cognito_authorizer" {
   name                   = "<%- apiNameClassName %>Authorizer-${random_string.suffix.result}"
@@ -260,7 +260,7 @@ resource "aws_api_gateway_authorizer" "cognito_authorizer" {
   provider_arns         = ["arn:aws:cognito-idp:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:userpool/${var.user_pool_id}"]
   identity_source       = "method.request.header.Authorization"
 }
-<%_ } else if (auth === 'Custom') { _%>
+<%_ } else if (auth === 'custom') { _%>
 # Custom Lambda Authorizer
 resource "aws_lambda_function" "authorizer_lambda" {
   #checkov:skip=CKV_AWS_117:Lambda function does not need to be in VPC for this use case
@@ -408,12 +408,12 @@ resource "aws_api_gateway_method" "proxy_method" {
   resource_id   = aws_api_gateway_resource.proxy_resource.id
   http_method   = "ANY"
 
-  <%_ if (auth === 'IAM') { _%>
+  <%_ if (auth === 'iam') { _%>
   authorization = "AWS_IAM"
-  <%_ } else if (auth === 'Cognito') { _%>
+  <%_ } else if (auth === 'cognito') { _%>
   authorization = "COGNITO_USER_POOLS"
   authorizer_id = aws_api_gateway_authorizer.cognito_authorizer.id
-  <%_ } else if (auth === 'Custom') { _%>
+  <%_ } else if (auth === 'custom') { _%>
   authorization = "CUSTOM"
   authorizer_id = aws_api_gateway_authorizer.custom_authorizer.id
   <%_ } _%>
@@ -422,7 +422,7 @@ resource "aws_api_gateway_method" "proxy_method" {
     "method.request.path.proxy" = true
   }
 
-  depends_on = [<% if (auth === 'Cognito') { %>aws_api_gateway_authorizer.cognito_authorizer<% } else if (auth === 'Custom') { %>aws_api_gateway_authorizer.custom_authorizer<% } %>]
+  depends_on = [<% if (auth === 'cognito') { %>aws_api_gateway_authorizer.cognito_authorizer<% } else if (auth === 'custom') { %>aws_api_gateway_authorizer.custom_authorizer<% } %>]
 }
 
 # OPTIONS method for CORS preflight
@@ -500,7 +500,7 @@ resource "aws_api_gateway_deployment" "api_deployment" {
     aws_api_gateway_integration.options_integration,
     aws_api_gateway_method_response.options_response,
     aws_api_gateway_integration_response.options_integration_response,
-    <%_ if (auth === 'Custom') { _%>
+    <%_ if (auth === 'custom') { _%>
     aws_api_gateway_authorizer.custom_authorizer,
     <%_ } _%>
   ]
@@ -530,7 +530,7 @@ resource "aws_api_gateway_rest_api_policy" "api_policy" {
   policy = jsonencode({
     Version = "2012-10-17"
     Statement = [
-      <%_ if (auth === 'IAM') { _%>
+      <%_ if (auth === 'iam') { _%>
       {
         # Grant any AWS credentials from the account to call the API
         # Machine to machine fine-grained access can be defined here using more specific principals
@@ -551,7 +551,7 @@ resource "aws_api_gateway_rest_api_policy" "api_policy" {
       }
       <%_ } else { _%>
       {
-        # Allow all callers to invoke the API in the resource policy<% if (auth === 'Cognito') { %>, since auth is handled by Cognito<% } else if (auth === 'Custom') { %>, since auth is handled by the Lambda Authorizer<% } %>
+        # Allow all callers to invoke the API in the resource policy<% if (auth === 'cognito') { %>, since auth is handled by Cognito<% } else if (auth === 'custom') { %>, since auth is handled by the Lambda Authorizer<% } %>
         Effect = "Allow"
         Principal = "*"
         Action   = "execute-api:Invoke"

package/src/utils/api-constructs/open-api-metadata.d.ts

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Tree } from '@nx/devkit';
-import { IacProvider } from '../iac';
+import { Iac } from '../iac';
 export interface AddOpenApiMetadataGenerateTargetOptions {
-    iacProvider: IacProvider;
+    iac: Iac;
     apiNameKebabCase: string;
     specPath: string;
     specBuildTargetName: string;
@@ -14,4 +14,4 @@ export interface AddOpenApiMetadataGenerateTargetOptions {
  * Adds a generate:<api-name>-metadata target to shared constructs (CDK only)
  * This allows for API CDK constructs to have type-safety for integrations based on an OpenAPI Specification
  */
-export declare const addSharedConstructsOpenApiMetadataGenerateTarget: (tree: Tree, { iacProvider, apiNameKebabCase, specPath, specBuildTargetName, }: AddOpenApiMetadataGenerateTargetOptions) => void;
+export declare const addSharedConstructsOpenApiMetadataGenerateTarget: (tree: Tree, { iac, apiNameKebabCase, specPath, specBuildTargetName, }: AddOpenApiMetadataGenerateTargetOptions) => void;

package/src/utils/api-constructs/open-api-metadata.js

@@ -13,8 +13,8 @@ const shared_constructs_constants_1 = require("../shared-constructs-constants");
  * Adds a generate:<api-name>-metadata target to shared constructs (CDK only)
  * This allows for API CDK constructs to have type-safety for integrations based on an OpenAPI Specification
  */
-const addSharedConstructsOpenApiMetadataGenerateTarget = (tree, { iacProvider, apiNameKebabCase, specPath, specBuildTargetName, }) => {
-    if (iacProvider !== 'CDK') {
+const addSharedConstructsOpenApiMetadataGenerateTarget = (tree, { iac, apiNameKebabCase, specPath, specBuildTargetName, }) => {
+    if (iac !== 'cdk') {
         // For Terraform, we do not support type-safe integration builders, rather only the single lambda
         // router pattern, and therefore do not need to add depenencies on metadata generation.
         return;

package/src/utils/api-constructs/open-api-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"open-api-metadata.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/api-constructs/open-api-metadata.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAKoB;AAEpB,gCAAyC;AACzC,8BAA0D;AAC1D,gFAGwC;AASxC;;;GAGG;AACI,MAAM,gDAAgD,GAAG,CAC9D,IAAU,EACV,EACE,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,mBAAmB,GACqB,EAC1C,EAAE;IACF,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;QAC1B,iGAAiG;QACjG,uFAAuF;QACvF,OAAO;IACT,CAAC;IAED,MAAM,oBAAoB,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC9E,MAAM,4BAA4B,GAAG,IAAA,0BAAiB,EACpD,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,CAAC,EACtD,KAAK,EACL,oBAAoB,CACrB,CAAC;IAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,cAAc,CAAC,EACtE,CAAC,MAA4B,EAAE,EAAE;QAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,wFAAwF;QACxF,0CAA0C;QAC1C,MAAM,kBAAkB,GAAG,YAAY,gBAAgB,WAAW,CAAC;QACnE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG;gBACnC,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,MAAM,EAAE;oBACN;wBACE,yBAAyB,EAAE,WAAW;qBACvC;iBACF;gBACD,OAAO,EAAE;oBACP,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,4BAA4B,CAAC;iBACnE;gBACD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,+DAA+D,QAAQ,mBAAmB,4BAA4B,oBAAoB;qBAC3I;iBACF;gBACD,SAAS,EAAE,CAAC,mBAAmB,CAAC;aACjC,CAAC;QACJ,CAAC;QACD,IAAA,sCAAiC,EAAC,MAAM,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACzE,OAAO,MAAM,CAAC;IAChB,CAAC,CACF,CAAC;IAEF,2CAA2C;IAC3C,sFAAsF;IACtF,IAAA,qBAAe,EACb,IAAI,EACJ,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,CAAC,EACtD,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,IAAA,0BAAiB,EAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAC5E,CAAC;AACJ,CAAC,CAAC;AAnEW,QAAA,gDAAgD,oDAmE3D"}
+{"version":3,"file":"open-api-metadata.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/api-constructs/open-api-metadata.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAKoB;AAEpB,gCAAyC;AACzC,8BAA0D;AAC1D,gFAGwC;AASxC;;;GAGG;AACI,MAAM,gDAAgD,GAAG,CAC9D,IAAU,EACV,EACE,GAAG,EACH,gBAAgB,EAChB,QAAQ,EACR,mBAAmB,GACqB,EAC1C,EAAE;IACF,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;QAClB,iGAAiG;QACjG,uFAAuF;QACvF,OAAO;IACT,CAAC;IAED,MAAM,oBAAoB,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC9E,MAAM,4BAA4B,GAAG,IAAA,0BAAiB,EACpD,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,CAAC,EACtD,KAAK,EACL,oBAAoB,CACrB,CAAC;IAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,EAAE,cAAc,CAAC,EACtE,CAAC,MAA4B,EAAE,EAAE;QAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,wFAAwF;QACxF,0CAA0C;QAC1C,MAAM,kBAAkB,GAAG,YAAY,gBAAgB,WAAW,CAAC;QACnE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG;gBACnC,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,MAAM,EAAE;oBACN;wBACE,yBAAyB,EAAE,WAAW;qBACvC;iBACF;gBACD,OAAO,EAAE;oBACP,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,4BAA4B,CAAC;iBACnE;gBACD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,+DAA+D,QAAQ,mBAAmB,4BAA4B,oBAAoB;qBAC3I;iBACF;gBACD,SAAS,EAAE,CAAC,mBAAmB,CAAC;aACjC,CAAC;QACJ,CAAC;QACD,IAAA,sCAAiC,EAAC,MAAM,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;QACzE,OAAO,MAAM,CAAC;IAChB,CAAC,CACF,CAAC;IAEF,2CAA2C;IAC3C,sFAAsF;IACtF,IAAA,qBAAe,EACb,IAAI,EACJ,IAAA,0BAAiB,EAAC,0CAAY,EAAE,mDAAqB,CAAC,EACtD,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,IAAA,0BAAiB,EAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAC5E,CAAC;AACJ,CAAC,CAAC;AAnEW,QAAA,gDAAgD,oDAmE3D"}

package/src/utils/commands.d.ts

@@ -44,4 +44,4 @@ export declare const buildInstallCommand: (pm: string, pkg: string, dev: boolean
  * The package manager is auto-detected by @aws/create-nx-workspace from the
  * invoking command, so --pm is not needed.
  */
-export declare const buildCreateNxWorkspaceCommand: (pm: string, workspace: string, iacProvider?: "CDK" | "Terraform", tag?: string) => string;
+export declare const buildCreateNxWorkspaceCommand: (pm: string, workspace: string, iac?: "cdk" | "terraform", tag?: string) => string;

package/src/utils/commands.js

@@ -53,7 +53,7 @@ exports.buildInstallCommand = buildInstallCommand;
  * The package manager is auto-detected by @aws/create-nx-workspace from the
  * invoking command, so --pm is not needed.
  */
-const buildCreateNxWorkspaceCommand = (pm, workspace, iacProvider, tag) => {
+const buildCreateNxWorkspaceCommand = (pm, workspace, iac, tag) => {
     const createPrefix = exports.PACKAGE_MANAGER_COMMANDS[pm]?.create ?? `${pm} create`;
     const pkgName = tag ? `@aws/nx-workspace@${tag}` : '@aws/nx-workspace';
     const parts = [
@@ -62,7 +62,7 @@ const buildCreateNxWorkspaceCommand = (pm, workspace, iacProvider, tag) => {
         // npm requires '--' to stop interpreting subsequent flags as npm config
         ...(pm === 'npm' ? ['--'] : []),
         workspace,
-        ...(iacProvider ? [`--iacProvider=${iacProvider}`] : []),
+        ...(iac ? [`--iac=${iac}`] : []),
     ];
     return parts.join(' ');
 };

package/src/utils/commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/commands.ts"],"names":[],"mappings":";;;AAsBa,QAAA,wBAAwB,GAGjC;IACF,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE;IAC1D,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;IAC1D,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;IAC1D,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE;CACxD,CAAC;AAEF;;GAEG;AACI,MAAM,8BAA8B,GAAG,CAAC,EAAU,EAAE,OAAe,EAAE,EAAE;IAC5E,MAAM,MAAM,GAAG,gCAAwB,CAAC,EAAE,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;IACxD,OAAO,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC;AAChC,CAAC,CAAC;AAHW,QAAA,8BAA8B,kCAGzC;AAEF;;GAEG;AACI,MAAM,+BAA+B,GAAG,CAC7C,EAAU,EACV,OAAe,EACf,EAAE;IACF,MAAM,MAAM,GAAG,gCAAwB,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;IACvD,OAAO,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,+BAA+B,mCAM1C;AAEF;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,EAAU,EAAE,GAAW,EAAE,GAAY,EAAE,EAAE;IAC3E,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QAChD,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QAC9C,KAAK,KAAK;YACR,OAAO,kCAAkC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QACpE,KAAK,KAAK;YACR,OAAO,eAAe,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;QACjD;YACE,OAAO,GAAG,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC;IACrD,CAAC;AACH,CAAC,CAAC;AAbW,QAAA,mBAAmB,uBAa9B;AAEF;;;;;;;;;;;GAWG;AACI,MAAM,6BAA6B,GAAG,CAC3C,EAAU,EACV,SAAiB,EACjB,GAAyB,EACzB,GAAY,EACZ,EAAE;IACF,MAAM,YAAY,GAAG,gCAAwB,CAAC,EAAE,CAAC,EAAE,MAAM,IAAI,GAAG,EAAE,SAAS,CAAC;IAC5E,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC;IACvE,MAAM,KAAK,GAAG;QACZ,YAAY;QACZ,OAAO;QACP,wEAAwE;QACxE,GAAG,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,SAAS;QACT,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACjC,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AAjBW,QAAA,6BAA6B,iCAiBxC"}

package/src/utils/config/__snapshots__/utils.spec.ts.snap

@@ -4,7 +4,7 @@ exports[`config utils > should add multiple new keys to an empty config 1`] = `
 "import { AwsNxPluginConfig } from '@aws/nx-plugin';
 
 export default {
-  iac: { provider: 'CDK' },
+  iac: { provider: 'cdk' },
   tags: ['a', 'b'],
 } satisfies AwsNxPluginConfig;
 "
@@ -31,7 +31,7 @@ export default {
 `;
 
 exports[`config utils > should handle config without satisfies clause 1`] = `
-"export default { iac: { provider: 'CDK' } };
+"export default { iac: { provider: 'cdk' } };
 "
 `;
 
@@ -44,7 +44,7 @@ export default {
       content: { lines: [\`Copyright \${new Date().getFullYear()} Foo Inc.\`] },
     },
   },
-  iac: { provider: 'CDK' },
+  iac: { provider: 'cdk' },
 } satisfies AwsNxPluginConfig;
 "
 `;
@@ -59,7 +59,7 @@ export default {
       content: { lines: [\`Copyright \${new Date().getFullYear()} Acme\`] },
     },
   },
-  iac: { provider: 'Terraform' },
+  iac: { provider: 'terraform' },
 } satisfies AwsNxPluginConfig;
 "
 `;
@@ -75,7 +75,7 @@ exports[`config utils > should snapshot merged config with multiple keys 1`] = `
 "import { AwsNxPluginConfig } from '@aws/nx-plugin';
 
 export default {
-  iac: { provider: 'CDK' },
+  iac: { provider: 'cdk' },
   tags: ['tag1'],
 } satisfies AwsNxPluginConfig;
 "
@@ -84,7 +84,7 @@ export default {
 exports[`config utils > should snapshot simple iac config 1`] = `
 "import { AwsNxPluginConfig } from '@aws/nx-plugin';
 
-export default { iac: { provider: 'CDK' } } satisfies AwsNxPluginConfig;
+export default { iac: { provider: 'cdk' } } satisfies AwsNxPluginConfig;
 "
 `;
 

package/src/utils/config/index.d.ts

@@ -6,8 +6,8 @@ import { LicenseConfig } from '../../license/config-types';
 import { IacConfig } from '../iac';
 import { ContainersConfig } from '../containers';
 export * from '../../license/config-types';
-export { IacConfig, IacProvider } from '../iac';
-export { ContainersConfig, ContainerEngine } from '../containers';
+export { IacConfig, Iac } from '../iac';
+export { ContainersConfig, Containers } from '../containers';
 /**
  * Configuration for the nx plugin
  */

package/src/utils/connection/open-api/files/components/__apiNameClassName__Provider.tsx.template

@@ -2,9 +2,9 @@ import { createContext, FC, PropsWithChildren, useMemo } from 'react';
 import { <%- apiNameClassName %> } from '../<%- generatedClientDir %>/client.gen';
 import { <%- apiNameClassName %>OptionsProxy } from '../<%- generatedClientDir %>/options-proxy.gen';
 import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
-<%_ if (auth === 'IAM') { _%>
+<%_ if (auth === 'iam') { _%>
 import { useSigV4 } from '../hooks/useSigV4';
-<%_ } else if (auth === 'Cognito') { _%>
+<%_ } else if (auth === 'cognito') { _%>
 import { useAuth } from 'react-oidc-context';
 <%_ } _%>
 <%_ if (isAgentRuntime) { _%>
@@ -32,9 +32,9 @@ const useCreate<%- apiNameClassName %>Client = (): <%- apiNameClassName %> => {
 <%_ } else { _%>
   const apiUrl = runtimeConfig.apis.<%- apiNameClassName %>;
 <%_ } _%>
-  <%_ if(auth === 'IAM') { _%>
+  <%_ if(auth === 'iam') { _%>
   const sigv4Client = useSigV4();
-  <%_ } else if (auth === 'Cognito') { _%>
+  <%_ } else if (auth === 'cognito') { _%>
   const auth = useAuth();
   const user = auth?.user;
   const cognitoClient: typeof fetch = (url, init) => {
@@ -45,12 +45,12 @@ const useCreate<%- apiNameClassName %>Client = (): <%- apiNameClassName %> => {
   <%_ } _%>
   return useMemo(() => new <%- apiNameClassName %>({
     url: apiUrl,
-    <%_ if(auth === 'IAM') { _%>
+    <%_ if(auth === 'iam') { _%>
     fetch: sigv4Client.fetch,
-    <%_ } else if(auth === 'Cognito') { _%>
+    <%_ } else if(auth === 'cognito') { _%>
     fetch: cognitoClient,
     <%_ } _%>
-  }), [apiUrl<% if(auth === 'IAM') { %>, sigv4Client<% } else if(auth === 'Cognito') { %>, cognitoClient<% } %>])
+  }), [apiUrl<% if(auth === 'iam') { %>, sigv4Client<% } else if(auth === 'cognito') { %>, cognitoClient<% } %>])
 };
 
 export const <%- apiNameClassName %>Provider: FC<PropsWithChildren> = ({ children }) => {

package/src/utils/connection/open-api/react.d.ts

@@ -31,7 +31,7 @@ export interface AddOpenApiReactClientOptions {
     /**
      * Authentication method
      */
-    auth: 'IAM' | 'Cognito' | 'Custom';
+    auth: 'iam' | 'cognito' | 'custom';
     /**
      * Port on which the backend project's local server listens
      */

package/src/utils/connection/open-api/react.js

@@ -80,7 +80,7 @@ const addOpenApiReactClient = async (tree, { apiName, frontendProjectConfig, bac
         project: frontendProjectConfig.name,
     });
     // Add sigv4 fetch
-    if (auth === 'IAM') {
+    if (auth === 'iam') {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../../files/website/hooks/sigv4'), (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'hooks'), {}, {
             overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
         });
@@ -121,7 +121,7 @@ const addOpenApiReactClient = async (tree, { apiName, frontendProjectConfig, bac
         });
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
-        ...(auth === 'IAM'
+        ...(auth === 'iam'
             ? [
                 'oidc-client-ts',
                 'react-oidc-context',
@@ -129,7 +129,7 @@ const addOpenApiReactClient = async (tree, { apiName, frontendProjectConfig, bac
                 'aws4fetch',
             ]
             : []),
-        ...(auth === 'Cognito' ? ['react-oidc-context'] : []),
+        ...(auth === 'cognito' ? ['react-oidc-context'] : []),
         '@tanstack/react-query',
         '@tanstack/react-query-devtools',
     ]), (0, versions_1.withVersions)(['@smithy/types']));

package/src/utils/containers.d.ts

@@ -4,8 +4,8 @@
  */
 import { Tree } from '@nx/devkit';
 export declare const CONTAINER_ENGINES: readonly ["docker", "finch"];
-export type ContainerEngine = (typeof CONTAINER_ENGINES)[number];
-export type ContainerEngineOption = ContainerEngine | 'Inherit';
+export type Containers = (typeof CONTAINER_ENGINES)[number];
+export type ContainersOption = Containers | 'inherit';
 /**
  * Configuration for container tooling
  */
@@ -13,17 +13,17 @@ export interface ContainersConfig {
     /**
      * Container engine used for build/push/login operations
      */
-    engine: ContainerEngine;
+    engine: Containers;
 }
 /**
  * Detect which container engine is available on the host. Prefers docker;
  * falls back to finch when only finch is installed; defaults to docker
  * when neither is found.
  */
-export declare const inferContainerEngine: () => ContainerEngine;
+export declare const inferContainers: () => Containers;
 /**
  * Given a container engine option, resolve the actual engine to use.
  * `Inherit` reads the value from the workspace plugin config, defaulting
  * to docker when nothing has been configured.
  */
-export declare const resolveContainerEngine: (tree: Tree, option: ContainerEngineOption) => Promise<ContainerEngine>;
+export declare const resolveContainers: (tree: Tree, option: ContainersOption) => Promise<Containers>;

package/src/utils/containers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveContainerEngine = exports.inferContainerEngine = exports.CONTAINER_ENGINES = void 0;
+exports.resolveContainers = exports.inferContainers = exports.CONTAINER_ENGINES = void 0;
 const child_process_1 = require("child_process");
 const utils_1 = require("./config/utils");
 exports.CONTAINER_ENGINES = ['docker', 'finch'];
@@ -19,21 +19,21 @@ const isOnPath = (binary) => {
  * falls back to finch when only finch is installed; defaults to docker
  * when neither is found.
  */
-const inferContainerEngine = () => {
+const inferContainers = () => {
     if (isOnPath('docker'))
         return 'docker';
     if (isOnPath('finch'))
         return 'finch';
     return 'docker';
 };
-exports.inferContainerEngine = inferContainerEngine;
+exports.inferContainers = inferContainers;
 /**
  * Given a container engine option, resolve the actual engine to use.
  * `Inherit` reads the value from the workspace plugin config, defaulting
  * to docker when nothing has been configured.
  */
-const resolveContainerEngine = async (tree, option) => {
-    if (option === 'Inherit') {
+const resolveContainers = async (tree, option) => {
+    if (option === 'inherit') {
         const pluginConfig = await (0, utils_1.readAwsNxPluginConfig)(tree);
         const engine = pluginConfig?.containers?.engine ?? 'docker';
         if (!exports.CONTAINER_ENGINES.includes(engine)) {
@@ -43,5 +43,5 @@ const resolveContainerEngine = async (tree, option) => {
     }
     return option;
 };
-exports.resolveContainerEngine = resolveContainerEngine;
+exports.resolveContainers = resolveContainers;
 //# sourceMappingURL=containers.js.map

package/src/utils/containers.js.map

@@ -1 +1 @@
-{"version":3,"file":"containers.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/containers.ts"],"names":[],"mappings":";;;AAKA,iDAAyC;AACzC,0CAGwB;AAEX,QAAA,iBAAiB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAU,CAAC;AAgB9D,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAW,EAAE;IAC3C,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;QACpE,IAAA,wBAAQ,EAAC,GAAG,KAAK,IAAI,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACI,MAAM,oBAAoB,GAAG,GAAoB,EAAE;IACxD,IAAI,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxC,IAAI,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IACtC,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B;AAEF;;;;GAIG;AACI,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAU,EACV,MAA6B,EACH,EAAE;IAC5B,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,QAAQ,CAAC;QAC5D,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CACb,wBAAwB,sCAA8B,mBAAmB,yBAAiB,CAAC,IAAI,CAC7F,IAAI,CACL,EAAE,CACJ,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAjBW,QAAA,sBAAsB,0BAiBjC"}
+{"version":3,"file":"containers.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/containers.ts"],"names":[],"mappings":";;;AAKA,iDAAyC;AACzC,0CAGwB;AAEX,QAAA,iBAAiB,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAU,CAAC;AAgB9D,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAW,EAAE;IAC3C,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;QACpE,IAAA,wBAAQ,EAAC,GAAG,KAAK,IAAI,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACI,MAAM,eAAe,GAAG,GAAe,EAAE;IAC9C,IAAI,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IACxC,IAAI,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IACtC,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEF;;;;GAIG;AACI,MAAM,iBAAiB,GAAG,KAAK,EACpC,IAAU,EACV,MAAwB,EACH,EAAE;IACvB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,QAAQ,CAAC;QAC5D,IAAI,CAAC,yBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CACb,wBAAwB,sCAA8B,mBAAmB,yBAAiB,CAAC,IAAI,CAC7F,IAAI,CACL,EAAE,CACJ,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAjBW,QAAA,iBAAiB,qBAiB5B"}

package/src/utils/function-constructs/files/cdk/app/lambda-functions/{__functionNameKebabCase__.ts.template → __nameKebabCase__.ts.template}

@@ -3,7 +3,7 @@ import * as url from 'url';
 import { Code, Function, Runtime, Tracing } from 'aws-cdk-lib/aws-lambda';
 import { Duration } from 'aws-cdk-lib';
 
-export class <%= functionNameClassName %> extends Function {
+export class <%= nameClassName %> extends Function {
   constructor(scope: Construct, id: string) {
     super(scope, id, {
         timeout: Duration.seconds(30),

package/src/utils/function-constructs/files/terraform/app/lambda-functions/{__functionNameKebabCase__/__functionNameKebabCase__.tf.template → __nameKebabCase__/__nameKebabCase__.tf.template}

@@ -53,7 +53,7 @@ resource "random_string" "suffix" {
 }
 
 resource "aws_iam_role" "lambda_role" {
-  name = "<%- functionNameKebabCase %>-role-${random_string.suffix.result}"
+  name = "<%- nameKebabCase %>-role-${random_string.suffix.result}"
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -73,8 +73,8 @@ resource "aws_iam_role" "lambda_role" {
 }
 
 resource "aws_iam_policy" "lambda_policy" {
-  name        = "<%- functionNameKebabCase %>-policy-${random_string.suffix.result}"
-  description = "Policy for <%- functionNameKebabCase %> Lambda function"
+  name        = "<%- nameKebabCase %>-policy-${random_string.suffix.result}"
+  description = "Policy for <%- nameKebabCase %> Lambda function"
 
   policy = jsonencode({
     Version = "2012-10-17"
@@ -88,7 +88,7 @@ resource "aws_iam_policy" "lambda_policy" {
           "logs:PutLogEvents"
         ]
         Resource = [
-          "arn:aws:logs:${local.aws_region}:${local.aws_account_id}:log-group:/aws/lambda/<%- functionNameKebabCase %>-${random_string.suffix.result}:*"
+          "arn:aws:logs:${local.aws_region}:${local.aws_account_id}:log-group:/aws/lambda/<%- nameKebabCase %>-${random_string.suffix.result}:*"
         ]
       },
       {
@@ -115,12 +115,12 @@ resource "aws_iam_role_policy_attachment" "lambda_policy_attachment" {
 data "archive_file" "lambda_zip" {
   type        = "zip"
   source_dir  = "${path.module}/../../../../../../../<%- bundlePathFromRoot %>"
-  output_path = "${path.module}/../../../../../../../dist/packages/common/terraform/lambda-functions/<%- functionNameKebabCase %>/lambda.zip"
+  output_path = "${path.module}/../../../../../../../dist/packages/common/terraform/lambda-functions/<%- nameKebabCase %>/lambda.zip"
 }
 
 resource "aws_s3_object" "lambda_zip" {
   bucket      = var.asset_bucket_name
-  key         = "lambdas/<%- functionNameKebabCase %>/${data.archive_file.lambda_zip.output_sha256}.zip"
+  key         = "lambdas/<%- nameKebabCase %>/${data.archive_file.lambda_zip.output_sha256}.zip"
   source      = data.archive_file.lambda_zip.output_path
   source_hash = data.archive_file.lambda_zip.output_base64sha256
   etag        = data.archive_file.lambda_zip.output_md5
@@ -135,7 +135,7 @@ resource "aws_lambda_function" "lambda_function" {
   s3_bucket         = aws_s3_object.lambda_zip.bucket
   s3_key            = aws_s3_object.lambda_zip.key
   s3_object_version = aws_s3_object.lambda_zip.version_id
-  function_name     = "<%- functionNameKebabCase %>-${random_string.suffix.result}"
+  function_name     = "<%- nameKebabCase %>-${random_string.suffix.result}"
   role              = aws_iam_role.lambda_role.arn
   handler           = "<%- handler %>"
   source_code_hash  = data.archive_file.lambda_zip.output_base64sha256

package/src/utils/function-constructs/function-constructs.d.ts

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Tree } from '@nx/devkit';
-import { IacProvider } from '../iac';
+import { Iac } from '../iac';
 export interface AddLambdaFunctionConstructOptions {
     functionProjectName: string;
-    functionNameClassName: string;
-    functionNameKebabCase: string;
+    nameClassName: string;
+    nameKebabCase: string;
     bundlePathFromRoot: string;
     handler: string;
     runtime: 'node' | 'python';
@@ -16,5 +16,5 @@ export interface AddLambdaFunctionConstructOptions {
  * Add infrastructure for a lambda function
  */
 export declare const addLambdaFunctionInfra: (tree: Tree, options: AddLambdaFunctionConstructOptions & {
-    iacProvider: IacProvider;
+    iac: Iac;
 }) => Promise<void>;