sst 2.40.1 → 2.40.4

package/cdk/deploy-stack.js

@@ -264,6 +264,8 @@ class FullCloudFormationDeployment {
                 }
                 throw err;
             }
+            if (this.options.noMonitor)
+                return;
             return this.monitorDeployment(startTime, undefined);
         }
         else {

package/cli/commands/bind.js

@@ -30,7 +30,7 @@ export const bind = (program) => program
         import("../../constructs/StaticSite.js"),
         import("../../constructs/deprecated/NextjsSite.js"),
         import("../../constructs/Config.js"),
-        import("../../constructs/util/functionBinding.js"),
+        import("../../constructs/util/binding.js"),
     ]);
     try {
         // Handle deprecated "env" command

package/cli/commands/secrets/list.js

@@ -18,7 +18,7 @@ export const list = (program) => program.command("list [format]", "Fetch all the
             }), {});
         if (Object.entries(secrets).length === 0) {
             Colors.line("No secrets set");
-            return;
+            await exit();
         }
         switch (args.format || "table") {
             case "json":

package/constructs/Api.d.ts

@@ -5,7 +5,7 @@ import { HttpJwtAuthorizer, HttpLambdaAuthorizer, HttpLambdaResponseType, HttpUs
 import { HttpAwsIntegrationProps } from "./cdk/HttpAwsIntegration.js";
 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 { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 import * as apigV2Cors from "./util/apiGatewayV2Cors.js";
@@ -699,7 +699,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
      * api.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific route.
      *
@@ -715,7 +715,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
      * ```
      *
      */
-    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.
      *
@@ -783,7 +783,7 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createHttpApi;
     private addAuthorizers;
     private addRoute;

package/constructs/Api.js

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

package/constructs/ApiGatewayV1Api.d.ts

@@ -7,7 +7,7 @@ import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as apig from "aws-cdk-lib/aws-apigateway";
 import * as apigV1AccessLog from "./util/apiGatewayV1AccessLog.js";
 import { Bucket } from "./Bucket.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 import { Duration } from "./util/duration.js";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
@@ -567,7 +567,7 @@ export declare class ApiGatewayV1Api<Authorizers extends Record<string, ApiGatew
      * api.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific route.
      *
@@ -583,7 +583,7 @@ export declare class ApiGatewayV1Api<Authorizers extends Record<string, ApiGatew
      * ```
      *
      */
-    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.
      *
@@ -626,7 +626,7 @@ export declare class ApiGatewayV1Api<Authorizers extends Record<string, ApiGatew
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createRestApi;
     private buildCorsConfig;
     private createGatewayResponseForCors;

package/constructs/ApiGatewayV1Api.js

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

package/constructs/App.d.ts

@@ -2,6 +2,7 @@ import { Stack } from "./Stack.js";
 import { SSTConstruct } from "./Construct.js";
 import { FunctionProps } from "./Function.js";
 import { Permissions } from "./util/permission.js";
+import { BindingResource } from "./util/binding.js";
 import { StackProps } from "./Stack.js";
 import { FunctionalStack } from "./FunctionalStack.js";
 import { AppProps as CDKAppProps, App as CDKApp, Stack as CDKStack, RemovalPolicy } from "aws-cdk-lib/core";
@@ -144,7 +145,7 @@ export declare class App extends CDKApp {
      * 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/App.js

@@ -3,7 +3,7 @@ import fs from "fs";
 import { Stack } from "./Stack.js";
 import { isSSTConstruct, isStackConstruct, } from "./Construct.js";
 import { useFunctions } from "./Function.js";
-import { bindParameters, bindType } from "./util/functionBinding.js";
+import { getBindingParameters, getBindingType, } from "./util/binding.js";
 import { stack } from "./FunctionalStack.js";
 import { Auth } from "./Auth.js";
 import { useDeferredTasks } from "./deferred_task.js";
@@ -203,7 +203,7 @@ export class App extends CDKApp {
         if ("_doNotAllowOthersToBind" in c && c._doNotAllowOthersToBind) {
             return;
         }
-        const binding = bindType(c);
+        const binding = getBindingType(c);
         if (!binding) {
             return;
         }
@@ -325,13 +325,11 @@ export class App extends CDKApp {
     createBindingSsmParameters() {
         class CreateSsmParameters {
             visit(c) {
-                if (!isSSTConstruct(c)) {
+                if (!isSSTConstruct(c))
                     return;
-                }
-                if ("_doNotAllowOthersToBind" in c && c._doNotAllowOthersToBind) {
+                if ("_doNotAllowOthersToBind" in c && c._doNotAllowOthersToBind)
                     return;
-                }
-                bindParameters(c);
+                getBindingParameters(c);
             }
         }
         Aspects.of(this).add(new CreateSsmParameters());
@@ -423,12 +421,10 @@ export class App extends CDKApp {
         const ids = {};
         class EnsureUniqueConstructIds {
             visit(c) {
-                if (!isSSTConstruct(c)) {
+                if (!isSSTConstruct(c))
                     return;
-                }
-                if ("_doNotAllowOthersToBind" in c && c._doNotAllowOthersToBind) {
+                if ("_doNotAllowOthersToBind" in c && c._doNotAllowOthersToBind)
                     return;
-                }
                 const className = c.constructor.name;
                 const id = c.id;
                 const normId = id.replace(/-/g, "_");

package/constructs/AppSyncApi.d.ts

@@ -5,7 +5,7 @@ import { RDS } from "./RDS.js";
 import * as appSyncApiDomain from "./util/appSyncApiDomain.js";
 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 { Table as CDKTable } from "aws-cdk-lib/aws-dynamodb";
 import { IServerlessCluster } from "aws-cdk-lib/aws-rds";
@@ -491,7 +491,7 @@ export declare class AppSyncApi 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 function data source.
      *
@@ -501,7 +501,7 @@ export declare class AppSyncApi extends Construct implements SSTConstruct {
      * ```
      *
      */
-    bindToDataSource(key: string, constructs: SSTConstruct[]): void;
+    bindToDataSource(key: string, constructs: BindingResource[]): void;
     /**
      * Attaches the given list of permissions to all function data sources
      *
@@ -537,7 +537,7 @@ export declare class AppSyncApi extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps | undefined;
+    getBindings(): BindingProps | undefined;
     private createGraphApi;
     private addDataSource;
     private addResolver;

package/constructs/AppSyncApi.js

@@ -253,7 +253,7 @@ export class AppSyncApi extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         // Do not bind imported AppSync APIs b/c we don't know the API URL
         if (!this.url) {
             return;

package/constructs/Auth.d.ts

@@ -2,7 +2,7 @@ import { Construct } from "constructs";
 import { Api } from "./Api.js";
 import { FunctionDefinition } from "./Function.js";
 import { SSTConstruct } from "./Construct.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingProps } from "./util/binding.js";
 export interface AuthProps {
     /**
      * The function that will handle authentication
@@ -73,7 +73,7 @@ export declare class Auth extends Construct implements SSTConstruct {
         data: {};
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     /**
      * Attaches auth construct to an API
      *

package/constructs/Auth.js

@@ -2,7 +2,7 @@ import * as ssm from "aws-cdk-lib/aws-ssm";
 import { Effect, Policy, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { Construct } from "constructs";
 import { Stack } from "./Stack.js";
-import { getEnvironmentKey, getParameterPath, placeholderSecretValue, } from "./util/functionBinding.js";
+import { getEnvironmentKey, getParameterPath, placeholderSecretValue, } from "./util/binding.js";
 import { CustomResource } from "aws-cdk-lib/core";
 const PUBLIC_KEY_PROP = "publicKey";
 const PRIVATE_KEY_PROP = "privateKey";
@@ -72,7 +72,7 @@ export class Auth extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         const app = this.node.root;
         return {
             clientPackage: "auth",
@@ -127,7 +127,7 @@ export class Auth extends Construct {
                 },
             });
             // Auth construct has two types of Function bindinds:
-            // - Api routes: bindings defined in `getFunctionBinding()`
+            // - Api routes: bindings defined in `getBindings()`
             //     ie. calling `bind([auth])` will grant functions access to the public key
             // - Auth authenticator: binds manually. Need to grant access to the prefix and private key
             const fn = props.api.getFunction(path);

package/constructs/Bucket.d.ts

@@ -3,7 +3,7 @@ import { Queue } from "./Queue.js";
 import { Topic } from "./Topic.js";
 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 { Duration } from "./util/duration.js";
 import { BucketProps as CDKBucketProps, IBucket, EventType, HttpMethods } from "aws-cdk-lib/aws-s3";
@@ -253,7 +253,7 @@ export declare class Bucket extends Construct implements SSTConstruct {
         bucket: IBucket;
     };
     readonly notifications: Record<string, Fn | Queue | Topic>;
-    readonly bindingForAllNotifications: SSTConstruct[];
+    readonly bindingForAllNotifications: BindingResource[];
     readonly permissionsAttachedForAllNotifications: Permissions[];
     readonly props: BucketProps;
     constructor(scope: Construct, id: string, props?: BucketProps);
@@ -294,7 +294,7 @@ export declare class Bucket extends Construct implements SSTConstruct {
      * bucket.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific bucket notification
      *
@@ -309,7 +309,7 @@ export declare class Bucket extends Construct implements SSTConstruct {
      * bucket.bindToNotification("myNotification", ["s3"]);
      * ```
      */
-    bindToNotification(notificationName: string, constructs: SSTConstruct[]): void;
+    bindToNotification(notificationName: string, constructs: BindingResource[]): void;
     /**
      * Attaches additional permissions to all bucket notifications
      * @example
@@ -351,7 +351,7 @@ export declare class Bucket extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createBucket;
     private addNotification;
     private addQueueNotification;

package/constructs/Bucket.js

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

package/constructs/Cognito.d.ts

@@ -4,6 +4,7 @@ import { Function as Fn, FunctionProps, FunctionDefinition } from "./Function.js
 import { Permissions } from "./util/permission.js";
 import { CfnIdentityPool, CfnIdentityPoolProps, CfnIdentityPoolRoleAttachment, IUserPool, IUserPoolClient, UserPoolClientOptions, UserPoolProps } from "aws-cdk-lib/aws-cognito";
 import { Role } from "aws-cdk-lib/aws-iam";
+import { BindingResource } from "./util/binding.js";
 export interface CognitoUserPoolTriggers {
     createAuthChallenge?: FunctionDefinition;
     customEmailSender?: FunctionDefinition;
@@ -198,8 +199,8 @@ export declare class Cognito extends Construct implements SSTConstruct {
      * ```
      */
     attachPermissionsForUnauthUsers(permissions: Permissions): void;
-    bindForTriggers(constructs: SSTConstruct[]): void;
-    bindForTrigger(triggerKey: keyof CognitoUserPoolTriggers, constructs: SSTConstruct[]): void;
+    bindForTriggers(constructs: BindingResource[]): void;
+    bindForTrigger(triggerKey: keyof CognitoUserPoolTriggers, constructs: BindingResource[]): void;
     attachPermissionsForTriggers(permissions: Permissions): void;
     attachPermissionsForTrigger(triggerKey: keyof CognitoUserPoolTriggers, permissions: Permissions): void;
     getFunction(triggerKey: keyof CognitoUserPoolTriggers): Fn | undefined;
@@ -218,7 +219,7 @@ export declare class Cognito extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): undefined;
+    getBindings(): undefined;
     private attachPermissionsForUsers;
     private createUserPool;
     private createUserPoolClient;

package/constructs/Cognito.js

@@ -117,7 +117,7 @@ export class Cognito extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return undefined;
     }
     attachPermissionsForUsers(role, arg1, arg2) {

package/constructs/Construct.d.ts

@@ -1,6 +1,6 @@
 import { Construct } from "constructs";
 import { Stack as CDKStack } from "aws-cdk-lib/core";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingProps } from "./util/binding.js";
 export interface SSTConstructMetadata<T extends string = string, D extends Record<string, any> = Record<string, any>, L extends Record<string, any> = Record<string, any>> {
     type: T;
     data: D;
@@ -9,7 +9,7 @@ export interface SSTConstructMetadata<T extends string = string, D extends Recor
 export interface SSTConstruct extends Construct {
     id: string;
     getConstructMetadata(): SSTConstructMetadata;
-    getFunctionBinding(): FunctionBindingProps | undefined;
+    getBindings(): BindingProps | undefined;
 }
 export declare function getFunctionRef(fn?: any): {
     node: string;

package/constructs/Cron.d.ts

@@ -3,6 +3,7 @@ import * as events from "aws-cdk-lib/aws-events";
 import * as eventsTargets from "aws-cdk-lib/aws-events-targets";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Func, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
+import { BindingResource } from "./util/binding.js";
 import { Permissions } from "./util/permission.js";
 export interface CronJobProps {
     /**
@@ -134,7 +135,7 @@ export declare class Cron extends Construct implements SSTConstruct {
      * ```
      *
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Attaches the given list of permissions to the cron job. This allows the function to access other AWS resources.
      *
@@ -158,7 +159,7 @@ export declare class Cron extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): undefined;
+    getBindings(): undefined;
     private createEventsRule;
     private createRuleTarget;
 }

package/constructs/Cron.js

@@ -76,7 +76,7 @@ export class Cron extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return undefined;
     }
     createEventsRule() {

package/constructs/EdgeFunction.d.ts

@@ -1,8 +1,8 @@
 import { Construct, IConstruct } from "constructs";
 import { Role } from "aws-cdk-lib/aws-iam";
 import { IVersion, IFunction as CdkIFunction } from "aws-cdk-lib/aws-lambda";
-import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, FunctionCopyFilesProps } from "./Function.js";
+import { BindingResource } from "./util/binding.js";
 import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
@@ -14,7 +14,7 @@ export interface EdgeFunctionProps {
     memorySize?: number | Size;
     permissions?: Permissions;
     environment?: Record<string, string>;
-    bind?: SSTConstruct[];
+    bind?: BindingResource[];
     nodejs?: NodeJSProps;
     copyFiles?: FunctionCopyFilesProps[];
     scopeOverride?: IConstruct;

package/constructs/EdgeFunction.js

@@ -13,7 +13,7 @@ import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 import { Stack } from "./Stack.js";
 import { useFunctions, } from "./Function.js";
-import { bindEnvironment, bindPermissions, getReferencedSecrets, } from "./util/functionBinding.js";
+import { getBindingEnvironments, getBindingPermissions, getBindingReferencedSecrets, } from "./util/binding.js";
 import { toCdkSize } from "./util/size.js";
 import { toCdkDuration } from "./util/duration.js";
 import { attachPermissionsToRole } from "./util/permission.js";
@@ -186,20 +186,17 @@ export class EdgeFunction extends Construct {
         };
         // 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
             this.bindingEnvs = {
                 ...this.bindingEnvs,
-                ...bindEnvironment(c),
+                ...getBindingEnvironments(r),
             };
             // Bind permissions
             if (this.props.permissions !== "*") {
-                this.props.permissions.push(...Object.entries(bindPermissions(c)).map(([action, resources]) => new PolicyStatement({
-                    actions: [action],
-                    effect: Effect.ALLOW,
-                    resources,
-                })));
+                const policyStatements = getBindingPermissions(r);
+                this.props.permissions.push(...policyStatements);
             }
         });
     }

package/constructs/EventBus.d.ts

@@ -6,7 +6,7 @@ import { ILogGroup } from "aws-cdk-lib/aws-logs";
 import { Queue } from "./Queue.js";
 import { SSTConstruct } from "./Construct.js";
 import { 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";
 /**
  * Used to configure an EventBus function target
@@ -356,7 +356,7 @@ export declare class EventBus extends Construct implements SSTConstruct {
      * bus.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Binds the given list of resources to a specific event bus rule target
      *
@@ -377,7 +377,7 @@ export declare class EventBus extends Construct implements SSTConstruct {
      * bus.bindToTarget("myRule", 0, [STRIPE_KEY, bucket]);
      * ```
      */
-    bindToTarget(ruleKey: string, targetName: string, constructs: SSTConstruct[]): void;
+    bindToTarget(ruleKey: string, targetName: string, constructs: BindingResource[]): void;
     /**
      * Add permissions to all event targets in this EventBus.
      *
@@ -423,7 +423,7 @@ export declare class EventBus extends Construct implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private retrierQueue;
     private retrierFn;
     private getRetrier;

package/constructs/EventBus.js

@@ -222,7 +222,7 @@ export class EventBus extends Construct {
         };
     }
     /** @internal */
-    getFunctionBinding() {
+    getBindings() {
         return {
             clientPackage: "event-bus",
             variables: {

package/constructs/Function.d.ts

@@ -4,7 +4,7 @@ import { Stack } from "./Stack.js";
 import { SSTConstruct } from "./Construct.js";
 import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
-import { FunctionBindingProps } from "./util/functionBinding.js";
+import { BindingResource, BindingProps } from "./util/binding.js";
 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";
@@ -42,7 +42,7 @@ 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
+     * @default No cache from args are passed
      * @example
      * ```js
      * cacheFrom: [{type: "gha"}],
@@ -51,7 +51,7 @@ export interface FunctionDockerBuildProps {
     cacheFrom?: FunctionDockerBuildCacheProps[];
     /**
      * Cache to options to pass to the `docker build` command.
-     * @default - no cache to args are passed
+     * @default No cache to args are passed
      * @example
      * ```js
      * cacheTo: {type: "gha"},
@@ -251,7 +251,7 @@ export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "m
      * })
      * ```
      */
-    bind?: SSTConstruct[];
+    bind?: BindingResource[];
     /**
      * Attaches the given list of permissions to the function. Configuring this property is equivalent to calling `attachPermissions()` after the function is created.
      *
@@ -686,6 +686,42 @@ export interface ContainerProps {
      * ```
      */
     buildArgs?: Record<string, string>;
+    /**
+     * SSH agent socket or keys to pass to the docker build command.
+     * Docker BuildKit must be enabled to use the ssh flag
+     * @default No --ssh flag is passed to the build command
+     * @example
+     * ```js
+     * container: {
+     *   buildSsh: "default"
+     * }
+     * ```
+     */
+    buildSsh?: string;
+    /**
+     * Cache from options to pass to the docker build command.
+     * [DockerCacheOption](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ecr_assets.DockerCacheOption.html)[].
+     * @default No cache from options are passed to the build command
+     * @example
+     * ```js
+     * container: {
+     *   cacheFrom: [{ type: 'registry', params: { ref: 'ghcr.io/myorg/myimage:cache' }}],
+     * }
+     * ```
+     */
+    cacheFrom?: FunctionDockerBuildCacheProps[];
+    /**
+     * Cache to options to pass to the docker build command.
+     * [DockerCacheOption](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ecr_assets.DockerCacheOption.html)[].
+     * @default No cache to options are passed to the build command
+     * @example
+     * ```js
+     * container: {
+     *   cacheTo: { type: 'registry', params: { ref: 'ghcr.io/myorg/myimage:cache', mode: 'max', compression: 'zstd' }},
+     * }
+     * ```
+     */
+    cacheTo?: FunctionDockerBuildCacheProps;
 }
 /**
  * Used to configure additional files to copy into the function bundle
@@ -744,7 +780,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
      * fn.bind([STRIPE_KEY, bucket]);
      * ```
      */
-    bind(constructs: SSTConstruct[]): void;
+    bind(constructs: BindingResource[]): void;
     /**
      * Attaches additional permissions to function.
      *
@@ -768,7 +804,7 @@ export declare class Function extends CDKFunction implements SSTConstruct {
         };
     };
     /** @internal */
-    getFunctionBinding(): FunctionBindingProps;
+    getBindings(): BindingProps;
     private createUrl;
     private createSecretPrefetcher;
     private disableCloudWatchLogs;