sst 2.40.3 → 2.40.4

package/constructs/SsrFunction.js

@@ -13,7 +13,7 @@ import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 import { useFunctions, } from "./Function.js";
 import { Stack } from "./Stack.js";
-import { bindEnvironment, bindPermissions, getReferencedSecrets, } from "./util/functionBinding.js";
+import { getBindingEnvironments, getBindingPermissions, getBindingReferencedSecrets, } from "./util/binding.js";
 import { attachPermissionsToRole } from "./util/permission.js";
 import { toCdkSize } from "./util/size.js";
 import { toCdkDuration } from "./util/duration.js";
@@ -193,20 +193,14 @@ export class SsrFunction extends Construct {
         this.function.addEnvironment("SST_SSM_PREFIX", useProject().config.ssmPrefix);
         // Get referenced secrets
         const referencedSecrets = [];
-        constructs.forEach((c) => referencedSecrets.push(...getReferencedSecrets(c)));
-        [...constructs, ...referencedSecrets].forEach((c) => {
+        constructs.forEach((r) => referencedSecrets.push(...getBindingReferencedSecrets(r)));
+        [...constructs, ...referencedSecrets].forEach((r) => {
             // Bind environment
-            const env = bindEnvironment(c);
+            const env = getBindingEnvironments(r);
             Object.entries(env).forEach(([key, value]) => this.function.addEnvironment(key, value));
             // Bind permissions
-            const permissions = bindPermissions(c);
-            Object.entries(permissions).forEach(([action, resources]) => this.attachPermissions([
-                new PolicyStatement({
-                    actions: [action],
-                    effect: Effect.ALLOW,
-                    resources,
-                }),
-            ]));
+            const policyStatements = getBindingPermissions(r);
+            this.attachPermissions(policyStatements);
         });
     }
     async buildAssetFromHandler() {
@@ -323,7 +317,7 @@ export class SsrFunction extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return undefined;
     }
 }

package/constructs/SsrSite.d.ts

@@ -12,7 +12,7 @@ import { BaseSiteFileOptions, BaseSiteReplaceProps, BaseSiteCdkDistributionProps
 import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 type CloudFrontFunctionConfig = {
     constructId: string;
     injections: string[];
@@ -71,7 +71,7 @@ export interface SsrSiteProps {
      * })
      * ```
      */
-    bind?: SSTConstruct[];
+    bind?: BindingResource[];
     /**
      * Path to the directory where the app is located.
      * @default "."
@@ -474,7 +474,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     };
     abstract getConstructMetadata(): ReturnType<SSTConstruct["getConstructMetadata"]>;
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     protected useCloudFrontFunctionHostHeaderInjection(): string;
     protected abstract plan(bucket: Bucket): ReturnType<typeof this.validatePlan>;
     protected validatePlan<CloudFrontFunctions extends Record<string, CloudFrontFunctionConfig>, EdgeFunctions extends Record<string, EdgeFunctionConfig>, Origins extends Record<string, FunctionOriginConfig | ImageOptimizationFunctionOriginConfig | S3OriginConfig | OriginGroupConfig>>(input: {

package/constructs/SsrSite.js

@@ -26,7 +26,7 @@ import { EdgeFunction } from "./EdgeFunction.js";
 import { getBuildCmdEnvironment, } from "./BaseSite.js";
 import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
-import { getParameterPath, } from "./util/functionBinding.js";
+import { getParameterPath, } from "./util/binding.js";
 import { useProject } from "../project.js";
 import { VisibleError } from "../error.js";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
@@ -881,7 +881,7 @@ function handler(event) {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         const app = this.node.root;
         return {
             clientPackage: "site",

package/constructs/Stack.d.ts

@@ -2,8 +2,8 @@ import { Construct } from "constructs";
 import { StackProps as CDKStackProps, Stack as CDKStack, CfnOutputProps } from "aws-cdk-lib/core";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import { FunctionProps, Function as Fn } from "./Function.js";
-import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
+import { BindingResource } from "./util/binding.js";
 export type StackProps = CDKStackProps;
 /**
  * The Stack construct extends cdk.Stack. It automatically prefixes the stack names with the stage and app name to ensure that they can be deployed to multiple regions in the same AWS account. It also ensure that the stack uses the same AWS profile and region as the app. They're defined using functions that return resources that can be imported by other stacks.
@@ -80,7 +80,7 @@ export declare class Stack extends CDKStack {
      * app.addDefaultFunctionBinding([STRIPE_KEY, bucket]);
      * ```
      */
-    addDefaultFunctionBinding(bind: SSTConstruct[]): void;
+    addDefaultFunctionBinding(bind: BindingResource[]): void;
     /**
      * Adds additional default layers to be applied to all Lambda functions in the stack.
      *

package/constructs/StaticSite.d.ts

@@ -4,7 +4,7 @@ import { IDistribution } from "aws-cdk-lib/aws-cloudfront";
 import { DistributionDomainProps } from "./Distribution.js";
 import { BaseSiteFileOptions, BaseSiteReplaceProps, BaseSiteCdkDistributionProps } from "./BaseSite.js";
 import { SSTConstruct } from "./Construct.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingProps } from "./util/binding.js";
 export interface StaticSiteProps {
     /**
      * Path to the directory where the website source is located.
@@ -338,7 +338,7 @@ export declare class StaticSite extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private validateDeprecatedFileOptions;
     private generateViteTypes;
     private buildApp;

package/constructs/StaticSite.js

@@ -14,7 +14,7 @@ import { Distribution } from "./Distribution.js";
 import { getBuildCmdEnvironment, buildErrorResponsesFor404ErrorPage, buildErrorResponsesForRedirectToIndex, } from "./BaseSite.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { isCDKConstruct } from "./Construct.js";
-import { getParameterPath, } from "./util/functionBinding.js";
+import { getParameterPath } from "./util/binding.js";
 import { gray } from "colorette";
 import { useProject } from "../project.js";
 import { createAppContext } from "./context.js";
@@ -130,7 +130,7 @@ export class StaticSite extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         const app = this.node.root;
         return {
             clientPackage: "site",

package/constructs/Table.d.ts

@@ -4,7 +4,7 @@ import * as lambdaEventSources from "aws-cdk-lib/aws-lambda-event-sources";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
 import { KinesisStream } from "./KinesisStream.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 import { Permissions } from "./util/permission.js";
 export interface TableConsumerProps {
     /**
@@ -343,7 +343,7 @@ export declare class Table extends Construct implements SSTConstruct {
      * table.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific consumer of this table.
      *
@@ -352,7 +352,7 @@ export declare class Table extends Construct implements SSTConstruct {
      * table.bindToConsumer("consumer1", [STRIPE_KEY, bucket]);
      * ```
      */
-    bindToConsumer(consumerName: string, constructs: SSTConstruct[]): void;
+    bindToConsumer(consumerName: string, constructs: BindingResource[]): void;
     /**
      * Grant permissions to all consumers of this table.
      *
@@ -399,7 +399,7 @@ export declare class Table extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createTable;
     private addConsumer;
     private buildAttribute;

package/constructs/Table.js

@@ -267,7 +267,7 @@ export class Table extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "table",
             variables: {

package/constructs/Topic.d.ts

@@ -4,7 +4,7 @@ import { Construct } from "constructs";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
 import { Queue } from "./Queue.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 import { Permissions } from "./util/permission.js";
 /**
  * Used to define a queue subscriber for a topic
@@ -190,7 +190,7 @@ export declare class Topic extends Construct implements SSTConstruct {
      * topic.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific subscriber.
      * @example
@@ -205,7 +205,7 @@ export declare class Topic extends Construct implements SSTConstruct {
      * topic.bindToSubscriber("subscriber1", [STRIPE_KEY, bucket]);
      * ```
      */
-    bindToSubscriber(subscriberName: string, constructs: SSTConstruct[]): void;
+    bindToSubscriber(subscriberName: string, constructs: BindingResource[]): void;
     /**
      * Attaches the given list of permissions to all the subscriber functions. This allows the subscribers to access other AWS resources.
      *
@@ -249,7 +249,7 @@ export declare class Topic extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createTopic;
     private addSubscriber;
     private addQueueSubscriber;

package/constructs/Topic.js

@@ -195,7 +195,7 @@ export class Topic extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "topic",
             variables: {

package/constructs/WebSocketApi.d.ts

@@ -5,7 +5,7 @@ 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";
+import { BindingResource, BindingProps } from "./util/binding.js";
 import { Permissions } from "./util/permission.js";
 import * as apigV2Domain from "./util/apiGatewayV2Domain.js";
 import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
@@ -301,7 +301,7 @@ export declare class WebSocketApi extends Construct implements SSTConstruct {
      * api.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific route.
      *
@@ -311,7 +311,7 @@ export declare class WebSocketApi extends Construct implements SSTConstruct {
      * ```
      *
      */
-    bindToRoute(routeKey: string, constructs: SSTConstruct[]): void;
+    bindToRoute(routeKey: string, constructs: BindingResource[]): void;
     /**
      * Attaches the given list of permissions to all the routes. This allows the functions to access other AWS resources.
      *
@@ -348,7 +348,7 @@ export declare class WebSocketApi extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createWebSocketApi;
     private createWebSocketStage;
     private createCloudWatchRole;

package/constructs/WebSocketApi.js

@@ -196,7 +196,7 @@ export class WebSocketApi extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "websocket-api",
             variables: {

package/constructs/deprecated/NextjsSite.d.ts

@@ -8,7 +8,7 @@ import { SSTConstruct } from "../Construct.js";
 import { DistributionDomainProps } from "../Distribution.js";
 import { BaseSiteCdkDistributionProps } from "../BaseSite.js";
 import { Permissions } from "../util/permission.js";
-import { FunctionBindingProps } from "../util/functionBinding.js";
+import { BindingProps } from "../util/binding.js";
 export interface NextjsDomainProps extends DistributionDomainProps {
 }
 export interface NextjsCdkDistributionProps extends BaseSiteCdkDistributionProps {
@@ -268,7 +268,7 @@ export declare class NextjsSite extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private zipAppAssets;
     private zipAppStubAssets;
     private createEdgeFunction;

package/constructs/deprecated/NextjsSite.js

@@ -24,7 +24,7 @@ import { isCDKConstruct } from "../Construct.js";
 import { getBuildCmdEnvironment, buildErrorResponsesForRedirectToIndex, } from "../BaseSite.js";
 import { attachPermissionsToRole } from "../util/permission.js";
 import { getHandlerHash } from "../util/builder.js";
-import { getParameterPath, } from "../util/functionBinding.js";
+import { getParameterPath } from "../util/binding.js";
 import * as crossRegionHelper from "./cross-region-helper.js";
 import { gray, red } from "colorette";
 import { useProject } from "../../project.js";
@@ -242,7 +242,7 @@ export class NextjsSite extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         const app = this.node.root;
         return {
             clientPackage: "site",

package/constructs/future/Auth.d.ts

@@ -3,7 +3,7 @@ import { Api, ApiProps } from "../Api.js";
 import { FunctionDefinition } from "../Function.js";
 import { SSTConstruct } from "../Construct.js";
 import { Secret } from "../Secret.js";
-import { FunctionBindingProps } from "../util/functionBinding.js";
+import { BindingProps } from "../util/binding.js";
 export interface AuthProps {
     /**
      * The function that will handle authentication
@@ -76,5 +76,5 @@ export declare class Auth extends Construct implements SSTConstruct {
         data: {};
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
 }

package/constructs/future/Auth.js

@@ -3,7 +3,7 @@ import { Construct } from "constructs";
 import { Api } from "../Api.js";
 import { Stack } from "../Stack.js";
 import { Secret } from "../Secret.js";
-import { getParameterPath, } from "../util/functionBinding.js";
+import { getParameterPath } from "../util/binding.js";
 import { CustomResource } from "aws-cdk-lib/core";
 /**
  * SST Auth is a lightweight authentication solution for your applications. With a simple set of configuration you can deploy a function attached to your API that can handle various authentication flows.  *
@@ -105,7 +105,7 @@ export class Auth extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "future/auth",
             variables: {

package/constructs/util/{functionBinding.d.ts → binding.d.ts}

@@ -1,6 +1,7 @@
 import { SSTConstruct } from "../Construct.js";
 import { Secret } from "../Secret.js";
-export interface FunctionBindingProps {
+import { PolicyStatement } from "aws-cdk-lib/aws-iam";
+export interface BindingProps {
     clientPackage: string;
     permissions: Record<string, string[]>;
     variables: Record<string, {
@@ -19,14 +20,21 @@ export interface FunctionBindingProps {
         value: string;
     }>;
 }
-export declare function bindEnvironment(c: SSTConstruct): Record<string, string>;
-export declare function bindParameters(c: SSTConstruct): void;
-export declare function bindPermissions(c: SSTConstruct): Record<string, string[]>;
-export declare function bindType(c: SSTConstruct): {
+export type BindingResource = SSTConstruct | {
+    resource: SSTConstruct;
+    permissions: {
+        actions: string[];
+        resources: string[];
+    }[];
+};
+export declare function getBindingEnvironments(r: BindingResource): Record<string, string>;
+export declare function getBindingParameters(r: BindingResource): void;
+export declare function getBindingPermissions(r: BindingResource): PolicyStatement[];
+export declare function getBindingType(r: BindingResource): {
     clientPackage: string;
     variables: string[];
 } | undefined;
-export declare function getReferencedSecrets(c: SSTConstruct): Secret[];
+export declare function getBindingReferencedSecrets(r: BindingResource): Secret[];
 export declare function getEnvironmentKey(c: SSTConstruct, prop: string): string;
 export declare function getParameterPath(c: SSTConstruct, prop: string): string;
 export declare function getParameterFallbackPath(c: SSTConstruct, prop: string): string;

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.4",
   "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.4",
     "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 {