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

package/src/py/fast-api/generator.js

@@ -7,32 +7,28 @@ const tslib_1 = require("tslib");
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const generator_1 = tslib_1.__importStar(require("../project/generator"));
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const names_1 = require("../../utils/names");
-const format_1 = require("../../utils/format");
-const object_1 = require("../../utils/object");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
 const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
+const open_api_metadata_1 = require("../../utils/api-constructs/open-api-metadata");
+const bundle_1 = require("../../utils/bundle/bundle");
+const format_1 = require("../../utils/format");
 const fs_1 = require("../../utils/fs");
-const open_api_1 = require("./react/open-api");
+const iac_1 = require("../../utils/iac");
+const metrics_1 = require("../../utils/metrics");
+const names_1 = require("../../utils/names");
+const nx_1 = require("../../utils/nx");
+const nxlv_python_1 = require("../../utils/nxlv-python");
+const object_1 = require("../../utils/object");
 const port_1 = require("../../utils/port");
-const bundle_1 = require("../../utils/bundle/bundle");
 const py_1 = require("../../utils/py");
-const iac_1 = require("../../utils/iac");
-const open_api_metadata_1 = require("../../utils/api-constructs/open-api-metadata");
+const shared_constructs_1 = require("../../utils/shared-constructs");
+const generator_1 = tslib_1.__importStar(require("../project/generator"));
+const open_api_1 = require("./react/open-api");
 exports.FAST_API_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 /**
  * Generates a Python FastAPI project
  */
 const pyFastApiProjectGenerator = async (tree, schema) => {
     const integrationPattern = getIntegrationPattern(schema);
-    const iacProvider = await (0, iac_1.resolveIacProvider)(tree, schema.iacProvider);
-    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-        iacProvider,
-    });
     const { dir, normalizedModuleName, fullyQualifiedName } = (0, generator_1.getPyProjectDetails)(tree, {
         name: schema.name,
         directory: schema.directory,
@@ -41,23 +37,36 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
     });
     const apiNameKebabCase = (0, names_1.toKebabCase)(schema.name);
     const apiNameClassName = (0, names_1.toClassName)(schema.name);
-    await (0, generator_1.default)(tree, {
-        name: schema.name,
-        directory: schema.directory,
-        subDirectory: schema.subDirectory,
-        moduleName: normalizedModuleName,
-        projectType: 'application',
-    });
+    let projectExists;
+    try {
+        (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+        projectExists = true;
+    }
+    catch {
+        projectExists = false;
+    }
+    if (!projectExists) {
+        await (0, generator_1.default)(tree, {
+            name: schema.name,
+            directory: schema.directory,
+            subDirectory: schema.subDirectory,
+            moduleName: normalizedModuleName,
+            type: 'application',
+        });
+    }
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
     const port = (0, port_1.assignPort)(tree, projectConfig, 8000);
     const { bundleOutputDir, bundleTargetName } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
     // Add a command to copy run.sh to the bundle output for Lambda Web Adapter
     const fs = new fs_1.FsCommands(tree);
     const bundleTarget = projectConfig.targets[bundleTargetName];
-    bundleTarget.options.commands = [
-        ...bundleTarget.options.commands,
-        fs.cp(`{projectRoot}/run.sh`, `dist/{projectRoot}/${bundleTargetName}/run.sh`),
-    ];
+    const copyRunShCommand = fs.cp(`{projectRoot}/run.sh`, `dist/{projectRoot}/${bundleTargetName}/run.sh`);
+    if (!bundleTarget.options.commands.includes(copyRunShCommand)) {
+        bundleTarget.options.commands = [
+            ...bundleTarget.options.commands,
+            copyRunShCommand,
+        ];
+    }
     projectConfig.targets.serve = {
         executor: '@nxlv/python:run-commands',
         options: {
@@ -67,6 +76,7 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
         continuous: true,
     };
     projectConfig.targets['serve-local'] = {
+        ...projectConfig.targets['serve-local'],
         ...projectConfig.targets.serve,
         options: {
             ...projectConfig.targets.serve.options,
@@ -89,49 +99,57 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
         (0, devkit_1.joinPathFragments)(dir, normalizedModuleName, 'hello.py'),
         (0, devkit_1.joinPathFragments)(dir, 'tests', 'test_hello.py'),
     ].forEach((f) => tree.delete(f));
+    // User-owned source files: preserve any existing copies so re-running does
+    // not clobber user edits (and does not reformat them nondeterministically).
     (0, devkit_1.generateFiles)(tree, // the virtual file system
     (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), // path to the file templates
     dir, // destination path of the files
     {
         name: normalizedModuleName,
         apiNameClassName,
-        computeType: schema.computeType,
+        infra: schema.infra,
     }, {
-        overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
+        overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
     });
-    if (schema.auth === 'Custom') {
-        const authorizerType = schema.computeType === 'ServerlessApiGatewayHttpApi' ? 'http' : 'rest';
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'py-authorizer', authorizerType), (0, devkit_1.joinPathFragments)(dir, normalizedModuleName), {}, {
-            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+    if (schema.infra !== 'none') {
+        const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
+        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
+            iac,
+        });
+        if (schema.auth === 'custom') {
+            const authorizerType = schema.infra === 'http-lambda' ? 'http' : 'rest';
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'py-authorizer', authorizerType), (0, devkit_1.joinPathFragments)(dir, normalizedModuleName), {}, {
+                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            });
+        }
+        // Add the CDK construct to deploy the FastAPI to shared constructs
+        await (0, api_constructs_1.addApiGatewayInfra)(tree, {
+            apiProjectName: projectConfig.name,
+            apiNameClassName,
+            apiNameKebabCase,
+            constructType: schema.infra === 'http-lambda' ? 'http' : 'rest',
+            backend: {
+                type: 'fastapi',
+                moduleName: normalizedModuleName,
+                bundleOutputDir,
+                integrationPattern,
+            },
+            auth: schema.auth,
+            iac,
+        });
+        (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
+            iac,
+            apiNameKebabCase,
+            specPath,
+            specBuildTargetName: `${projectConfig.name}:openapi`,
         });
     }
-    // Add the CDK construct to deploy the FastAPI to shared constructs
-    await (0, api_constructs_1.addApiGatewayInfra)(tree, {
-        apiProjectName: projectConfig.name,
-        apiNameClassName,
-        apiNameKebabCase,
-        constructType: schema.computeType === 'ServerlessApiGatewayHttpApi' ? 'http' : 'rest',
-        backend: {
-            type: 'fastapi',
-            moduleName: normalizedModuleName,
-            bundleOutputDir,
-            integrationPattern,
-        },
-        auth: schema.auth,
-        iacProvider,
-    });
-    (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
-        iacProvider,
-        apiNameKebabCase,
-        specPath,
-        specBuildTargetName: `${projectConfig.name}:openapi`,
-    });
     (0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
         'fastapi',
         'uvicorn',
         'aws-lambda-powertools',
         'aws-lambda-powertools[tracer]',
-        ...(schema.auth === 'Custom'
+        ...(schema.auth === 'custom'
             ? ['aws-lambda-powertools[parser]']
             : []),
     ]);

package/src/py/fast-api/generator.js.map

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

package/src/py/fast-api/react/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 { FastApiReactGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../../utils/nx';
+import { type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../../utils/nx';
+import type { FastApiReactGeneratorSchema } from './schema';
 export declare const FAST_API_REACT_GENERATOR_INFO: NxGeneratorInfo;
 export declare const fastApiReactGenerator: (tree: Tree, options: FastApiReactGeneratorSchema) => Promise<() => void>;
 export default fastApiReactGenerator;

package/src/py/fast-api/react/generator.js

@@ -6,11 +6,11 @@ exports.fastApiReactGenerator = exports.FAST_API_REACT_GENERATOR_INFO = void 0;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
+const react_1 = require("../../../utils/connection/open-api/react");
 const format_1 = require("../../../utils/format");
-const nx_1 = require("../../../utils/nx");
 const metrics_1 = require("../../../utils/metrics");
+const nx_1 = require("../../../utils/nx");
 const open_api_1 = require("./open-api");
-const react_1 = require("../../../utils/connection/open-api/react");
 exports.FAST_API_REACT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const fastApiReactGenerator = async (tree, options) => {
     const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);
@@ -21,7 +21,7 @@ const fastApiReactGenerator = async (tree, options) => {
     });
     const metadata = fastApiProjectConfig.metadata;
     const apiName = metadata?.apiName;
-    const auth = metadata?.auth ?? 'IAM';
+    const auth = (metadata?.auth ?? 'iam').toLowerCase();
     const port = metadata?.port ?? metadata?.ports?.[0] ?? 8000;
     await (0, react_1.addOpenApiReactClient)(tree, {
         apiName,

package/src/py/fast-api/react/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAuD;AAEvD,kDAA6D;AAC7D,0CAI2B;AAC3B,oDAAyE;AACzE,yCAAkD;AAClD,oEAAiF;AAEpE,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EACV,OAAoC,EACpC,EAAE;IACF,MAAM,qBAAqB,GAAG,IAAA,wCAAmC,EAC/D,IAAI,EACJ,OAAO,CAAC,mBAAmB,CAC5B,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,wCAAmC,EAC9D,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IAEF,mEAAmE;IACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,+BAAoB,EAAC,IAAI,EAAE;QAC9C,OAAO,EAAE,oBAAoB;KAC9B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAe,CAAC;IACtD,MAAM,OAAO,GAAG,QAAQ,EAAE,OAAO,CAAC;IAClC,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,IAAI,KAAK,CAAC;IACrC,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,IAAI,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAE5D,MAAM,IAAA,6BAAqB,EAAC,IAAI,EAAE;QAChC,OAAO;QACP,qBAAqB;QACrB,oBAAoB,EAAE,oBAAoB;QAC1C,gBAAgB,EAAE,oBAAoB;QACtC,QAAQ;QACR,mBAAmB,EAAE,GAAG,oBAAoB,CAAC,IAAI,UAAU;QAC3D,IAAI;QACJ,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,qBAAqB,yBAwChC;AAEF,kBAAe,6BAAqB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAA4D;AAC5D,oEAAiF;AACjF,kDAA6D;AAC7D,oDAAyE;AACzE,0CAI2B;AAC3B,yCAAkD;AAGrC,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EACV,OAAoC,EACpC,EAAE;IACF,MAAM,qBAAqB,GAAG,IAAA,wCAAmC,EAC/D,IAAI,EACJ,OAAO,CAAC,mBAAmB,CAC5B,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,wCAAmC,EAC9D,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IAEF,mEAAmE;IACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,+BAAoB,EAAC,IAAI,EAAE;QAC9C,OAAO,EAAE,oBAAoB;KAC9B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAe,CAAC;IACtD,MAAM,OAAO,GAAG,QAAQ,EAAE,OAAO,CAAC;IAClC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IACrD,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,IAAI,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAE5D,MAAM,IAAA,6BAAqB,EAAC,IAAI,EAAE;QAChC,OAAO;QACP,qBAAqB;QACrB,oBAAoB,EAAE,oBAAoB;QAC1C,gBAAgB,EAAE,oBAAoB;QACtC,QAAQ;QACR,mBAAmB,EAAE,GAAG,oBAAoB,CAAC,IAAI,UAAU;QAC3D,IAAI;QACJ,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,qBAAqB,yBAwChC;AAEF,kBAAe,6BAAqB,CAAC"}

package/src/py/fast-api/react/open-api.d.ts

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ProjectConfiguration, Tree } from '@nx/devkit';
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
 export interface AddOpenApiGenerationOptions {
     project: ProjectConfiguration;
 }

package/src/py/fast-api/react/open-api.js

@@ -6,16 +6,19 @@ exports.addOpenApiGeneration = void 0;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const object_1 = require("../../../utils/object");
 const names_1 = require("../../../utils/names");
+const object_1 = require("../../../utils/object");
 /**
  * Adds FastAPI -> OpenApi spec generation as part of the FastAPI project build
  */
 const addOpenApiGeneration = (tree, { project }) => {
     const moduleName = getFastApiModuleName(project);
-    // Add OpenAPI spec generation script to FastAPI spec (if it does not exist already)
+    // Add OpenAPI spec generation script to FastAPI spec, preserving an existing
+    // copy so re-running does not reformat it nondeterministically
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/fast-api'), project.root, {
         moduleName,
+    }, {
+        overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
     });
     // Instrument the script as part of the fastapi project build
     const fastApiOpenApiDist = (0, devkit_1.joinPathFragments)('dist', project.root, 'openapi');

package/src/py/fast-api/react/open-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"open-api.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAMoB;AACpB,kDAAuD;AACvD,gDAAiD;AAMjD;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,EAAE,OAAO,EAA+B,EAClB,EAAE;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEjD,oFAAoF;IACpF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gBAAgB,CAAC,EAC9C,OAAO,CAAC,IAAI,EACZ;QACE,UAAU;KACX,CACF,CAAC;IAEF,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACvE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;QAC7C,GAAG,OAAO;QACV,OAAO,EAAE,IAAA,uBAAc,EAAC;YACtB,GAAG,OAAO,CAAC,OAAO;YAClB,KAAK,EAAE;gBACL,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK;gBACzB,SAAS,EAAE;oBACT,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CACvB;oBACD,SAAS;iBACV;aACF;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,4CAA4C,CAAC;gBACvD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,oGAAoG;qBACrG;iBACF;aACF;SACF,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC,CAAC;AA9CW,QAAA,oBAAoB,wBA8C/B;AAEF,MAAM,oBAAoB,GAAG,CAAC,aAAmC,EAAU,EAAE;IAC3E,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5D,OAAO,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,MAAM,OAAO,GAAI,aAAa,CAAC,QAAgB,EAAE,OAAO,CAAC;IACzD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,8CAA8C,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;AAChF,CAAC,CAAC"}
+{"version":3,"file":"open-api.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,gDAAiD;AACjD,kDAAuD;AAMvD;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,EAAE,OAAO,EAA+B,EAClB,EAAE;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEjD,6EAA6E;IAC7E,+DAA+D;IAC/D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gBAAgB,CAAC,EAC9C,OAAO,CAAC,IAAI,EACZ;QACE,UAAU;KACX,EACD;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACvE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;QAC7C,GAAG,OAAO;QACV,OAAO,EAAE,IAAA,uBAAc,EAAC;YACtB,GAAG,OAAO,CAAC,OAAO;YAClB,KAAK,EAAE;gBACL,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK;gBACzB,SAAS,EAAE;oBACT,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CACvB;oBACD,SAAS;iBACV;aACF;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,4CAA4C,CAAC;gBACvD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,oGAAoG;qBACrG;iBACF;aACF;SACF,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC,CAAC;AAlDW,QAAA,oBAAoB,wBAkD/B;AAEF,MAAM,oBAAoB,GAAG,CAAC,aAAmC,EAAU,EAAE;IAC3E,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5D,OAAO,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,MAAM,OAAO,GAAI,aAAa,CAAC,QAAgB,EAAE,OAAO,CAAC;IACzD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,8CAA8C,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;AAChF,CAAC,CAAC"}

package/src/py/fast-api/schema.d.ts

@@ -3,17 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { IacProviderOption } from '../../utils/iac';
+import { IacOption } from '../../utils/iac';
 
 export interface PyFastApiProjectGeneratorSchema {
   readonly name: string;
-  readonly computeType:
-    | 'ServerlessApiGatewayRestApi'
-    | 'ServerlessApiGatewayHttpApi';
+  readonly infra: 'rest-lambda' | 'http-lambda' | 'none';
   readonly integrationPattern?: 'isolated' | 'shared';
-  readonly auth: 'IAM' | 'Cognito' | 'Custom';
+  readonly auth: 'iam' | 'cognito' | 'custom';
   readonly directory?: string;
   readonly subDirectory?: string;
   readonly moduleName?: string;
-  readonly iacProvider: IacProviderOption;
+  readonly iac: IacOption;
 }

package/src/py/fast-api/schema.json

@@ -15,14 +15,6 @@
       },
       "x-prompt": "What name would you like your API to have? i.e: MyApi"
     },
-    "computeType": {
-      "type": "string",
-      "description": "The type of compute to use to deploy this API. Choose between ServerlessApiGatewayRestApi (default) or ServerlessApiGatewayHttpApi.",
-      "default": "ServerlessApiGatewayRestApi",
-      "enum": ["ServerlessApiGatewayRestApi", "ServerlessApiGatewayHttpApi"],
-      "x-prompt": "What compute type would you like to deploy your API with?",
-      "x-priority": "important"
-    },
     "integrationPattern": {
       "type": "string",
       "description": "How API Gateway integrations are generated for the API. Choose between isolated (default) and shared.",
@@ -47,9 +39,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"
     },
@@ -65,17 +57,25 @@
       "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)"
     },
     "moduleName": {
       "type": "string",
       "description": "Python module name"
+    },
+    "infra": {
+      "type": "string",
+      "description": "The type of infrastructure to use to deploy this API.",
+      "default": "rest-lambda",
+      "enum": ["rest-lambda", "http-lambda", "none"],
+      "x-prompt": "What infrastructure would you like to deploy your API with?",
+      "x-priority": "important"
     }
   },
   "required": ["name"]

package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap

@@ -64,7 +64,7 @@ export class TestProjectTestFunction extends Function {
 }
 `;
 
-exports[`lambda-handler project generator > terraform iacProvider > should generate terraform files for python lambda function and snapshot them > terraform-python-lambda-files 1`] = `
+exports[`lambda-handler project generator > terraform iac > should generate terraform files for python lambda function and snapshot them > terraform-python-lambda-files 1`] = `
 {
   "test-project-test-function.tf": "terraform {
   required_providers {
@@ -246,7 +246,7 @@ output "role_name" {
 }
 `;
 
-exports[`lambda-handler project generator > terraform iacProvider > should match snapshot for terraform generated files with different configurations > terraform-python-lambda-snapshot-function.tf 1`] = `
+exports[`lambda-handler project generator > terraform iac > should match snapshot for terraform generated files with different configurations > terraform-python-lambda-snapshot-function.tf 1`] = `
 "terraform {
   required_providers {
     aws = {

package/src/py/lambda-function/files/handler/__lambdaFunctionSnakeCase__.py.template

@@ -2,9 +2,9 @@ import os
 
 from aws_lambda_powertools import Logger, Metrics, Tracer
 from aws_lambda_powertools.metrics import MetricUnit
-<%_ if (eventSource !== 'Any') { _%>
+<%_ if (event !== 'Any') { _%>
 from aws_lambda_powertools.utilities.parser import event_parser
-from aws_lambda_powertools.utilities.parser.models import <%= eventSource %>
+from aws_lambda_powertools.utilities.parser.models import <%= event %>
 <%_ } _%>
 from aws_lambda_powertools.utilities.typing import LambdaContext
 
@@ -17,11 +17,11 @@ tracer: Tracer = Tracer()
 
 @tracer.capture_lambda_handler
 @metrics.log_metrics
-<%_ if (eventSource !== 'Any') { _%>
-@event_parser(model=<%= eventSource %>)
+<%_ if (event !== 'Any') { _%>
+@event_parser(model=<%= event %>)
 <%_ } _%>
-def lambda_handler(event: <%= eventSource === 'Any' ? 'dict' : eventSource %>, context: LambdaContext):
-    logger.info("Received event", extra={"event": event<%= eventSource === 'Any' ? '' : '.model_dump()' %> })
+def lambda_handler(event: <%= event === 'Any' ? 'dict' : event %>, context: LambdaContext):
+    logger.info("Received event", extra={"event": event<%= event === 'Any' ? '' : '.model_dump()' %> })
     metrics.add_metric(name="InvocationCount", unit=MetricUnit.Count, value=1)
 
     try:

package/src/py/lambda-function/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { GeneratorCallback, Tree } from '@nx/devkit';
-import { PyLambdaFunctionGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { PyLambdaFunctionGeneratorSchema } from './schema';
 export declare const LAMBDA_FUNCTION_GENERATOR_INFO: NxGeneratorInfo;
 export interface LambdaFunctionDetails {
     /**

package/src/py/lambda-function/generator.js

@@ -6,23 +6,23 @@ exports.pyLambdaFunctionGenerator = exports.LAMBDA_FUNCTION_GENERATOR_INFO = voi
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const names_1 = require("../../utils/names");
+const bundle_1 = require("../../utils/bundle/bundle");
 const format_1 = require("../../utils/format");
+const function_constructs_1 = require("../../utils/function-constructs/function-constructs");
+const iac_1 = require("../../utils/iac");
+const metrics_1 = require("../../utils/metrics");
+const names_1 = require("../../utils/names");
 const npm_scope_1 = require("../../utils/npm-scope");
-const object_1 = require("../../utils/object");
 const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
-const bundle_1 = require("../../utils/bundle/bundle");
-const py_1 = require("../../utils/py");
-const function_constructs_1 = require("../../utils/function-constructs/function-constructs");
+const nxlv_python_1 = require("../../utils/nxlv-python");
+const object_1 = require("../../utils/object");
 const paths_1 = require("../../utils/paths");
-const iac_1 = require("../../utils/iac");
+const py_1 = require("../../utils/py");
+const shared_constructs_1 = require("../../utils/shared-constructs");
 exports.LAMBDA_FUNCTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const getLambdaFunctionDetails = (tree, schema) => {
     const scope = (0, names_1.toSnakeCase)((0, npm_scope_1.getNpmScope)(tree));
-    const normalizedFunctionName = (0, names_1.toSnakeCase)(schema.functionName);
+    const normalizedFunctionName = (0, names_1.toSnakeCase)(schema.name);
     const fullyQualifiedFunctionName = `${scope}.${normalizedFunctionName}`;
     const normalizedFunctionPath = `${schema.moduleName}.${schema.functionPath ? `${(0, names_1.toDotNotation)(schema.functionPath)}.` : ''}${normalizedFunctionName}.lambda_handler`;
     return {
@@ -52,34 +52,37 @@ const pyLambdaFunctionGenerator = async (tree, schema) => {
     const moduleName = sourceParts[sourceParts.length - 1];
     const { normalizedFunctionName, normalizedFunctionPath } = getLambdaFunctionDetails(tree, {
         moduleName,
-        functionName: schema.functionName,
+        name: schema.name,
         functionPath: schema.functionPath,
     });
     const constructFunctionName = `${normalizedProjectName}_${normalizedFunctionName}`;
     const constructFunctionClassName = (0, names_1.toClassName)(constructFunctionName);
     const constructFunctionKebabCase = (0, names_1.toKebabCase)(constructFunctionName);
-    const lambdaFunctionClassName = (0, names_1.toClassName)(schema.functionName);
-    const lambdaFunctionKebabCase = (0, names_1.toKebabCase)(schema.functionName);
+    const lambdaFunctionClassName = (0, names_1.toClassName)(schema.name);
+    const lambdaFunctionKebabCase = (0, names_1.toKebabCase)(schema.name);
     const functionPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? '', `${normalizedFunctionName}.py`);
-    // Check that the project does not already have a lambda handler
-    if (tree.exists(functionPath)) {
-        throw new Error(`This project already has a a lambda function with the name ${normalizedFunctionName}. Please remove the lambda function before running this generator or use a different name.`);
+    const infra = schema.infra ?? 'lambda';
+    const handlerAlreadyExists = tree.exists(functionPath);
+    if (handlerAlreadyExists && infra === 'none') {
+        throw new Error(`This project already has a lambda function with the name ${normalizedFunctionName}. Please remove the lambda function before running this generator or use a different name.`);
     }
-    const iacProvider = await (0, iac_1.resolveIacProvider)(tree, schema.iacProvider);
-    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-        iacProvider,
-    });
     // Check if the project has a bundle target and if not add it
     const { bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
-    await (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
-        functionProjectName: projectConfig.name,
-        functionNameClassName: constructFunctionClassName,
-        functionNameKebabCase: constructFunctionKebabCase,
-        handler: normalizedFunctionPath,
-        bundlePathFromRoot: bundleOutputDir,
-        runtime: 'python',
-        iacProvider,
-    });
+    if (infra !== 'none') {
+        const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
+        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
+            iac,
+        });
+        await (0, function_constructs_1.addLambdaFunctionInfra)(tree, {
+            functionProjectName: projectConfig.name,
+            nameClassName: constructFunctionClassName,
+            nameKebabCase: constructFunctionKebabCase,
+            handler: normalizedFunctionPath,
+            bundlePathFromRoot: bundleOutputDir,
+            runtime: 'python',
+            iac,
+        });
+    }
     const enhancedOptions = {
         ...schema,
         dir,
@@ -91,9 +94,9 @@ const pyLambdaFunctionGenerator = async (tree, schema) => {
     // Generate the lambda handler file
     (0, devkit_1.generateFiles)(tree, // the virtual file system
     (0, devkit_1.joinPathFragments)(__dirname, 'files', 'handler'), // path to the file templates
-    (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? ''), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
+    (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, schema.functionPath ?? ''), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     // Generate the lambda handler test file
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'tests'), (0, devkit_1.joinPathFragments)(dir, 'tests'), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'tests'), (0, devkit_1.joinPathFragments)(dir, 'tests'), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
     (0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
         'aws-lambda-powertools',
         'aws-lambda-powertools[tracer]',

package/src/py/lambda-function/generator.js.map

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

package/src/py/lambda-function/schema.d.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { IacProviderOption } from '../../utils/iac';
+import { IacOption } from '../../utils/iac';
 
 type EventSource =
   | 'Any'
@@ -47,10 +47,13 @@ type EventSource =
   | 'VpcLatticeModel'
   | 'VpcLatticeV2Model';
 
+export type LambdaInfraOption = 'lambda' | 'none';
+
 export interface PyLambdaFunctionGeneratorSchema {
   readonly project: string;
-  readonly functionName: string;
+  readonly name: string;
   readonly functionPath?: string;
-  readonly eventSource?: EventSource;
-  readonly iacProvider: IacProviderOption;
+  readonly event?: EventSource;
+  readonly infra?: LambdaInfraOption;
+  readonly iac: IacOption;
 }