sst 2.39.11 → 2.39.13

package/constructs/Function.js

@@ -207,22 +207,9 @@ export class Function extends CDKFunction {
                 ...props,
                 ...(props.runtime === "container"
                     ? {
-                        code: Code.fromAssetImage(props.handler, {
-                            ...(architecture?.dockerPlatform
-                                ? { platform: Platform.custom(architecture.dockerPlatform) }
-                                : {}),
-                            ...(props.container?.cmd ? { cmd: props.container.cmd } : {}),
-                            ...(props.container?.file
-                                ? { file: props.container.file }
-                                : {}),
-                            ...(props.container?.buildArgs
-                                ? { buildArgs: props.container.buildArgs }
-                                : {}),
-                            exclude: [".sst/dist", ".sst/artifacts"],
-                            ignoreMode: IgnoreMode.GLOB,
-                        }),
-                        handler: CDKHandler.FROM_IMAGE,
-                        runtime: CDKRuntime.FROM_IMAGE,
+                        code: Code.fromInline("export function placeholder() {}"),
+                        handler: "index.placeholder",
+                        runtime: CDKRuntime.NODEJS_18_X,
                         layers: undefined,
                     }
                     : {
@@ -244,7 +231,6 @@ export class Function extends CDKFunction {
             useDeferredTasks().add(async () => {
                 if (props.runtime === "container")
                     Colors.line(`➜  Building the container image for the "${this.node.id}" function...`);
-                const project = useProject();
                 // Build function
                 const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
                 if (result.type === "error") {
@@ -253,9 +239,32 @@ export class Function extends CDKFunction {
                         ...result.errors,
                     ].join("\n"));
                 }
-                // No need to update code if runtime is container
-                if (props.runtime === "container")
+                // Update function code for container
+                const cfnFunction = this.node.defaultChild;
+                if (props.runtime === "container") {
+                    const code = Code.fromAssetImage(props.handler, {
+                        ...(architecture?.dockerPlatform
+                            ? { platform: Platform.custom(architecture.dockerPlatform) }
+                            : {}),
+                        ...(props.container?.cmd ? { cmd: props.container.cmd } : {}),
+                        ...(props.container?.file ? { file: props.container.file } : {}),
+                        ...(props.container?.buildArgs
+                            ? { buildArgs: props.container.buildArgs }
+                            : {}),
+                        exclude: [".sst/dist", ".sst/artifacts"],
+                        ignoreMode: IgnoreMode.GLOB,
+                    });
+                    const codeConfig = code.bind(this);
+                    cfnFunction.packageType = "Image";
+                    cfnFunction.code = {
+                        imageUri: codeConfig.image?.imageUri,
+                    };
+                    delete cfnFunction.runtime;
+                    delete cfnFunction.handler;
+                    code.bindToResource(cfnFunction);
                     return;
+                }
+                // Update function code for non-container
                 if (result.sourcemap) {
                     const data = await fs.readFile(result.sourcemap);
                     await fs.writeFile(result.sourcemap, zlib.gzipSync(data));
@@ -270,7 +279,6 @@ export class Function extends CDKFunction {
                 }
                 this.missingSourcemap = !result.sourcemap;
                 // Update code
-                const cfnFunction = this.node.defaultChild;
                 const code = AssetCode.fromAsset(result.out);
                 const codeConfig = code.bind(this);
                 cfnFunction.code = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.39.11",
+  "version": "2.39.13",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -120,7 +120,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.39.11",
+    "astro-sst": "2.39.13",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",

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":