sst 2.40.3 → 2.40.5

package/constructs/util/{functionBinding.js → binding.js}

@@ -1,7 +1,10 @@
 import * as ssm from "aws-cdk-lib/aws-ssm";
+import { isSSTConstruct } from "../Construct.js";
 import { Config } from "../../config.js";
-export function bindEnvironment(c) {
-    const binding = c.getFunctionBinding();
+import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
+export function getBindingEnvironments(r) {
+    const c = isSSTConstruct(r) ? r : r.resource;
+    const binding = c.getBindings();
     let environment = {};
     if (binding) {
         Object.entries(binding.variables).forEach(([prop, variable]) => {
@@ -22,12 +25,12 @@ export function bindEnvironment(c) {
     }
     return environment;
 }
-export function bindParameters(c) {
-    const binding = c.getFunctionBinding();
+export function getBindingParameters(r) {
+    const c = isSSTConstruct(r) ? r : r.resource;
+    const binding = c.getBindings();
     if (!binding) {
         return;
     }
-    const app = c.node.root;
     Object.entries(binding.variables).forEach(([prop, variable]) => {
         const resId = `Parameter_${prop}`;
         if (!c.node.tryFindChild(resId)) {
@@ -46,15 +49,25 @@ export function bindParameters(c) {
         }
     });
 }
-export function bindPermissions(c) {
-    const binding = c.getFunctionBinding();
-    if (!binding) {
-        return {};
+export function getBindingPermissions(r) {
+    if (isSSTConstruct(r)) {
+        return Object.entries(r.getBindings()?.permissions ?? {}).map(([action, resources]) => new PolicyStatement({
+            actions: [action],
+            effect: Effect.ALLOW,
+            resources,
+        }));
     }
-    return c.getFunctionBinding()?.permissions || {};
+    return r.permissions.map((p) => {
+        return new PolicyStatement({
+            actions: p.actions,
+            effect: Effect.ALLOW,
+            resources: p.resources,
+        });
+    });
 }
-export function bindType(c) {
-    const binding = c.getFunctionBinding();
+export function getBindingType(r) {
+    const c = isSSTConstruct(r) ? r : r.resource;
+    const binding = c.getBindings();
     if (!binding) {
         return;
     }
@@ -63,8 +76,9 @@ export function bindType(c) {
         variables: Object.keys(binding.variables),
     };
 }
-export function getReferencedSecrets(c) {
-    const binding = c.getFunctionBinding();
+export function getBindingReferencedSecrets(r) {
+    const c = isSSTConstruct(r) ? r : r.resource;
+    const binding = c.getBindings();
     const secrets = [];
     if (binding) {
         Object.values(binding.variables).forEach((variable) => {

package/package.json

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

package/runtime/handlers/container.js

@@ -214,6 +214,27 @@ export const useContainerHandler = () => {
                             ? [`-f ${input.props.container.file}`]
                             : []),
                         ...Object.entries(input.props.container?.buildArgs || {}).map(([k, v]) => `--build-arg ${k}=${v}`),
+                        ...(input.props.container?.buildSsh
+                            ? [`--ssh ${input.props.container.buildSsh}`]
+                            : []),
+                        ...(input.props.container?.cacheFrom || []).map((v) => "--cache-from=" +
+                            [
+                                `type=${v.type}`,
+                                ...(v.params
+                                    ? Object.entries(v.params).map(([pk, pv]) => `${pk}=${pv}`)
+                                    : []),
+                            ].join(",")),
+                        ...(input.props.container?.cacheTo
+                            ? [
+                                "--cache-to=" +
+                                    [
+                                        `type=${input.props.container?.cacheTo.type}`,
+                                        ...(input.props.container?.cacheTo?.params
+                                            ? Object.entries(input.props.container?.cacheTo?.params).map(([pk, pv]) => `${pk}=${pv}`)
+                                            : []).join(","),
+                                    ],
+                            ]
+                            : []),
                         `.`,
                     ].join(" "), {
                         cwd: project,
@@ -241,6 +262,27 @@ export const useContainerHandler = () => {
                             ? [`-f ${input.props.container.file}`]
                             : []),
                         ...Object.entries(input.props.container?.buildArgs || {}).map(([k, v]) => `--build-arg ${k}=${v}`),
+                        ...(input.props.container?.buildSsh
+                            ? [`--ssh ${input.props.container.buildSsh}`]
+                            : []),
+                        ...(input.props.container?.cacheFrom || []).map((v) => "--cache-from=" +
+                            [
+                                `type=${v.type}`,
+                                ...(v.params
+                                    ? Object.entries(v.params).map(([pk, pv]) => `${pk}=${pv}`)
+                                    : []),
+                            ].join(",")),
+                        ...(input.props.container?.cacheTo
+                            ? [
+                                "--cache-to=" +
+                                    [
+                                        `type=${input.props.container?.cacheTo.type}`,
+                                        ...(input.props.container?.cacheTo?.params
+                                            ? Object.entries(input.props.container?.cacheTo?.params).map(([pk, pv]) => `${pk}=${pv}`)
+                                            : []).join(","),
+                                    ],
+                            ]
+                            : []),
                         `--platform ${platform}`,
                         `.`,
                     ].join(" "), {

package/runtime/handlers/rust.js

@@ -9,7 +9,8 @@ const execAsync = promisify(exec);
 export const useRustHandler = () => {
     const processes = new Map();
     const sources = new Map();
-    const handlerName = process.platform === "win32" ? `handler.exe` : `handler`;
+    const isWindows = process.platform === "win32";
+    const handlerName = isWindows ? `handler.exe` : `handler`;
     return {
         shouldBuild: (input) => {
             if (!input.file.endsWith(".rs"))
@@ -68,7 +69,7 @@ export const useRustHandler = () => {
                             ...process.env,
                         },
                     });
-                    await fs.cp(path.join(project, `target/debug`, parsed.name), path.join(input.out, "handler"));
+                    await fs.cp(path.join(project, `target/debug`, `${parsed.name}${isWindows ? ".exe" : ""}`), path.join(input.out, "handler"));
                 }
                 catch (ex) {
                     return {

package/support/remix-site-function/edge-server.js

@@ -1,20 +1,12 @@
 // This is a custom Lambda@Edge handler which imports the Remix server
 // build and performs the Remix server rendering.
 
-// We have to ensure that our polyfills are imported prior to any other modules
-// which may depend on them;
-import { installGlobals } from "@remix-run/node";
-installGlobals();
-
 import {
   createRequestHandler as createNodeRequestHandler,
   readableStreamToString,
 } from "@remix-run/node";
 import { URL } from "url";
 
-// Import the server build that was produced by `remix build`;
-import * as remixServerBuild from "./index.js";
-
 /**
  * Common binary MIME types
  */

package/support/remix-site-function/regional-server.js

@@ -1,19 +1,11 @@
 // This is a custom Lambda URL handler which imports the Remix server
 // build and performs the Remix server rendering.
 
-// We have to ensure that our polyfills are imported prior to any other modules
-// which may depend on them;
-import { installGlobals } from "@remix-run/node";
-installGlobals();
-
 import {
   createRequestHandler as createNodeRequestHandler,
   readableStreamToString,
 } from "@remix-run/node";
 
-// Import the server build that was produced by `remix build`;
-import * as remixServerBuild from "./index.js";
-
 /**
  * Common binary MIME types
  */