@aws/nx-plugin 0.79.1 → 0.80.0

package/src/py/fast-api/files/app/__name__/init.py.template

@@ -1,15 +1,16 @@
+import json
 import os
 import uuid
-from collections.abc import Callable
+from collections.abc import AsyncIterator, Callable
+from typing import Any
 from urllib.parse import urlparse
 
 from aws_lambda_powertools import Logger, Metrics, Tracer
 from aws_lambda_powertools.metrics import MetricUnit
 from fastapi import FastAPI, Request, Response
 from fastapi.openapi.utils import get_openapi
-from fastapi.responses import JSONResponse
+from fastapi.responses import JSONResponse, StreamingResponse
 from fastapi.routing import APIRoute
-from mangum import Mangum
 from pydantic import BaseModel
 from starlette.middleware.exceptions import ExceptionMiddleware
 
@@ -25,16 +26,54 @@ class InternalServerErrorDetails(BaseModel):
     detail: str
 
 
-app = FastAPI(title="<%= apiNameClassName %>", responses={500: {"model": InternalServerErrorDetails}})
-lambda_handler = Mangum(app)
+class JsonStreamingResponse(StreamingResponse):
+    """A streaming response that serializes items to JSON Lines format."""
+
+    media_type = "application/jsonl"
+
+    def __init__(
+        self,
+        content: AsyncIterator[BaseModel],
+        status_code: int = 200,
+        headers: dict[str, str] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        """Stream json lines from an async iterator yielding Pydantic models"""
+        super().__init__(
+            content=self._serialize(content),
+            status_code=status_code,
+            headers=headers,
+            media_type=self.media_type,
+            **kwargs,
+        )
+
+    @staticmethod
+    async def _serialize(
+        content: AsyncIterator[BaseModel],
+    ) -> AsyncIterator[bytes]:
+        """Serialize Pydantic models to JSON Lines format."""
+        async for item in content:
+            yield (item.model_dump_json() + "\n").encode("utf-8")
+
+    @staticmethod
+    def openapi_response(
+        item_model: type[BaseModel],
+        description: str = "Streaming response",
+    ) -> dict[str, Any]:
+        """Generate an OpenAPI application/jsonl response for a stream of the given model"""
+        return {
+            "description": description,
+            "content": {
+                "application/jsonl": {
+                    "itemSchema": {"$ref": f"#/components/schemas/{item_model.__name__}"},
+                }
+            },
+            # Include the model so FastAPI registers the schema in components/schemas
+            "model": item_model,
+        }
+
 
-# Add tracing
-lambda_handler.__name__ = "handler"  # tracer requires __name__ to be set
-lambda_handler = tracer.capture_lambda_handler(lambda_handler)
-# Add logging
-lambda_handler = logger.inject_lambda_context(lambda_handler, clear_state=True)
-# Add metrics last to properly flush metrics.
-lambda_handler = metrics.log_metrics(lambda_handler, capture_cold_start_metric=True)
+app = FastAPI(title="<%= apiNameClassName %>", responses={500: {"model": InternalServerErrorDetails}})
 
 
 # Add cors middleware
@@ -92,10 +131,16 @@ async def metrics_handler(request: Request, call_next):
 async def add_correlation_id(request: Request, call_next):
     # Get correlation id from X-Correlation-Id header
     corr_id = request.headers.get("x-correlation-id")
-    if not corr_id and "aws.context" in request.scope:
-        # If empty, use request id from aws context
-        corr_id = request.scope["aws.context"].aws_request_id
-    elif not corr_id:
+    if not corr_id:
+        # Try to get request id from Lambda context (forwarded by Lambda Web Adapter)
+        lambda_context_header = request.headers.get("x-amzn-lambda-context")
+        if lambda_context_header:
+            try:
+                lambda_context = json.loads(lambda_context_header)
+                corr_id = lambda_context.get("request_id")
+            except (json.JSONDecodeError, KeyError):
+                pass
+    if not corr_id:
         # If still empty, use uuid
         corr_id = uuid.uuid4().hex
 

package/src/py/fast-api/files/app/__name__/main.py.template

@@ -1,8 +1,7 @@
+import uvicorn
 from pydantic import BaseModel
 
-from .init import app, lambda_handler, tracer
-
-handler = lambda_handler
+from .init import app, tracer
 
 
 class EchoOutput(BaseModel):
@@ -13,3 +12,7 @@ class EchoOutput(BaseModel):
 @tracer.capture_method
 def echo(message: str) -> EchoOutput:
     return EchoOutput(message=f"{message}")
+
+
+if __name__ == "__main__":
+    uvicorn.run("<%- name %>.main:app", port=8000)

package/src/py/fast-api/files/app/run.sh.template

@@ -0,0 +1,2 @@
+#!/bin/bash
+exec python -m uvicorn <%= name %>.main:app --host 0.0.0.0 --port ${PORT:-8000}

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

@@ -16,6 +16,7 @@ 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 fs_1 = require("../../utils/fs");
 const open_api_1 = require("./react/open-api");
 const port_1 = require("../../utils/port");
 const bundle_1 = require("../../utils/bundle/bundle");
@@ -46,7 +47,14 @@ const pyFastApiProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
     });
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
     const port = (0, port_1.assignPort)(tree, projectConfig, 8000);
-    const { bundleOutputDir } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
+    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`),
+    ];
     projectConfig.targets.serve = {
         executor: '@nxlv/python:run-commands',
         options: {
@@ -96,7 +104,7 @@ const pyFastApiProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, vo
     });
     (0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
         'fastapi',
-        'mangum',
+        'uvicorn',
         'aws-lambda-powertools',
         'aws-lambda-powertools[tracer]',
     ]);

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/smithy/ts/api/__snapshots__/generator.spec.ts.snap

@@ -643,6 +643,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -706,6 +707,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
 }
 
 
+
 # Create proxy resource (captures all paths)
 resource "aws_api_gateway_resource" "proxy_resource" {
   rest_api_id = module.rest_api.api_id
@@ -867,6 +869,7 @@ resource "aws_lambda_permission" "api_gateway_invoke" {
   depends_on = [module.rest_api, aws_lambda_function.api_lambda]
 }
 
+
 # Add API url to runtime config
 module "add_url_to_runtime_config" {
   source = "../../../core/runtime-config/entry"
@@ -1666,6 +1669,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -1728,6 +1732,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   tags              = var.tags
 }
 
+
 # Cognito User Pool Authorizer
 resource "aws_api_gateway_authorizer" "cognito_authorizer" {
   name                   = "TestApiAuthorizer"
@@ -1897,6 +1902,7 @@ resource "aws_lambda_permission" "api_gateway_invoke" {
   depends_on = [module.rest_api, aws_lambda_function.api_lambda]
 }
 
+
 # Add API url to runtime config
 module "add_url_to_runtime_config" {
   source = "../../../core/runtime-config/entry"
@@ -2292,6 +2298,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -2355,6 +2362,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
 }
 
 
+
 # Create proxy resource (captures all paths)
 resource "aws_api_gateway_resource" "proxy_resource" {
   rest_api_id = module.rest_api.api_id
@@ -2525,6 +2533,7 @@ resource "aws_lambda_permission" "api_gateway_invoke" {
   depends_on = [module.rest_api, aws_lambda_function.api_lambda]
 }
 
+
 # Add API url to runtime config
 module "add_url_to_runtime_config" {
   source = "../../../core/runtime-config/entry"
@@ -2769,6 +2778,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -2832,6 +2842,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
 }
 
 
+
 # Create proxy resource (captures all paths)
 resource "aws_api_gateway_resource" "proxy_resource" {
   rest_api_id = module.rest_api.api_id
@@ -2993,6 +3004,7 @@ resource "aws_lambda_permission" "api_gateway_invoke" {
   depends_on = [module.rest_api, aws_lambda_function.api_lambda]
 }
 
+
 # Add API url to runtime config
 module "add_url_to_runtime_config" {
   source = "../../../core/runtime-config/entry"

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

@@ -2709,6 +2709,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -2771,6 +2772,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   tags              = var.tags
 }
 
+
 # Cognito User Pool Authorizer
 resource "aws_apigatewayv2_authorizer" "cognito_authorizer" {
   api_id           = module.http_api.api_id
@@ -3329,6 +3331,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -3392,6 +3395,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
 }
 
 
+
 # Lambda integration for HTTP API
 resource "aws_apigatewayv2_integration" "lambda_integration" {
   api_id           = module.http_api.api_id
@@ -3936,6 +3940,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -3999,6 +4004,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
 }
 
 
+
 # Lambda integration for HTTP API
 resource "aws_apigatewayv2_integration" "lambda_integration" {
   api_id           = module.http_api.api_id
@@ -4433,6 +4439,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -4495,6 +4502,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   tags              = var.tags
 }
 
+
 # Cognito User Pool Authorizer
 resource "aws_api_gateway_authorizer" "cognito_authorizer" {
   name                   = "TestApiAuthorizer"
@@ -4665,6 +4673,7 @@ resource "aws_lambda_permission" "api_gateway_invoke" {
   depends_on = [module.rest_api, aws_lambda_function.api_lambda]
 }
 
+
 # Add API url to runtime config
 module "add_url_to_runtime_config" {
   source = "../../../core/runtime-config/entry"
@@ -5060,6 +5069,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -5123,6 +5133,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
 }
 
 
+
 # Create proxy resource (captures all paths)
 resource "aws_api_gateway_resource" "proxy_resource" {
   rest_api_id = module.rest_api.api_id
@@ -5294,6 +5305,7 @@ resource "aws_lambda_permission" "api_gateway_invoke" {
   depends_on = [module.rest_api, aws_lambda_function.api_lambda]
 }
 
+
 # Add API url to runtime config
 module "add_url_to_runtime_config" {
   source = "../../../core/runtime-config/entry"
@@ -5689,6 +5701,7 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
@@ -5752,6 +5765,7 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
 }
 
 
+
 # Create proxy resource (captures all paths)
 resource "aws_api_gateway_resource" "proxy_resource" {
   rest_api_id = module.rest_api.api_id
@@ -5914,6 +5928,7 @@ resource "aws_lambda_permission" "api_gateway_invoke" {
   depends_on = [module.rest_api, aws_lambda_function.api_lambda]
 }
 
+
 # Add API url to runtime config
 module "add_url_to_runtime_config" {
   source = "../../../core/runtime-config/entry"

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

@@ -7,8 +7,12 @@ import {
   Function,
   FunctionProps,
   Tracing,
+  <%_ if (backend.type === 'fastapi') { _%>
+  LayerVersion,
+  SnapStartConf,
+  <%_ } _%>
 } from 'aws-cdk-lib/aws-lambda';
-import { Duration } from 'aws-cdk-lib';
+import { Duration<%_ if (backend.type === 'fastapi') { _%>, Stack<%_ } _%> } from 'aws-cdk-lib';
 import {
   CorsHttpMethod,
   CfnApi,
@@ -109,7 +113,7 @@ export class <%= apiNameClassName %><
         ),
         <%_ } else if (backend.type === 'fastapi') { _%>
         runtime: Runtime.PYTHON_3_12,
-        handler: '<%= backend.moduleName %>.main.handler',
+        handler: 'run.sh',
         code: Code.fromAsset(
           url.fileURLToPath(
             new URL(
@@ -121,15 +125,37 @@ export class <%= apiNameClassName %><
         <%_ } _%>
         timeout: Duration.seconds(30),
         tracing: Tracing.ACTIVE,
+        <%_ if (backend.type === 'fastapi') { _%>
+        snapStart: SnapStartConf.ON_PUBLISHED_VERSIONS,
+        <%_ } _%>
         environment: {
           AWS_CONNECTION_REUSE_ENABLED: '1',
+          <%_ if (backend.type === 'fastapi') { _%>
+          PORT: '8000',
+          AWS_LWA_INVOKE_MODE: 'buffered',
+          AWS_LAMBDA_EXEC_WRAPPER: '/opt/bootstrap',
+          <%_ } _%>
         },
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, `<%= apiNameClassName %>${op}Handler`, props);
+        <%_ if (backend.type === 'fastapi') { _%>
+        const stack = Stack.of(scope);
+        handler.addLayers(
+          LayerVersion.fromLayerVersionArn(
+            scope,
+            `<%= apiNameClassName %>${op}LWALayer`,
+            `arn:aws:lambda:${stack.region}:753240598075:layer:LambdaAdapterLayerX86:24`,
+          ),
+        );
+        <%_ } _%>
         return {
           handler,
+          <%_ if (backend.type === 'fastapi') { _%>
+          integration: new HttpLambdaIntegration(`<%= apiNameClassName %>${op}Integration`, handler.currentVersion),
+          <%_ } else { _%>
           integration: new HttpLambdaIntegration(`<%= apiNameClassName %>${op}Integration`, handler),
+          <%_ } _%>
         };
       },
     });

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

@@ -7,19 +7,23 @@ import {
   Function,
   FunctionProps,
   Tracing,
+  <%_ if (backend.type === 'fastapi') { _%>
+  LayerVersion,
+  SnapStartConf,
+  <%_ } _%>
 } from 'aws-cdk-lib/aws-lambda';
 import {
   AuthorizationType,
   Cors,
   LambdaIntegration,
-  <%_ if (backend.type === 'trpc') { _%>
+  <%_ if (['trpc', 'fastapi'].includes(backend.type)) { _%>
   ResponseTransferMode,
   <%_ } _%>
   <%_ if (auth === 'Cognito') { _%>
   CognitoUserPoolsAuthorizer,
   <%_ } _%>
 } from 'aws-cdk-lib/aws-apigateway';
-import { Duration } from 'aws-cdk-lib';
+import { Duration<%_ if (backend.type === 'fastapi') { _%>, Stack<%_ } _%> } from 'aws-cdk-lib';
 import {
   PolicyDocument,
   PolicyStatement,
@@ -109,7 +113,7 @@ export class <%= apiNameClassName %><
         ),
         <%_ } else if (backend.type === 'fastapi') { _%>
         runtime: Runtime.PYTHON_3_12,
-        handler: '<%= backend.moduleName %>.main.handler',
+        handler: 'run.sh',
         code: Code.fromAsset(
           url.fileURLToPath(
             new URL(
@@ -121,15 +125,37 @@ export class <%= apiNameClassName %><
         <%_ } _%>
         timeout: Duration.seconds(30),
         tracing: Tracing.ACTIVE,
+        <%_ if (backend.type === 'fastapi') { _%>
+        snapStart: SnapStartConf.ON_PUBLISHED_VERSIONS,
+        <%_ } _%>
         environment: {
           AWS_CONNECTION_REUSE_ENABLED: '1',
+          <%_ if (backend.type === 'fastapi') { _%>
+          PORT: '8000',
+          AWS_LWA_INVOKE_MODE: 'response_stream',
+          AWS_LAMBDA_EXEC_WRAPPER: '/opt/bootstrap',
+          <%_ } _%>
         },
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, `<%= apiNameClassName %>${op}Handler`, props);
+        <%_ if (backend.type === 'fastapi') { _%>
+        const stack = Stack.of(scope);
+        handler.addLayers(
+          LayerVersion.fromLayerVersionArn(
+            scope,
+            `<%= apiNameClassName %>${op}LWALayer`,
+            `arn:aws:lambda:${stack.region}:753240598075:layer:LambdaAdapterLayerX86:24`,
+          ),
+        );
+        <%_ } _%>
         return {
           handler,
-          <%_ if (backend.type === 'trpc') { _%>
+          <%_ if (backend.type === 'fastapi') { _%>
+          integration: new LambdaIntegration(handler.currentVersion, {
+            responseTransferMode: ResponseTransferMode.STREAM,
+          }),
+          <%_ } else if (backend.type === 'trpc') { _%>
           integration: new LambdaIntegration(handler, {
             responseTransferMode: ResponseTransferMode.STREAM,
           }),

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

@@ -132,11 +132,15 @@ resource "aws_lambda_function" "api_lambda" {
   handler         = "index.handler"
   runtime         = "nodejs22.x"
   <%_ } else if (backend.type === 'fastapi') { _%>
-  handler         = "<%= backend.moduleName %>.main.handler"
+  handler         = "run.sh"
   runtime         = "python3.12"
+  layers          = ["arn:aws:lambda:${data.aws_region.current.name}:753240598075:layer:LambdaAdapterLayerX86:24"]
   <%_ } _%>
   timeout         = 30
   memory_size     = 128
+  <%_ if (backend.type === 'fastapi') { _%>
+  publish         = true
+  <%_ } _%>
 
   source_code_hash = data.archive_file.lambda_zip.output_base64sha256
 
@@ -145,9 +149,21 @@ resource "aws_lambda_function" "api_lambda" {
     mode = "Active"
   }
 
+  <%_ if (backend.type === 'fastapi') { _%>
+  # Enable SnapStart for faster cold starts
+  snap_start {
+    apply_on = "PublishedVersions"
+  }
+  <%_ } _%>
+
   environment {
     variables = merge({
       AWS_CONNECTION_REUSE_ENABLED = "1"
+      <%_ if (backend.type === 'fastapi') { _%>
+      PORT                        = "8000"
+      AWS_LWA_INVOKE_MODE         = "buffered"
+      AWS_LAMBDA_EXEC_WRAPPER     = "/opt/bootstrap"
+      <%_ } _%>
     }, var.env)
   }
 
@@ -207,6 +223,17 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   tags              = var.tags
 }
 
+<%_ if (backend.type === 'fastapi') { _%>
+# Lambda alias pointing to the latest published version for SnapStart
+resource "aws_lambda_alias" "live" {
+  name             = "live"
+  function_name    = aws_lambda_function.api_lambda.function_name
+  function_version = aws_lambda_function.api_lambda.version
+
+  depends_on = [aws_lambda_function.api_lambda]
+}
+<%_ } _%>
+
 <%_ if (auth === 'Cognito') { _%>
 # Cognito User Pool Authorizer
 resource "aws_apigatewayv2_authorizer" "cognito_authorizer" {
@@ -226,12 +253,20 @@ resource "aws_apigatewayv2_authorizer" "cognito_authorizer" {
 resource "aws_apigatewayv2_integration" "lambda_integration" {
   api_id           = module.http_api.api_id
   integration_type = "AWS_PROXY"
+  <%_ if (backend.type === 'fastapi') { _%>
+  integration_uri  = aws_lambda_alias.live.invoke_arn
+  <%_ } else { _%>
   integration_uri  = aws_lambda_function.api_lambda.invoke_arn
+  <%_ } _%>
 
   payload_format_version = "2.0"
   timeout_milliseconds   = 30000
 
+  <%_ if (backend.type === 'fastapi') { _%>
+  depends_on = [aws_lambda_alias.live]
+  <%_ } else { _%>
   depends_on = [aws_lambda_function.api_lambda]
+  <%_ } _%>
 }
 
 # Route for proxy integration (catches all requests)
@@ -268,15 +303,22 @@ module "add_url_to_runtime_config" {
   depends_on = [module.http_api]
 }
 
-# Lambda permission for API Gateway to invoke the function
+# Lambda permission for API Gateway to invoke the function<% if (backend.type === 'fastapi') { %> via alias<% } %>
 resource "aws_lambda_permission" "api_gateway_invoke" {
   statement_id  = "AllowExecutionFromAPIGateway"
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.api_lambda.function_name
+  <%_ if (backend.type === 'fastapi') { _%>
+  qualifier     = aws_lambda_alias.live.name
+  <%_ } _%>
   principal     = "apigateway.amazonaws.com"
   source_arn    = "${module.http_api.api_execution_arn}/*/*"
 
+  <%_ if (backend.type === 'fastapi') { _%>
+  depends_on = [module.http_api, aws_lambda_alias.live]
+  <%_ } else { _%>
   depends_on = [module.http_api, aws_lambda_function.api_lambda]
+  <%_ } _%>
 }
 
 # Outputs