sst 2.1.31 → 2.1.33

package/constructs/AppSyncApi.js

@@ -11,11 +11,11 @@ export async function weakImport(pkg) {
 const { print, buildSchema } = await weakImport("graphql");
 const { mergeTypeDefs } = await weakImport("@graphql-tools/merge");
 import { Construct } from "constructs";
-import * as appsync from "aws-cdk-lib/aws-appsync";
 import * as appSyncApiDomain from "./util/appSyncApiDomain.js";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { useProject } from "../project.js";
+import { GraphqlApi, MappingTemplate as CDKMappingTemplate, SchemaFile, } from "aws-cdk-lib/aws-appsync";
 /////////////////////
 // Construct
 /////////////////////
@@ -282,7 +282,7 @@ export class AppSyncApi extends Construct {
                 throw new Error(`Missing "schema" in "${id}" AppSyncApi`);
             }
             else if (typeof schema === "string") {
-                mainSchema = appsync.SchemaFile.fromAsset(schema);
+                mainSchema = SchemaFile.fromAsset(schema);
             }
             else {
                 if (schema.length === 0) {
@@ -294,13 +294,13 @@ export class AppSyncApi extends Construct {
                     .map(buildSchema));
                 const filePath = path.join(useProject().paths.out, `appsyncapi-${id}-${this.node.addr}.graphql`);
                 fs.writeFileSync(filePath, print(mergedSchema));
-                mainSchema = appsync.SchemaFile.fromAsset(filePath);
+                mainSchema = SchemaFile.fromAsset(filePath);
             }
             // build domain
             const domainData = appSyncApiDomain.buildCustomDomainData(this, customDomain);
             this._customDomainUrl =
                 domainData && `https://${domainData.domainName}/graphql`;
-            this.cdk.graphqlApi = new appsync.GraphqlApi(this, "Api", {
+            this.cdk.graphqlApi = new GraphqlApi(this, "Api", {
                 name: app.logicalPrefixedName(id),
                 xrayEnabled: true,
                 schema: mainSchema,
@@ -482,9 +482,9 @@ export class AppSyncApi extends Construct {
             return undefined;
         }
         if (mapping.file) {
-            return appsync.MappingTemplate.fromFile(mapping.file);
+            return CDKMappingTemplate.fromFile(mapping.file);
         }
-        return appsync.MappingTemplate.fromString(mapping.inline);
+        return CDKMappingTemplate.fromString(mapping.inline);
     }
     buildDataSourceKey(typeName, fieldName) {
         return `LambdaDS_${typeName}_${fieldName}`;

package/constructs/Bucket.d.ts

@@ -1,5 +1,4 @@
 import { Construct } from "constructs";
-import * as s3 from "aws-cdk-lib/aws-s3";
 import { Queue } from "./Queue.js";
 import { Topic } from "./Topic.js";
 import { SSTConstruct } from "./Construct.js";
@@ -7,11 +6,12 @@ import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefini
 import { FunctionBindingProps } from "./util/functionBinding.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";
 export interface BucketCorsRule {
     /**
      * The collection of allowed HTTP methods.
      */
-    allowedMethods: (keyof typeof s3.HttpMethods)[];
+    allowedMethods: (keyof typeof HttpMethods)[];
     /**
      * The collection of allowed origins.
      *
@@ -46,7 +46,7 @@ interface BucketBaseNotificationProps {
     /**
      * The S3 event types that will trigger the notification.
      */
-    events?: Lowercase<keyof typeof s3.EventType>[];
+    events?: Lowercase<keyof typeof EventType>[];
     /**
      * S3 object key filter rules to determine which objects trigger this event.
      */
@@ -219,7 +219,7 @@ export interface BucketProps {
          * });
          * ```
          */
-        bucket?: s3.IBucket | s3.BucketProps;
+        bucket?: IBucket | CDKBucketProps;
     };
 }
 /**
@@ -239,7 +239,7 @@ export declare class Bucket extends Construct implements SSTConstruct {
         /**
          * The internally created CDK `Bucket` instance.
          */
-        bucket: s3.IBucket;
+        bucket: IBucket;
     };
     readonly notifications: Record<string, Fn | Queue | Topic>;
     readonly bindingForAllNotifications: SSTConstruct[];

package/constructs/Bucket.js

@@ -1,11 +1,11 @@
 import { Construct } from "constructs";
-import * as s3 from "aws-cdk-lib/aws-s3";
-import * as s3Notifications from "aws-cdk-lib/aws-s3-notifications";
 import { Queue } from "./Queue.js";
 import { Topic } from "./Topic.js";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
+import { Bucket as CDKBucket, EventType, HttpMethods, } from "aws-cdk-lib/aws-s3";
+import { LambdaDestination, SnsDestination, SqsDestination, } from "aws-cdk-lib/aws-s3-notifications";
 /////////////////////
 // Construct
 /////////////////////
@@ -179,7 +179,7 @@ export class Bucket extends Construct {
             this.cdk.bucket = cdk?.bucket;
         }
         else {
-            this.cdk.bucket = new s3.Bucket(this, "Bucket", {
+            this.cdk.bucket = new CDKBucket(this, "Bucket", {
                 bucketName: name,
                 cors: this.buildCorsConfig(cors),
                 ...cdk?.bucket,
@@ -202,7 +202,7 @@ export class Bucket extends Construct {
             this.addFunctionNotification(scope, notificationName, notification);
         }
     }
-    addQueueNotification(scope, notificationName, notification) {
+    addQueueNotification(_scope, notificationName, notification) {
         // Parse notification props
         let notificationProps;
         let queue;
@@ -225,9 +225,9 @@ export class Bucket extends Construct {
             "object_removed",
         ];
         const filters = notificationProps?.filters || [];
-        events.forEach((event) => this.cdk.bucket.addEventNotification(s3.EventType[event.toUpperCase()], new s3Notifications.SqsDestination(queue.cdk.queue), ...filters));
+        events.forEach((event) => this.cdk.bucket.addEventNotification(EventType[event.toUpperCase()], new SqsDestination(queue.cdk.queue), ...filters));
     }
-    addTopicNotification(scope, notificationName, notification) {
+    addTopicNotification(_scope, notificationName, notification) {
         // Parse notification props
         let notificationProps;
         let topic;
@@ -250,7 +250,7 @@ export class Bucket extends Construct {
             "object_removed",
         ];
         const filters = notificationProps?.filters || [];
-        events.forEach((event) => this.cdk.bucket.addEventNotification(s3.EventType[event.toUpperCase()], new s3Notifications.SnsDestination(topic.cdk.topic), ...filters));
+        events.forEach((event) => this.cdk.bucket.addEventNotification(EventType[event.toUpperCase()], new SnsDestination(topic.cdk.topic), ...filters));
     }
     addFunctionNotification(scope, notificationName, notification) {
         // parse notification
@@ -275,7 +275,7 @@ export class Bucket extends Construct {
             "object_removed",
         ];
         const filters = notificationProps?.filters || [];
-        events.forEach((event) => this.cdk.bucket.addEventNotification(s3.EventType[event.toUpperCase()], new s3Notifications.LambdaDestination(fn), ...filters));
+        events.forEach((event) => this.cdk.bucket.addEventNotification(EventType[event.toUpperCase()], new LambdaDestination(fn), ...filters));
         // attached permissions
         this.permissionsAttachedForAllNotifications.forEach((permissions) => fn.attachPermissions(permissions));
         fn.bind(this.bindingForAllNotifications);
@@ -289,18 +289,18 @@ export class Bucket extends Construct {
                 {
                     allowedHeaders: ["*"],
                     allowedMethods: [
-                        s3.HttpMethods.GET,
-                        s3.HttpMethods.PUT,
-                        s3.HttpMethods.HEAD,
-                        s3.HttpMethods.POST,
-                        s3.HttpMethods.DELETE,
+                        HttpMethods.GET,
+                        HttpMethods.PUT,
+                        HttpMethods.HEAD,
+                        HttpMethods.POST,
+                        HttpMethods.DELETE,
                     ],
                     allowedOrigins: ["*"],
                 },
             ];
         }
         return cors.map((e) => ({
-            allowedMethods: (e.allowedMethods || []).map((method) => s3.HttpMethods[method]),
+            allowedMethods: (e.allowedMethods || []).map((method) => HttpMethods[method]),
             allowedOrigins: e.allowedOrigins,
             allowedHeaders: e.allowedHeaders,
             exposedHeaders: e.exposedHeaders,

package/constructs/Cognito.d.ts

@@ -1,9 +1,9 @@
 import { Construct } from "constructs";
-import * as iam from "aws-cdk-lib/aws-iam";
-import * as cognito from "aws-cdk-lib/aws-cognito";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionDefinition } from "./Function.js";
 import { Permissions } from "./util/permission.js";
+import { CfnIdentityPool, CfnIdentityPoolProps, IUserPool, IUserPoolClient, UserPoolClientOptions, UserPoolProps } from "aws-cdk-lib/aws-cognito";
+import { Role } from "aws-cdk-lib/aws-iam";
 export interface CognitoUserPoolTriggers {
     createAuthChallenge?: FunctionDefinition;
     customEmailSender?: FunctionDefinition;
@@ -38,7 +38,7 @@ export interface CognitoTwitterProps {
     consumerKey: string;
     consumerSecret: string;
 }
-export interface CognitoCdkCfnIdentityPoolProps extends Omit<cognito.CfnIdentityPoolProps, "allowUnauthenticatedIdentities"> {
+export interface CognitoCdkCfnIdentityPoolProps extends Omit<CfnIdentityPoolProps, "allowUnauthenticatedIdentities"> {
     allowUnauthenticatedIdentities?: boolean;
 }
 export interface CognitoIdentityPoolFederationProps {
@@ -112,11 +112,11 @@ export interface CognitoProps {
         /**
          * This allows you to override the default settings this construct uses internally to create the User Pool.
          */
-        userPool?: cognito.UserPoolProps | cognito.IUserPool;
+        userPool?: UserPoolProps | IUserPool;
         /**
          * This allows you to override the default settings this construct uses internally to create the User Pool client.
          */
-        userPoolClient?: cognito.UserPoolClientOptions | cognito.IUserPoolClient;
+        userPoolClient?: UserPoolClientOptions | IUserPoolClient;
     };
 }
 /**
@@ -133,11 +133,11 @@ export interface CognitoProps {
 export declare class Cognito extends Construct implements SSTConstruct {
     readonly id: string;
     readonly cdk: {
-        userPool: cognito.IUserPool;
-        userPoolClient: cognito.IUserPoolClient;
-        cfnIdentityPool?: cognito.CfnIdentityPool;
-        authRole: iam.Role;
-        unauthRole: iam.Role;
+        userPool: IUserPool;
+        userPoolClient: IUserPoolClient;
+        cfnIdentityPool?: CfnIdentityPool;
+        authRole: Role;
+        unauthRole: Role;
     };
     private functions;
     private props;

package/constructs/Cognito.js

@@ -1,23 +1,23 @@
 import { Construct } from "constructs";
-import * as iam from "aws-cdk-lib/aws-iam";
-import * as cognito from "aws-cdk-lib/aws-cognito";
 import { Stack } from "./Stack.js";
-import { getFunctionRef, isCDKConstruct, } from "./Construct.js";
+import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { attachPermissionsToRole, attachPermissionsToPolicy, } from "./util/permission.js";
+import { CfnIdentityPool, CfnIdentityPoolRoleAttachment, UserPool, UserPoolClient, UserPoolOperation, } from "aws-cdk-lib/aws-cognito";
+import { Effect, FederatedPrincipal, OpenIdConnectProvider, Policy, PolicyStatement, Role, } from "aws-cdk-lib/aws-iam";
 const CognitoUserPoolTriggerOperationMapping = {
-    createAuthChallenge: cognito.UserPoolOperation.CREATE_AUTH_CHALLENGE,
-    customEmailSender: cognito.UserPoolOperation.CUSTOM_EMAIL_SENDER,
-    customMessage: cognito.UserPoolOperation.CUSTOM_MESSAGE,
-    customSmsSender: cognito.UserPoolOperation.CUSTOM_SMS_SENDER,
-    defineAuthChallenge: cognito.UserPoolOperation.DEFINE_AUTH_CHALLENGE,
-    postAuthentication: cognito.UserPoolOperation.POST_AUTHENTICATION,
-    postConfirmation: cognito.UserPoolOperation.POST_CONFIRMATION,
-    preAuthentication: cognito.UserPoolOperation.PRE_AUTHENTICATION,
-    preSignUp: cognito.UserPoolOperation.PRE_SIGN_UP,
-    preTokenGeneration: cognito.UserPoolOperation.PRE_TOKEN_GENERATION,
-    userMigration: cognito.UserPoolOperation.USER_MIGRATION,
-    verifyAuthChallengeResponse: cognito.UserPoolOperation.VERIFY_AUTH_CHALLENGE_RESPONSE,
+    createAuthChallenge: UserPoolOperation.CREATE_AUTH_CHALLENGE,
+    customEmailSender: UserPoolOperation.CUSTOM_EMAIL_SENDER,
+    customMessage: UserPoolOperation.CUSTOM_MESSAGE,
+    customSmsSender: UserPoolOperation.CUSTOM_SMS_SENDER,
+    defineAuthChallenge: UserPoolOperation.DEFINE_AUTH_CHALLENGE,
+    postAuthentication: UserPoolOperation.POST_AUTHENTICATION,
+    postConfirmation: UserPoolOperation.POST_CONFIRMATION,
+    preAuthentication: UserPoolOperation.PRE_AUTHENTICATION,
+    preSignUp: UserPoolOperation.PRE_SIGN_UP,
+    preTokenGeneration: UserPoolOperation.PRE_TOKEN_GENERATION,
+    userMigration: UserPoolOperation.USER_MIGRATION,
+    verifyAuthChallengeResponse: UserPoolOperation.VERIFY_AUTH_CHALLENGE_RESPONSE,
 };
 /////////////////////
 // Construct
@@ -141,7 +141,7 @@ export class Cognito extends Construct {
                 : `Auth-${this.node.id}-${scope.node.id}-UnauthRole`;
             let policy = scope.node.tryFindChild(policyId);
             if (!policy) {
-                policy = new iam.Policy(scope, policyId);
+                policy = new Policy(scope, policyId);
             }
             role.attachInlinePolicy(policy);
             attachPermissionsToPolicy(policy, permissions);
@@ -154,8 +154,7 @@ export class Cognito extends Construct {
             this.cdk.userPool = cdk?.userPool;
         }
         else {
-            const cognitoUserPoolProps = (cdk?.userPool ||
-                {});
+            const cognitoUserPoolProps = (cdk?.userPool || {});
             // validate `lambdaTriggers` is not specified
             if (cognitoUserPoolProps.lambdaTriggers) {
                 throw new Error(`Cannot configure the "cdk.userPool.lambdaTriggers" in the Cognito construct. Use the "triggers" instead.`);
@@ -164,7 +163,7 @@ export class Cognito extends Construct {
             if (isCDKConstruct(cdk?.userPoolClient)) {
                 throw new Error(`Cannot import the "userPoolClient" when the "userPool" is not imported.`);
             }
-            this.cdk.userPool = new cognito.UserPool(this, "UserPool", {
+            this.cdk.userPool = new UserPool(this, "UserPool", {
                 userPoolName: app.logicalPrefixedName(this.node.id),
                 selfSignUpEnabled: true,
                 signInCaseSensitive: false,
@@ -179,9 +178,8 @@ export class Cognito extends Construct {
             this.cdk.userPoolClient = cdk?.userPoolClient;
         }
         else {
-            const clientProps = (cdk?.userPoolClient ||
-                {});
-            this.cdk.userPoolClient = new cognito.UserPoolClient(this, "UserPoolClient", {
+            const clientProps = (cdk?.userPoolClient || {});
+            this.cdk.userPoolClient = new UserPoolClient(this, "UserPoolClient", {
                 userPool: this.cdk.userPool,
                 ...clientProps,
             });
@@ -217,7 +215,7 @@ export class Cognito extends Construct {
                 if (!auth0.clientId) {
                     throw new Error(`Auth0ClientId: No Auth0 clientId defined for the "${id}" Auth`);
                 }
-                const provider = new iam.OpenIdConnectProvider(this, "Auth0Provider", {
+                const provider = new OpenIdConnectProvider(this, "Auth0Provider", {
                     url: auth0.domain.startsWith("https://")
                         ? auth0.domain
                         : `https://${auth0.domain}`,
@@ -266,7 +264,7 @@ export class Cognito extends Construct {
         const identityPoolProps = typeof identityPoolFederation === "object"
             ? identityPoolFederation.cdk?.cfnIdentityPool || {}
             : {};
-        this.cdk.cfnIdentityPool = new cognito.CfnIdentityPool(this, "IdentityPool", {
+        this.cdk.cfnIdentityPool = new CfnIdentityPool(this, "IdentityPool", {
             identityPoolName: app.logicalPrefixedName(id),
             allowUnauthenticatedIdentities: true,
             cognitoIdentityProviders,
@@ -277,7 +275,7 @@ export class Cognito extends Construct {
         this.cdk.authRole = this.createAuthRole(this.cdk.cfnIdentityPool);
         this.cdk.unauthRole = this.createUnauthRole(this.cdk.cfnIdentityPool);
         // Attach roles to Identity Pool
-        new cognito.CfnIdentityPoolRoleAttachment(this, "IdentityPoolRoleAttachment", {
+        new CfnIdentityPoolRoleAttachment(this, "IdentityPoolRoleAttachment", {
             identityPoolId: this.cdk.cfnIdentityPool.ref,
             roles: {
                 authenticated: this.cdk.authRole.roleArn,
@@ -312,8 +310,8 @@ export class Cognito extends Construct {
         return lambda;
     }
     createAuthRole(identityPool) {
-        const role = new iam.Role(this, "IdentityPoolAuthRole", {
-            assumedBy: new iam.FederatedPrincipal("cognito-identity.amazonaws.com", {
+        const role = new Role(this, "IdentityPoolAuthRole", {
+            assumedBy: new FederatedPrincipal("cognito-identity.amazonaws.com", {
                 StringEquals: {
                     "cognito-identity.amazonaws.com:aud": identityPool.ref,
                 },
@@ -322,8 +320,8 @@ export class Cognito extends Construct {
                 },
             }, "sts:AssumeRoleWithWebIdentity"),
         });
-        role.addToPolicy(new iam.PolicyStatement({
-            effect: iam.Effect.ALLOW,
+        role.addToPolicy(new PolicyStatement({
+            effect: Effect.ALLOW,
             actions: [
                 "mobileanalytics:PutEvents",
                 "cognito-sync:*",
@@ -334,8 +332,8 @@ export class Cognito extends Construct {
         return role;
     }
     createUnauthRole(identityPool) {
-        const role = new iam.Role(this, "IdentityPoolUnauthRole", {
-            assumedBy: new iam.FederatedPrincipal("cognito-identity.amazonaws.com", {
+        const role = new Role(this, "IdentityPoolUnauthRole", {
+            assumedBy: new FederatedPrincipal("cognito-identity.amazonaws.com", {
                 StringEquals: {
                     "cognito-identity.amazonaws.com:aud": identityPool.ref,
                 },
@@ -344,8 +342,8 @@ export class Cognito extends Construct {
                 },
             }, "sts:AssumeRoleWithWebIdentity"),
         });
-        role.addToPolicy(new iam.PolicyStatement({
-            effect: iam.Effect.ALLOW,
+        role.addToPolicy(new PolicyStatement({
+            effect: Effect.ALLOW,
             actions: ["mobileanalytics:PutEvents", "cognito-sync:*"],
             resources: ["*"],
         }));

package/constructs/Function.d.ts

@@ -1,8 +1,5 @@
 import type { Loader, BuildOptions } from "esbuild";
 import { Construct } from "constructs";
-import * as cdk from "aws-cdk-lib";
-import * as lambda from "aws-cdk-lib/aws-lambda";
-import * as logs from "aws-cdk-lib/aws-logs";
 import { Stack } from "./Stack.js";
 import { SSTConstruct } from "./Construct.js";
 import { Size } from "./util/size.js";
@@ -10,31 +7,34 @@ import { Duration } from "./util/duration.js";
 import { FunctionBindingProps } from "./util/functionBinding.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";
+import { RetentionDays } from "aws-cdk-lib/aws-logs";
+import { Size as CDKSize, Duration as CDKDuration } from "aws-cdk-lib";
 declare const supportedRuntimes: {
-    rust: cdk.aws_lambda.Runtime;
-    nodejs: cdk.aws_lambda.Runtime;
-    "nodejs4.3": cdk.aws_lambda.Runtime;
-    "nodejs6.10": cdk.aws_lambda.Runtime;
-    "nodejs8.10": cdk.aws_lambda.Runtime;
-    "nodejs10.x": cdk.aws_lambda.Runtime;
-    "nodejs12.x": cdk.aws_lambda.Runtime;
-    "nodejs14.x": cdk.aws_lambda.Runtime;
-    "nodejs16.x": cdk.aws_lambda.Runtime;
-    "nodejs18.x": cdk.aws_lambda.Runtime;
-    "python2.7": cdk.aws_lambda.Runtime;
-    "python3.6": cdk.aws_lambda.Runtime;
-    "python3.7": cdk.aws_lambda.Runtime;
-    "python3.8": cdk.aws_lambda.Runtime;
-    "python3.9": cdk.aws_lambda.Runtime;
-    "dotnetcore1.0": cdk.aws_lambda.Runtime;
-    "dotnetcore2.0": cdk.aws_lambda.Runtime;
-    "dotnetcore2.1": cdk.aws_lambda.Runtime;
-    "dotnetcore3.1": cdk.aws_lambda.Runtime;
-    dotnet6: cdk.aws_lambda.Runtime;
-    java8: cdk.aws_lambda.Runtime;
-    java11: cdk.aws_lambda.Runtime;
-    "go1.x": cdk.aws_lambda.Runtime;
-    go: cdk.aws_lambda.Runtime;
+    rust: CDKRuntime;
+    nodejs: CDKRuntime;
+    "nodejs4.3": CDKRuntime;
+    "nodejs6.10": CDKRuntime;
+    "nodejs8.10": CDKRuntime;
+    "nodejs10.x": CDKRuntime;
+    "nodejs12.x": CDKRuntime;
+    "nodejs14.x": CDKRuntime;
+    "nodejs16.x": CDKRuntime;
+    "nodejs18.x": CDKRuntime;
+    "python2.7": CDKRuntime;
+    "python3.6": CDKRuntime;
+    "python3.7": CDKRuntime;
+    "python3.8": CDKRuntime;
+    "python3.9": CDKRuntime;
+    "dotnetcore1.0": CDKRuntime;
+    "dotnetcore2.0": CDKRuntime;
+    "dotnetcore2.1": CDKRuntime;
+    "dotnetcore3.1": CDKRuntime;
+    dotnet6: CDKRuntime;
+    java8: CDKRuntime;
+    java11: CDKRuntime;
+    "go1.x": CDKRuntime;
+    go: CDKRuntime;
 };
 export type Runtime = keyof typeof supportedRuntimes;
 export type FunctionInlineDefinition = string | Function;
@@ -51,7 +51,7 @@ export interface FunctionHooks {
      */
     afterBuild?: (props: FunctionProps, out: string) => Promise<void>;
 }
-export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionName" | "memorySize" | "timeout" | "runtime" | "tracing" | "layers" | "architecture" | "logRetention"> {
+export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "memorySize" | "timeout" | "runtime" | "tracing" | "layers" | "architecture" | "logRetention"> {
     /**
      * Used to configure additional files to copy into the function bundle
      *
@@ -91,7 +91,7 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      * })
      * ```
      */
-    architecture?: Lowercase<keyof Pick<typeof lambda.Architecture, "ARM_64" | "X86_64">>;
+    architecture?: Lowercase<keyof Pick<typeof Architecture, "ARM_64" | "X86_64">>;
     /**
      * By default, the name of the function is auto-generated by AWS. You can configure the name by providing a string.
      *
@@ -185,7 +185,7 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      * })
      *```
      */
-    tracing?: Lowercase<keyof typeof lambda.Tracing>;
+    tracing?: Lowercase<keyof typeof Tracing>;
     /**
      * Can be used to disable Live Lambda Development when using `sst start`. Useful for things like Custom Resources that need to execute during deployment.
      *
@@ -278,7 +278,7 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      * })
      * ```
      */
-    layers?: (string | lambda.ILayerVersion)[];
+    layers?: (string | ILayerVersion)[];
     /**
      * The duration function logs are kept in CloudWatch Logs.
      *
@@ -292,7 +292,7 @@ export interface FunctionProps extends Omit<lambda.FunctionOptions, "functionNam
      * })
      * ```
      */
-    logRetention?: Lowercase<keyof typeof logs.RetentionDays>;
+    logRetention?: Lowercase<keyof typeof RetentionDays>;
 }
 export interface FunctionNameProps {
     /**
@@ -534,7 +534,7 @@ export interface FunctionCopyFilesProps {
  * });
  * ```
  */
-export declare class Function extends lambda.Function implements SSTConstruct {
+export declare class Function extends CDKFunction implements SSTConstruct {
     readonly id: string;
     readonly _isLiveDevEnabled: boolean;
     /** @internal */
@@ -580,11 +580,11 @@ export declare class Function extends lambda.Function implements SSTConstruct {
     private isNodeRuntime;
     static validateHandlerSet(id: string, props: FunctionProps): void;
     static validateVpcSettings(id: string, props: FunctionProps): void;
-    static buildLayers(scope: Construct, id: string, props: FunctionProps): cdk.aws_lambda.ILayerVersion[];
+    static buildLayers(scope: Construct, id: string, props: FunctionProps): ILayerVersion[];
     static normalizeMemorySize(memorySize?: number | Size): number;
-    static normalizeDiskSize(diskSize?: number | Size): cdk.Size;
-    static normalizeTimeout(timeout?: number | Duration): cdk.Duration;
-    static handleImportedLayer(scope: Construct, layer: lambda.ILayerVersion): lambda.ILayerVersion;
+    static normalizeDiskSize(diskSize?: number | Size): CDKSize;
+    static normalizeTimeout(timeout?: number | Duration): CDKDuration;
+    static handleImportedLayer(scope: Construct, layer: ILayerVersion): ILayerVersion;
     static isInlineDefinition(definition: any): definition is FunctionInlineDefinition;
     static fromDefinition(scope: Construct, id: string, definition: FunctionDefinition, inheritedProps?: FunctionProps, inheritErrorMessage?: string): Function;
     static mergeProps(baseProps?: FunctionProps, props?: FunctionProps): FunctionProps;