sst 2.39.12 → 2.40.0

package/cdk/deploy-stack.d.ts

@@ -1,15 +1,10 @@
 import * as cxapi from "@aws-cdk/cx-api";
 import { Tag } from "sst-aws-cdk/lib/cdk-toolkit.js";
-import { AssetManifestBuilder } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
 import { ISDK, SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/index.js";
 import { EnvironmentResources } from "sst-aws-cdk/lib/api/environment-resources.js";
 import { HotswapMode } from "sst-aws-cdk/lib/api/hotswap/common.js";
 import { ResourcesToImport } from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { StackActivityProgress } from "sst-aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
-type TemplateBodyParameter = {
-    TemplateBody?: string;
-    TemplateURL?: string;
-};
 export interface DeployStackResult {
     readonly noOp: boolean;
     readonly outputs: {
@@ -187,27 +182,6 @@ export interface ChangeSetDeploymentMethod {
     readonly changeSetName?: string;
 }
 export declare function deployStack(options: DeployStackOptions): Promise<DeployStackResult | undefined>;
-/**
- * Prepares the body parameter for +CreateChangeSet+.
- *
- * If the template is small enough to be inlined into the API call, just return
- * it immediately.
- *
- * Otherwise, add it to the asset manifest to get uploaded to the staging
- * bucket and return its coordinates. If there is no staging bucket, an error
- * is thrown.
- *
- * @param stack     the synthesized stack that provides the CloudFormation template
- * @param toolkitInfo information about the toolkit stack
- */
-export declare function makeBodyParameter(stack: cxapi.CloudFormationStackArtifact, resolvedEnvironment: cxapi.Environment, assetManifest: AssetManifestBuilder, resources: EnvironmentResources, sdk: ISDK, overrideTemplate?: any): Promise<TemplateBodyParameter>;
-/**
- * Prepare a body parameter for CFN, performing the upload
- *
- * Return it as-is if it is small enough to pass in the API call,
- * upload to S3 and return the coordinates if it is not.
- */
-export declare function makeBodyParameterAndUpload(stack: cxapi.CloudFormationStackArtifact, resolvedEnvironment: cxapi.Environment, resources: EnvironmentResources, sdkProvider: SdkProvider, sdk: ISDK, overrideTemplate?: any): Promise<TemplateBodyParameter>;
 export interface DestroyStackOptions {
     /**
      * The stack to be destroyed
@@ -220,4 +194,3 @@ export interface DestroyStackOptions {
     ci?: boolean;
 }
 export declare function destroyStack(options: DestroyStackOptions): Promise<void>;
-export {};

package/cdk/deploy-stack.js

@@ -1,19 +1,14 @@
-import * as cxapi from "@aws-cdk/cx-api";
-import fs from "fs/promises";
 import * as uuid from "uuid";
+import { makeBodyParameter, } from "sst-aws-cdk/lib/api/util/template-body-parameter.js";
 import { addMetadataAssetsToManifest } from "sst-aws-cdk/lib/assets.js";
-import { debug, error, print } from "sst-aws-cdk/lib/logging.js";
-import { toYAML } from "sst-aws-cdk/lib/serialize.js";
+import { debug, print, warning } from "sst-aws-cdk/lib/logging.js";
 import { AssetManifestBuilder } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
 import { publishAssets } from "sst-aws-cdk/lib/util/asset-publishing.js";
-import { contentHash } from "sst-aws-cdk/lib/util/content-hash.js";
 import { CfnEvaluationException } from "sst-aws-cdk/lib/api/evaluate-cloudformation-template.js";
 import { HotswapMode } from "sst-aws-cdk/lib/api/hotswap/common.js";
 import { tryHotswapDeployment } from "sst-aws-cdk/lib/api/hotswap-deployments.js";
 import { changeSetHasNoChanges, CloudFormationStack, TemplateParameters, waitForChangeSet, waitForStackDeploy, waitForStackDelete, } from "sst-aws-cdk/lib/api/util/cloudformation.js";
-import { blue } from "colorette";
 import { callWithRetry } from "./util.js";
-const LARGE_TEMPLATE_SIZE_KB = 50;
 export async function deployStack(options) {
     const stackArtifact = options.stack;
     const stackEnv = options.resolvedEnvironment;
@@ -153,6 +148,15 @@ class FullCloudFormationDeployment {
                 })
                     .promise();
             }
+            if (this.options.force) {
+                warning([
+                    "You used the --force flag, but CloudFormation reported that the deployment would not make any changes.",
+                    "According to CloudFormation, all resources are already up-to-date with the state in your CDK app.",
+                    "",
+                    "You cannot use the --force flag to get rid of changes you made in the console. Try using",
+                    "CloudFormation drift detection instead: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html",
+                ].join("\n"));
+            }
             return {
                 noOp: true,
                 outputs: this.cloudFormationStack.outputs,
@@ -238,19 +242,29 @@ class FullCloudFormationDeployment {
     async directDeployment() {
         const startTime = new Date();
         if (this.update) {
-            await this.cfn
-                .updateStack({
-                StackName: this.stackName,
-                ClientRequestToken: `update${this.uuid}`,
-                ...this.commonPrepareOptions(),
-                ...this.commonExecuteOptions(),
-            })
-                .promise();
-            if (this.options.noMonitor)
-                return;
-            const ret = await this.monitorDeployment(startTime, undefined);
             await this.updateTerminationProtection();
-            return ret;
+            try {
+                await this.cfn
+                    .updateStack({
+                    StackName: this.stackName,
+                    ClientRequestToken: `update${this.uuid}`,
+                    ...this.commonPrepareOptions(),
+                    ...this.commonExecuteOptions(),
+                })
+                    .promise();
+            }
+            catch (err) {
+                if (err.message === "No updates are to be performed.") {
+                    debug("No updates are to be performed for stack %s", this.stackName);
+                    return {
+                        noOp: true,
+                        outputs: this.cloudFormationStack.outputs,
+                        stackArn: this.cloudFormationStack.stackId,
+                    };
+                }
+                throw err;
+            }
+            return this.monitorDeployment(startTime, undefined);
         }
         else {
             // Take advantage of the fact that we can set termination protection during create
@@ -339,76 +353,6 @@ class FullCloudFormationDeployment {
         };
     }
 }
-/**
- * Prepares the body parameter for +CreateChangeSet+.
- *
- * If the template is small enough to be inlined into the API call, just return
- * it immediately.
- *
- * Otherwise, add it to the asset manifest to get uploaded to the staging
- * bucket and return its coordinates. If there is no staging bucket, an error
- * is thrown.
- *
- * @param stack     the synthesized stack that provides the CloudFormation template
- * @param toolkitInfo information about the toolkit stack
- */
-export async function makeBodyParameter(stack, resolvedEnvironment, assetManifest, resources, sdk, overrideTemplate) {
-    // If the template has already been uploaded to S3, just use it from there.
-    if (stack.stackTemplateAssetObjectUrl && !overrideTemplate) {
-        return {
-            TemplateURL: restUrlFromManifest(stack.stackTemplateAssetObjectUrl, resolvedEnvironment, sdk),
-        };
-    }
-    // Otherwise, pass via API call (if small) or upload here (if large)
-    const templateJson = toYAML(overrideTemplate ?? stack.template);
-    if (templateJson.length <= LARGE_TEMPLATE_SIZE_KB * 1024) {
-        return { TemplateBody: templateJson };
-    }
-    const toolkitInfo = await resources.lookupToolkit();
-    if (!toolkitInfo.found) {
-        error(`The template for stack "${stack.displayName}" is ${Math.round(templateJson.length / 1024)}KiB. ` +
-            `Templates larger than ${LARGE_TEMPLATE_SIZE_KB}KiB must be uploaded to S3.\n` +
-            "Run the following command in order to setup an S3 bucket in this environment, and then re-deploy:\n\n", blue(`\t$ cdk bootstrap ${resolvedEnvironment.name}\n`));
-        throw new Error('Template too large to deploy ("cdk bootstrap" is required)');
-    }
-    const templateHash = contentHash(templateJson);
-    const key = `cdk/${stack.id}/${templateHash}.yml`;
-    let templateFile = stack.templateFile;
-    if (overrideTemplate) {
-        // Add a variant of this template
-        templateFile = `${stack.templateFile}-${templateHash}.yaml`;
-        await fs.writeFile(templateFile, templateJson, { encoding: "utf-8" });
-    }
-    assetManifest.addFileAsset(templateHash, {
-        path: templateFile,
-    }, {
-        bucketName: toolkitInfo.bucketName,
-        objectKey: key,
-    });
-    const templateURL = `${toolkitInfo.bucketUrl}/${key}`;
-    debug("Storing template in S3 at:", templateURL);
-    return { TemplateURL: templateURL };
-}
-/**
- * Prepare a body parameter for CFN, performing the upload
- *
- * Return it as-is if it is small enough to pass in the API call,
- * upload to S3 and return the coordinates if it is not.
- */
-export async function makeBodyParameterAndUpload(stack, resolvedEnvironment, resources, sdkProvider, sdk, overrideTemplate) {
-    // We don't have access to the actual asset manifest here, so pretend that the
-    // stack doesn't have a pre-published URL.
-    const forceUploadStack = Object.create(stack, {
-        stackTemplateAssetObjectUrl: { value: undefined },
-    });
-    const builder = new AssetManifestBuilder();
-    const bodyparam = await makeBodyParameter(forceUploadStack, resolvedEnvironment, builder, resources, sdk, overrideTemplate);
-    const manifest = builder.toManifest(stack.assembly.directory);
-    await publishAssets(manifest, sdkProvider, resolvedEnvironment, {
-        quiet: true,
-    });
-    return bodyparam;
-}
 export async function destroyStack(options) {
     const deployName = options.deployName || options.stack.stackName;
     const cfn = options.sdk.cloudFormation();
@@ -527,37 +471,6 @@ function compareTags(a, b) {
     }
     return true;
 }
-/**
- * Format an S3 URL in the manifest for use with CloudFormation
- *
- * Replaces environment placeholders (which this field may contain),
- * and reformats s3://.../... urls into S3 REST URLs (which CloudFormation
- * expects)
- */
-function restUrlFromManifest(url, environment, sdk) {
-    const doNotUseMarker = "**DONOTUSE**";
-    // This URL may contain placeholders, so still substitute those.
-    url = cxapi.EnvironmentPlaceholders.replace(url, {
-        accountId: environment.account,
-        region: environment.region,
-        partition: doNotUseMarker,
-    });
-    // Yes, this is extremely crude, but we don't actually need this so I'm not inclined to spend
-    // a lot of effort trying to thread the right value to this location.
-    if (url.indexOf(doNotUseMarker) > -1) {
-        throw new Error("Cannot use '${AWS::Partition}' in the 'stackTemplateAssetObjectUrl' field");
-    }
-    const s3Url = url.match(/s3:\/\/([^/]+)\/(.*)$/);
-    if (!s3Url) {
-        return url;
-    }
-    // We need to pass an 'https://s3.REGION.amazonaws.com[.cn]/bucket/object' URL to CloudFormation, but we
-    // got an 's3://bucket/object' URL instead. Construct the rest API URL here.
-    const bucketName = s3Url[1];
-    const objectKey = s3Url[2];
-    const urlSuffix = sdk.getEndpointSuffix(environment.region);
-    return `https://s3.${environment.region}.${urlSuffix}/${bucketName}/${objectKey}`;
-}
 function suffixWithErrors(msg, errors) {
     return errors && errors.length > 0 ? `${msg}: ${errors.join(", ")}` : msg;
 }

package/cdk/deployments-wrapper.js

@@ -6,8 +6,8 @@ import { Mode } from "sst-aws-cdk/lib/api/aws-auth/credentials.js";
 import { addMetadataAssetsToManifest } from "sst-aws-cdk/lib/assets.js";
 import { publishAssets } from "sst-aws-cdk/lib/util/asset-publishing.js";
 import { AssetManifestBuilder } from "sst-aws-cdk/lib/util/asset-manifest-builder.js";
+import { makeBodyParameter } from "sst-aws-cdk/lib/api/util/template-body-parameter.js";
 import { Deployments, } from "./deployments.js";
-import { makeBodyParameter } from "./deploy-stack.js";
 import { lazy } from "../util/lazy.js";
 export async function publishDeployAssets(sdkProvider, options) {
     const { deployment, envResources, stackSdk, resolvedEnvironment, cloudFormationRoleArn, } = await useDeployment().get(sdkProvider, options);

package/cdk/deployments.d.ts

@@ -163,6 +163,12 @@ export interface DeployStackOptions {
      * @default true To remain backward compatible.
      */
     readonly assetParallelism?: boolean;
+    /**
+     * Whether to deploy if the app contains no stacks.
+     *
+     * @default false
+     */
+    ignoreNoStacks?: boolean;
 }
 interface AssetOptions {
     /**
@@ -256,12 +262,17 @@ export declare class Deployments {
     private readonly publisherCache;
     private readonly environmentResources;
     constructor(props: DeploymentsProps);
+    /**
+     * Resolves the environment for a stack.
+     */
+    resolveEnvironment(stack: cxapi.CloudFormationStackArtifact): Promise<cxapi.Environment>;
     readCurrentTemplateWithNestedStacks(rootStackArtifact: cxapi.CloudFormationStackArtifact, retrieveProcessedTemplate?: boolean): Promise<Template>;
     readCurrentTemplate(stackArtifact: cxapi.CloudFormationStackArtifact): Promise<Template>;
     resourceIdentifierSummaries(stackArtifact: cxapi.CloudFormationStackArtifact): Promise<ResourceIdentifierSummaries>;
     deployStack(options: DeployStackOptions): Promise<DeployStackResult | undefined>;
     destroyStack(options: DestroyStackOptions): Promise<void>;
     stackExists(options: StackExistsOptions): Promise<boolean>;
+    prepareSdkWithDeployRole(stackArtifact: cxapi.CloudFormationStackArtifact): Promise<PreparedSdkForEnvironment>;
     private prepareSdkWithLookupOrDeployRole;
     /**
      * Get the environment necessary for touching the given stack

package/cdk/deployments.js

@@ -5,11 +5,12 @@ import { AssetManifest } from "cdk-assets";
 import { debug, warning } from "sst-aws-cdk/lib/logging.js";
 import { buildAssets, publishAssets, PublishingAws, EVENT_TO_LOGGER, } from "sst-aws-cdk/lib/util/asset-publishing.js";
 import { Mode } from "sst-aws-cdk/lib/api/aws-auth/credentials.js";
-import { deployStack, destroyStack, makeBodyParameterAndUpload, } from "./deploy-stack.js";
+import { deployStack, destroyStack, } from "./deploy-stack.js";
 import { EnvironmentResourcesRegistry, } from "sst-aws-cdk/lib/api/environment-resources.js";
 import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, flattenNestedStackNames, } from "sst-aws-cdk/lib/api/nested-stack-helpers.js";
 import { CloudFormationStack, } from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { replaceEnvPlaceholders } from "sst-aws-cdk/lib/api/util/placeholders.js";
+import { makeBodyParameterAndUpload } from "sst-aws-cdk/lib/api/util/template-body-parameter.js";
 /**
  * Scope for a single set of deployments from a set of Cloud Assembly Artifacts
  *
@@ -26,6 +27,12 @@ export class Deployments {
         this.sdkProvider = props.sdkProvider;
         this.environmentResources = new EnvironmentResourcesRegistry(props.toolkitStackName);
     }
+    /**
+     * Resolves the environment for a stack.
+     */
+    async resolveEnvironment(stack) {
+        return this.sdkProvider.resolveEnvironment(stack.environment);
+    }
     async readCurrentTemplateWithNestedStacks(rootStackArtifact, retrieveProcessedTemplate = false) {
         const sdk = (await this.prepareSdkWithLookupOrDeployRole(rootStackArtifact))
             .stackSdk;
@@ -123,6 +130,9 @@ export class Deployments {
         const stack = await CloudFormationStack.lookup(stackSdk.cloudFormation(), options.deployName ?? options.stack.stackName);
         return stack.exists;
     }
+    async prepareSdkWithDeployRole(stackArtifact) {
+        return this.prepareSdkFor(stackArtifact, undefined, Mode.ForWriting);
+    }
     async prepareSdkWithLookupOrDeployRole(stackArtifact) {
         // try to assume the lookup role
         try {
@@ -152,7 +162,7 @@ export class Deployments {
         if (!stack.environment) {
             throw new Error(`The stack ${stack.displayName} does not have an environment`);
         }
-        const resolvedEnvironment = await this.sdkProvider.resolveEnvironment(stack.environment);
+        const resolvedEnvironment = await this.resolveEnvironment(stack);
         // Substitute any placeholders with information about the current environment
         const arns = await replaceEnvPlaceholders({
             assumeRoleArn: stack.assumeRoleArn,

package/cli/commands/update.js

@@ -88,7 +88,7 @@ export const update = (program) => program.command("update [version]", "Update y
                                 oldPackages.add([pkg, existing]);
                                 return;
                             }
-                            return metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
+                            return metadata.dependencies["@aws-cdk/aws-lambda-python-alpha"];
                         }
                     })();
                     if (!desired || existing === desired)

package/constructs/Api.d.ts

@@ -1,5 +1,7 @@
 import { Construct } from "constructs";
-import { HttpUrlIntegrationProps, HttpAlbIntegrationProps, HttpNlbIntegrationProps } from "@aws-cdk/aws-apigatewayv2-integrations-alpha";
+import { DomainName, HttpApi, HttpApiProps, HttpRouteIntegration, HttpStageProps, IHttpApi } from "aws-cdk-lib/aws-apigatewayv2";
+import { HttpUrlIntegrationProps, HttpAlbIntegrationProps, HttpNlbIntegrationProps } from "aws-cdk-lib/aws-apigatewayv2-integrations";
+import { HttpJwtAuthorizer, HttpLambdaAuthorizer, HttpLambdaResponseType, HttpUserPoolAuthorizer } from "aws-cdk-lib/aws-apigatewayv2-authorizers";
 import { HttpAwsIntegrationProps } from "./cdk/HttpAwsIntegration.js";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
@@ -9,8 +11,6 @@ import { Permissions } from "./util/permission.js";
 import * as apigV2Cors from "./util/apiGatewayV2Cors.js";
 import * as apigV2Domain from "./util/apiGatewayV2Domain.js";
 import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
-import { DomainName, HttpApi, HttpApiProps, HttpRouteIntegration, HttpStageProps, IHttpApi } from "@aws-cdk/aws-apigatewayv2-alpha";
-import { HttpJwtAuthorizer, HttpLambdaAuthorizer, HttpLambdaResponseType, HttpUserPoolAuthorizer } from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
 import { IFunction } from "aws-cdk-lib/aws-lambda";
 import { IApplicationListener, INetworkListener } from "aws-cdk-lib/aws-elasticloadbalancingv2";
 import { LogGroup } from "aws-cdk-lib/aws-logs";
@@ -363,7 +363,7 @@ export interface ApiProps<Authorizers extends Record<string, ApiAuthorizer> = Re
          *
          * @example
          * ```js
-         * import { HttpApi } from "@aws-cdk/aws-apigatewayv2-alpha";
+         * import { HttpApi } from "aws-cdk-lib/aws-apigatewayv2";
          *
          * new Api(stack, "Api", {
          *   cdk: {
@@ -382,7 +382,7 @@ export interface ApiProps<Authorizers extends Record<string, ApiAuthorizer> = Re
          *
          * @example
          * ```js
-         * import { HttpApi } from "@aws-cdk/aws-apigatewayv2-alpha";
+         * import { HttpApi } from "aws-cdk-lib/aws-apigatewayv2";
          *
          * new Api(stack, "Api", {
          *   cdk: {

package/constructs/Api.js

@@ -1,6 +1,8 @@
 import { Construct } from "constructs";
 import { Role, ServicePrincipal, PolicyDocument, PolicyStatement, } from "aws-cdk-lib/aws-iam";
-import { HttpUrlIntegration, HttpAlbIntegration, HttpNlbIntegration, HttpLambdaIntegration, } from "@aws-cdk/aws-apigatewayv2-integrations-alpha";
+import { HttpApi, HttpMethod, HttpNoneAuthorizer, HttpRoute, HttpRouteKey, HttpStage, IntegrationCredentials, PayloadFormatVersion, } from "aws-cdk-lib/aws-apigatewayv2";
+import { HttpUrlIntegration, HttpAlbIntegration, HttpNlbIntegration, HttpLambdaIntegration, } from "aws-cdk-lib/aws-apigatewayv2-integrations";
+import { HttpIamAuthorizer, HttpJwtAuthorizer, HttpLambdaAuthorizer, HttpLambdaResponseType, HttpUserPoolAuthorizer, } from "aws-cdk-lib/aws-apigatewayv2-authorizers";
 import { HttpAwsIntegration, } from "./cdk/HttpAwsIntegration.js";
 import { Stack } from "./Stack.js";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
@@ -9,8 +11,6 @@ import { toCdkDuration } from "./util/duration.js";
 import * as apigV2Cors from "./util/apiGatewayV2Cors.js";
 import * as apigV2Domain from "./util/apiGatewayV2Domain.js";
 import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
-import { HttpApi, HttpMethod, HttpNoneAuthorizer, HttpRoute, HttpRouteKey, HttpStage, IntegrationCredentials, PayloadFormatVersion, } from "@aws-cdk/aws-apigatewayv2-alpha";
-import { HttpIamAuthorizer, HttpJwtAuthorizer, HttpLambdaAuthorizer, HttpLambdaResponseType, HttpUserPoolAuthorizer, } from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
 import { UserPool, UserPoolClient } from "aws-cdk-lib/aws-cognito";
 const PayloadFormatVersions = ["1.0", "2.0"];
 /////////////////////

package/constructs/ApiGatewayV1Api.js

@@ -71,7 +71,7 @@ export class ApiGatewayV1Api extends Construct {
      */
     get url() {
         const app = this.node.root;
-        return (this.cdk.restApi.url ??
+        return ((this.cdk.restApi.deploymentStage && this.cdk.restApi.url) ??
             `https://${this.cdk.restApi.restApiId}.execute-api.${app.region}.amazonaws.com/${app.stage}/`);
     }
     /**

package/constructs/Function.d.ts

@@ -9,7 +9,7 @@ import { Permissions } from "./util/permission.js";
 import * as functionUrlCors from "./util/functionUrlCors.js";
 import { Architecture, Function as CDKFunction, FunctionOptions, ILayerVersion, Runtime as CDKRuntime, Tracing } from "aws-cdk-lib/aws-lambda";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
-import { Size as CDKSize, Duration as CDKDuration } from "aws-cdk-lib/core";
+import { Size as CDKSize, Duration as CDKDuration, DockerCacheOption } from "aws-cdk-lib/core";
 import { Asset } from "aws-cdk-lib/aws-s3-assets";
 declare const supportedRuntimes: {
     container: CDKRuntime;
@@ -37,6 +37,28 @@ export type FunctionInlineDefinition = string | Function;
 export type FunctionDefinition = string | Function | FunctionProps;
 export interface FunctionUrlCorsProps extends functionUrlCors.CorsProps {
 }
+export interface FunctionDockerBuildCacheProps extends DockerCacheOption {
+}
+export interface FunctionDockerBuildProps {
+    /**
+     * Cache from options to pass to the `docker build` command.
+     * @default - no cache from args are passed
+     * @example
+     * ```js
+     * cacheFrom: [{type: "gha"}],
+     * ```
+     */
+    cacheFrom?: FunctionDockerBuildCacheProps[];
+    /**
+     * Cache to options to pass to the `docker build` command.
+     * @default - no cache to args are passed
+     * @example
+     * ```js
+     * cacheTo: {type: "gha"},
+     * ```
+     */
+    cacheTo?: FunctionDockerBuildCacheProps;
+}
 export interface FunctionHooks {
     /**
      * Hook to run before build
@@ -534,6 +556,10 @@ export interface PythonProps {
      * your own build processes, and you are doing this for the sake of build optimization.
      */
     noDocker?: boolean;
+    /**
+     * Build options to pass to the docker build command.
+     */
+    dockerBuild?: FunctionDockerBuildProps;
 }
 /**
  * Used to configure Go bundling options

package/constructs/WebSocketApi.d.ts

@@ -1,8 +1,8 @@
 import { Construct } from "constructs";
 import * as logs from "aws-cdk-lib/aws-logs";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
-import * as apigAuthorizers from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
+import * as apig from "aws-cdk-lib/aws-apigatewayv2";
+import * as apigAuthorizers from "aws-cdk-lib/aws-apigatewayv2-authorizers";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";

package/constructs/WebSocketApi.js

@@ -1,15 +1,15 @@
 import { Construct } from "constructs";
 import { CustomResource } from "aws-cdk-lib/core";
 import * as iam from "aws-cdk-lib/aws-iam";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
-import * as apigAuthorizers from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
+import * as apig from "aws-cdk-lib/aws-apigatewayv2";
+import * as apigAuthorizers from "aws-cdk-lib/aws-apigatewayv2-authorizers";
+import { WebSocketLambdaIntegration } from "aws-cdk-lib/aws-apigatewayv2-integrations";
 import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { Stack } from "./Stack.js";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import * as apigV2Domain from "./util/apiGatewayV2Domain.js";
 import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
-import { WebSocketLambdaIntegration } from "@aws-cdk/aws-apigatewayv2-integrations-alpha/lib/websocket/index.js";
 /////////////////////
 // Construct
 /////////////////////

package/constructs/cdk/HttpAwsIntegration.d.ts

@@ -1,4 +1,4 @@
-import { HttpIntegrationSubtype, HttpRouteIntegrationBindOptions, HttpRouteIntegrationConfig, HttpRouteIntegration, ParameterMapping, IntegrationCredentials } from "@aws-cdk/aws-apigatewayv2-alpha";
+import { HttpIntegrationSubtype, HttpRouteIntegrationBindOptions, HttpRouteIntegrationConfig, HttpRouteIntegration, ParameterMapping, IntegrationCredentials } from "aws-cdk-lib/aws-apigatewayv2";
 /**
  * Properties to initialize a new `HttpProxyIntegration`.
  */

package/constructs/cdk/HttpAwsIntegration.js

@@ -1,4 +1,4 @@
-import { HttpIntegrationType, HttpRouteIntegration, PayloadFormatVersion, } from "@aws-cdk/aws-apigatewayv2-alpha";
+import { HttpIntegrationType, HttpRouteIntegration, PayloadFormatVersion, } from "aws-cdk-lib/aws-apigatewayv2";
 /**
  * The HTTP Proxy integration resource for HTTP API
  */

package/constructs/util/apiGatewayV2AccessLog.d.ts

@@ -1,10 +1,10 @@
 import { Construct } from "constructs";
 import * as logs from "aws-cdk-lib/aws-logs";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
+import { WebSocketStage, HttpStage } from "aws-cdk-lib/aws-apigatewayv2";
 export interface AccessLogProps {
     format?: string;
     destinationArn?: string;
     retention?: Lowercase<keyof typeof logs.RetentionDays>;
 }
-export declare function buildAccessLogData(scope: Construct, accessLog: boolean | string | AccessLogProps | undefined, apiStage: apig.WebSocketStage | apig.HttpStage, isDefaultStage: boolean): logs.LogGroup | undefined;
+export declare function buildAccessLogData(scope: Construct, accessLog: boolean | string | AccessLogProps | undefined, apiStage: WebSocketStage | HttpStage, isDefaultStage: boolean): logs.LogGroup | undefined;
 export declare function cleanupLogGroupName(str: string): string;

package/constructs/util/apiGatewayV2AccessLog.js

@@ -1,5 +1,5 @@
 import * as logs from "aws-cdk-lib/aws-logs";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
+import { WebSocketStage, } from "aws-cdk-lib/aws-apigatewayv2";
 const defaultHttpFields = [
     // request info
     `"requestTime":"$context.requestTime"`,
@@ -43,7 +43,7 @@ export function buildAccessLogData(scope, accessLog, apiStage, isDefaultStage) {
     if (accessLog === false) {
         return;
     }
-    const isWebSocketApi = apiStage instanceof apig.WebSocketStage;
+    const isWebSocketApi = apiStage instanceof WebSocketStage;
     // note: Access log configuration is not supported by L2 constructs as of CDK v1.85.0. We
     //       need to define it at L1 construct level.
     // create log group

package/constructs/util/apiGatewayV2Cors.d.ts

@@ -1,4 +1,4 @@
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
+import { CorsHttpMethod, CorsPreflightOptions } from "aws-cdk-lib/aws-apigatewayv2";
 import { Duration } from "./duration.js";
 export interface CorsProps {
     /**
@@ -33,7 +33,7 @@ export interface CorsProps {
      * allowMethods: ["GET", "POST"]
      * ```
      */
-    allowMethods?: (keyof typeof apig.CorsHttpMethod)[];
+    allowMethods?: (keyof typeof CorsHttpMethod)[];
     /**
      * The collection of allowed origins.
      * @default Allow all origins.
@@ -64,4 +64,4 @@ export interface CorsProps {
      */
     maxAge?: Duration;
 }
-export declare function buildCorsConfig(cors?: boolean | CorsProps): apig.CorsPreflightOptions | undefined;
+export declare function buildCorsConfig(cors?: boolean | CorsProps): CorsPreflightOptions | undefined;

package/constructs/util/apiGatewayV2Cors.js

@@ -1,4 +1,4 @@
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
+import { CorsHttpMethod, } from "aws-cdk-lib/aws-apigatewayv2";
 import { toCdkDuration } from "./duration.js";
 export function buildCorsConfig(cors) {
     // Handle cors: false
@@ -13,7 +13,7 @@ export function buildCorsConfig(cors) {
     return {
         allowCredentials: cors.allowCredentials || false,
         allowHeaders: cors.allowHeaders || ["*"],
-        allowMethods: (cors.allowMethods || ["ANY"]).map((method) => apig.CorsHttpMethod[method]),
+        allowMethods: (cors.allowMethods || ["ANY"]).map((method) => CorsHttpMethod[method]),
         allowOrigins: cors.allowOrigins || ["*"],
         exposeHeaders: cors.exposeHeaders,
         maxAge: cors.maxAge && toCdkDuration(cors.maxAge),

package/constructs/util/apiGatewayV2Domain.d.ts

@@ -1,5 +1,5 @@
 import { Construct } from "constructs";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
+import { IDomainName } from "aws-cdk-lib/aws-apigatewayv2";
 import * as route53 from "aws-cdk-lib/aws-route53";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
 export interface CustomDomainProps {
@@ -25,7 +25,7 @@ export interface CustomDomainProps {
         /**
          * Override the internally created domain name
          */
-        domainName?: apig.IDomainName;
+        domainName?: IDomainName;
         /**
          * Override the internally created hosted zone
          */
@@ -37,7 +37,7 @@ export interface CustomDomainProps {
     };
 }
 export interface CustomDomainData {
-    readonly apigDomain: apig.IDomainName;
+    readonly apigDomain: IDomainName;
     readonly mappingKey?: string;
     readonly certificate?: acm.ICertificate;
     readonly isApigDomainCreated: boolean;

package/constructs/util/apiGatewayV2Domain.js

@@ -1,5 +1,5 @@
 import { Token } from "aws-cdk-lib/core";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
+import { DomainName } from "aws-cdk-lib/aws-apigatewayv2";
 import * as route53 from "aws-cdk-lib/aws-route53";
 import * as route53Targets from "aws-cdk-lib/aws-route53-targets";
 import * as acm from "aws-cdk-lib/aws-certificatemanager";
@@ -160,7 +160,7 @@ function createCertificate(scope, domainName, hostedZone) {
     });
 }
 function createApigDomain(scope, domainName, certificate) {
-    return new apig.DomainName(scope, "DomainName", {
+    return new DomainName(scope, "DomainName", {
         domainName,
         certificate,
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.39.12",
+  "version": "2.40.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -25,12 +25,10 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@aws-cdk/aws-apigatewayv2-alpha": "^2.110.1-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.110.1-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.110.1-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "2.110.1",
-    "@aws-cdk/cloudformation-diff": "2.110.1",
-    "@aws-cdk/cx-api": "2.110.1",
+    "@aws-cdk/aws-lambda-python-alpha": "2.124.0-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "2.124.0",
+    "@aws-cdk/cloudformation-diff": "2.124.0",
+    "@aws-cdk/cx-api": "2.124.0",
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/client-cloudformation": "^3.454.0",
     "@aws-sdk/client-ecs": "^3.454.0",
@@ -55,11 +53,11 @@
     "@smithy/signature-v4": "^2.0.16",
     "@trpc/server": "9.16.0",
     "adm-zip": "^0.5.10",
-    "aws-cdk-lib": "2.110.1",
+    "aws-cdk-lib": "2.124.0",
     "aws-iot-device-sdk": "^2.2.13",
     "aws-sdk": "^2.1501.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "2.110.1",
+    "cdk-assets": "2.124.0",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
@@ -87,7 +85,7 @@
     "ora": "^6.1.2",
     "react": "^18.0.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.110.1-1",
+    "sst-aws-cdk": "2.124.0",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
@@ -120,7 +118,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.39.12",
+    "astro-sst": "2.40.0",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",

package/project.js

@@ -30,6 +30,8 @@ const CONFIG_EXTENSIONS = [
     ".config.js",
 ];
 export async function initProject(globals) {
+    // Suppress warnings about deprecated CDK props.
+    process.env.JSII_DEPRECATED = "quiet";
     // Logger.debug("initing project");
     const root = globals.root || (await findRoot());
     const out = path.join(root, ".sst");

package/runtime/handlers/python.js

@@ -96,6 +96,7 @@ export const usePythonHandler = () => {
                     architecture: input.props.architecture,
                     outputPathSuffix: ".",
                     out: input.out,
+                    dockerBuild: input.props.python?.dockerBuild,
                 });
             }
             await fs.cp(src, input.out, {

package/runtime/handlers/pythonBundling.d.ts

@@ -1,5 +1,5 @@
 import { Runtime } from "aws-cdk-lib/aws-lambda";
-import { FunctionProps } from "../../constructs/Function.js";
+import { FunctionDockerBuildProps, FunctionProps } from "../../constructs/Function.js";
 import { AssetHashType } from "aws-cdk-lib/core";
 /**
  * Dependency files to exclude from the asset hash.
@@ -68,6 +68,7 @@ export interface BundlingOptions {
      */
     readonly assetHash?: string;
     readonly installCommands?: string[];
+    readonly dockerBuild?: FunctionDockerBuildProps;
 }
 /**
  * Produce bundled Lambda asset code

package/runtime/handlers/pythonBundling.js

@@ -40,6 +40,8 @@ export function bundle(options) {
                 (architecture == "arm_64" ? ":latest-arm64" : ""),
         },
         file: dockerfile,
+        cacheFrom: options.dockerBuild?.cacheFrom,
+        cacheTo: options.dockerBuild?.cacheTo,
     });
     const outputPath = path.join(options.out, outputPathSuffix);
     // Copy dependencies to the bundle if applicable.

package/stacks/diff.js

@@ -1,7 +1,7 @@
 export async function diff(stack, oldTemplate) {
-    const { diffTemplate, formatDifferences, TemplateDiff } = await import("@aws-cdk/cloudformation-diff");
+    const { fullDiff, formatDifferences, TemplateDiff } = await import("@aws-cdk/cloudformation-diff");
     // Generate diff
-    const diff = diffTemplate(oldTemplate, stack.template);
+    const diff = fullDiff(oldTemplate, stack.template);
     if (diff.isEmpty) {
         return { count: 0 };
     }

package/support/custom-resources/index.mjs

@@ -153441,8 +153441,8 @@ glob.glob = glob;
 var import_adm_zip2 = __toESM(require_adm_zip(), 1);
 var import_client_s33 = __toESM(require_dist_cjs70(), 1);
 var import_client_lambda2 = __toESM(require_dist_cjs82(), 1);
-var s33 = new import_client_s33.S3Client({ logger: sdkLogger });
-var lambda2 = new import_client_lambda2.LambdaClient({ logger: sdkLogger });
+var s33 = useAWSClient(import_client_s33.S3Client);
+var lambda2 = useAWSClient(import_client_lambda2.LambdaClient);
 async function S3Uploader(cfnRequest) {
   switch (cfnRequest.RequestType) {
     case "Create":