sst 2.1.30 → 2.1.32

package/cli/local/router.d.ts

@@ -1,9 +1,11 @@
 import * as trpc from "@trpc/server";
 import { DendriformPatch } from "dendriform-immer-patch-optimiser";
+import { useProject } from "../../project.js";
 export type State = {
     app: string;
     stage: string;
     functions: Record<string, FunctionState>;
+    bootstrap: ReturnType<typeof useProject>["config"]["bootstrap"];
     live: boolean;
     stacks: {
         status: any;

package/cli/local/server.js

@@ -29,6 +29,7 @@ export async function useLocalServer(opts) {
     let state = {
         app: project.config.name,
         stage: project.config.stage,
+        bootstrap: project.config.bootstrap,
         live: opts.live,
         stacks: {
             status: "idle",

package/constructs/Api.d.ts

@@ -1,11 +1,5 @@
 import { Construct } from "constructs";
-import * as acm from "aws-cdk-lib/aws-certificatemanager";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
-import * as apigAuthorizers from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
 import { HttpUrlIntegrationProps, HttpAlbIntegrationProps, HttpNlbIntegrationProps } from "@aws-cdk/aws-apigatewayv2-integrations-alpha";
-import * as elb from "aws-cdk-lib/aws-elasticloadbalancingv2";
-import * as lambda from "aws-cdk-lib/aws-lambda";
-import * as logs from "aws-cdk-lib/aws-logs";
 import { HttpAwsIntegrationProps } from "./cdk/HttpAwsIntegration.js";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
@@ -15,6 +9,12 @@ import { Permissions } from "./util/permission.js";
 import * as apigV2Cors from "./util/apiGatewayV2Cors.js";
 import * as apigV2Domain from "./util/apiGatewayV2Domain.js";
 import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
+import { DomainName, HttpApi, HttpApiProps, HttpRouteIntegration, HttpStageProps, IHttpApi } from "@aws-cdk/aws-apigatewayv2-alpha";
+import { HttpJwtAuthorizer, HttpLambdaAuthorizer, HttpLambdaResponseType, HttpUserPoolAuthorizer } from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
+import { IFunction } from "aws-cdk-lib/aws-lambda";
+import { IApplicationListener, INetworkListener } from "aws-cdk-lib/aws-elasticloadbalancingv2";
+import { LogGroup } from "aws-cdk-lib/aws-logs";
+import { Certificate } from "aws-cdk-lib/aws-certificatemanager";
 declare const PayloadFormatVersions: readonly ["1.0", "2.0"];
 export type ApiPayloadFormatVersion = (typeof PayloadFormatVersions)[number];
 export interface CdkHttpAwsIntegrationProps extends HttpAwsIntegrationProps {
@@ -72,7 +72,7 @@ export interface ApiUserPoolAuthorizer extends ApiBaseAuthorizer {
         /**
          * This allows you to override the default settings this construct uses internally to create the authorizer.
          */
-        authorizer: apigAuthorizers.HttpUserPoolAuthorizer;
+        authorizer: HttpUserPoolAuthorizer;
     };
 }
 /**
@@ -112,7 +112,7 @@ export interface ApiJwtAuthorizer extends ApiBaseAuthorizer {
         /**
          * This allows you to override the default settings this construct uses internally to create the authorizer.
          */
-        authorizer: apigAuthorizers.HttpJwtAuthorizer;
+        authorizer: HttpJwtAuthorizer;
     };
 }
 /**
@@ -147,7 +147,7 @@ export interface ApiLambdaAuthorizer extends ApiBaseAuthorizer {
      * If `simple` is included then response format 2.0 will be used.
      * @default ["iam"]
      */
-    responseTypes?: Lowercase<keyof typeof apigAuthorizers.HttpLambdaResponseType>[];
+    responseTypes?: Lowercase<keyof typeof HttpLambdaResponseType>[];
     /**
      * The amount of time the results are cached.
      * @default Not cached
@@ -157,7 +157,7 @@ export interface ApiLambdaAuthorizer extends ApiBaseAuthorizer {
         /**
          * This allows you to override the default settings this construct uses internally to create the authorizer.
          */
-        authorizer: apigAuthorizers.HttpLambdaAuthorizer;
+        authorizer: HttpLambdaAuthorizer;
     };
 }
 export interface ApiCorsProps extends apigV2Cors.CorsProps {
@@ -374,7 +374,7 @@ export interface ApiProps<Authorizers extends Record<string, ApiAuthorizer> = Re
          * });
          * ```
          */
-        httpApi?: apig.IHttpApi | apig.HttpApiProps;
+        httpApi?: IHttpApi | HttpApiProps;
         /**
          * Configures the stages to create for the HTTP API.
          *
@@ -394,7 +394,7 @@ export interface ApiProps<Authorizers extends Record<string, ApiAuthorizer> = Re
          * });
          * ```
          */
-        httpStages?: Omit<apig.HttpStageProps, "httpApi">[];
+        httpStages?: Omit<HttpStageProps, "httpApi">[];
     };
 }
 export type ApiRouteProps<AuthorizerKeys> = FunctionInlineDefinition | ApiFunctionRouteProps<AuthorizerKeys> | ApiAwsRouteProps<AuthorizerKeys> | ApiHttpRouteProps<AuthorizerKeys> | ApiAlbRouteProps<AuthorizerKeys> | ApiNlbRouteProps<AuthorizerKeys> | ApiGraphQLRouteProps<AuthorizerKeys>;
@@ -432,7 +432,7 @@ export interface ApiFunctionRouteProps<AuthorizersKeys = string> extends ApiBase
         /**
          * Use an existing Lambda function.
          */
-        function?: lambda.IFunction;
+        function?: IFunction;
     };
 }
 /**
@@ -516,7 +516,7 @@ export interface ApiAlbRouteProps<AuthorizersKeys> extends ApiBaseRouteProps<Aut
         /**
          * The listener to the application load balancer used for the integration.
          */
-        albListener: elb.IApplicationListener;
+        albListener: IApplicationListener;
         integration?: HttpAlbIntegrationProps;
     };
 }
@@ -541,7 +541,7 @@ export interface ApiNlbRouteProps<AuthorizersKeys> extends ApiBaseRouteProps<Aut
         /**
          * The listener to the application load balancer used for the integration.
          */
-        nlbListener: elb.INetworkListener;
+        nlbListener: INetworkListener;
         integration?: HttpNlbIntegrationProps;
     };
 }
@@ -613,19 +613,19 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
         /**
          * The internally created CDK HttpApi instance.
          */
-        httpApi: apig.HttpApi;
+        httpApi: HttpApi;
         /**
          * If access logs are enabled, this is the internally created CDK LogGroup instance.
          */
-        accessLogGroup?: logs.LogGroup;
+        accessLogGroup?: LogGroup;
         /**
          * If custom domain is enabled, this is the internally created CDK DomainName instance.
          */
-        domainName?: apig.DomainName;
+        domainName?: DomainName;
         /**
          * If custom domain is enabled, this is the internally created CDK Certificate instance.
          */
-        certificate?: acm.Certificate;
+        certificate?: Certificate;
     };
     private props;
     private _customDomainUrl?;
@@ -784,9 +784,9 @@ export declare class Api<Authorizers extends Record<string, ApiAuthorizer> = Rec
     private createHttpIntegration;
     private createAlbIntegration;
     private createNlbIntegration;
-    protected createGraphQLIntegration(scope: Construct, routeKey: string, routeProps: ApiGraphQLRouteProps<keyof Authorizers>, postfixName: string): apig.HttpRouteIntegration;
-    protected createCdkFunctionIntegration(scope: Construct, routeKey: string, routeProps: ApiFunctionRouteProps<keyof Authorizers>, postfixName: string): apig.HttpRouteIntegration;
-    protected createFunctionIntegration(scope: Construct, routeKey: string, routeProps: ApiFunctionRouteProps<keyof Authorizers>, postfixName: string): apig.HttpRouteIntegration;
+    protected createGraphQLIntegration(scope: Construct, routeKey: string, routeProps: ApiGraphQLRouteProps<keyof Authorizers>, postfixName: string): HttpRouteIntegration;
+    protected createCdkFunctionIntegration(_scope: Construct, routeKey: string, routeProps: ApiFunctionRouteProps<keyof Authorizers>, postfixName: string): HttpRouteIntegration;
+    protected createFunctionIntegration(scope: Construct, routeKey: string, routeProps: ApiFunctionRouteProps<keyof Authorizers>, postfixName: string): HttpRouteIntegration;
     private buildRouteAuth;
     private normalizeRouteKey;
     /**

package/constructs/Api.js

@@ -1,9 +1,5 @@
 import { Construct } from "constructs";
-import * as cdkLib from "aws-cdk-lib";
-import * as cognito from "aws-cdk-lib/aws-cognito";
 import { Role, ServicePrincipal, PolicyDocument, PolicyStatement, } from "aws-cdk-lib/aws-iam";
-import * as apig from "@aws-cdk/aws-apigatewayv2-alpha";
-import * as apigAuthorizers from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
 import { HttpUrlIntegration, HttpAlbIntegration, HttpNlbIntegration, HttpLambdaIntegration, } from "@aws-cdk/aws-apigatewayv2-integrations-alpha";
 import { HttpAwsIntegration, } from "./cdk/HttpAwsIntegration.js";
 import { Stack } from "./Stack.js";
@@ -13,6 +9,9 @@ import { toCdkDuration } from "./util/duration.js";
 import * as apigV2Cors from "./util/apiGatewayV2Cors.js";
 import * as apigV2Domain from "./util/apiGatewayV2Domain.js";
 import * as apigV2AccessLog from "./util/apiGatewayV2AccessLog.js";
+import { HttpApi, HttpMethod, HttpNoneAuthorizer, HttpRoute, HttpRouteKey, HttpStage, IntegrationCredentials, PayloadFormatVersion, } from "@aws-cdk/aws-apigatewayv2-alpha";
+import { HttpIamAuthorizer, HttpJwtAuthorizer, HttpLambdaAuthorizer, HttpLambdaResponseType, HttpUserPoolAuthorizer, } from "@aws-cdk/aws-apigatewayv2-authorizers-alpha";
+import { UserPool, UserPoolClient } from "aws-cdk-lib/aws-cognito";
 const PayloadFormatVersions = ["1.0", "2.0"];
 /////////////////////
 // Construct
@@ -61,7 +60,7 @@ export class Api extends Construct {
      */
     get url() {
         const app = this.node.root;
-        return this.cdk.httpApi instanceof apig.HttpApi
+        return this.cdk.httpApi instanceof HttpApi
             ? this.cdk.httpApi.apiEndpoint
             : `https://${this.cdk.httpApi.apiId}.execute-api.${app.region}.amazonaws.com`;
     }
@@ -289,8 +288,7 @@ export class Api extends Construct {
                     this.cdk.domainName = customDomainData.apigDomain;
                 }
                 if (customDomainData.isCertificatedCreated) {
-                    this.cdk.certificate =
-                        customDomainData.certificate;
+                    this.cdk.certificate = customDomainData.certificate;
                 }
                 defaultDomainMapping = {
                     domainName: customDomainData.apigDomain,
@@ -298,7 +296,7 @@ export class Api extends Construct {
                 };
                 this._customDomainUrl = `https://${customDomainData.url}`;
             }
-            this.cdk.httpApi = new apig.HttpApi(this, "Api", {
+            this.cdk.httpApi = new HttpApi(this, "Api", {
                 apiName: app.logicalPrefixedName(id),
                 corsPreflight: apigV2Cors.buildCorsConfig(cors),
                 defaultDomainMapping,
@@ -316,7 +314,7 @@ export class Api extends Construct {
             }
             // Configure access log
             for (const def of cdk?.httpStages || []) {
-                const stage = new apig.HttpStage(this, "Stage" + def.stageName, {
+                const stage = new HttpStage(this, "Stage" + def.stageName, {
                     ...def,
                     httpApi: this.cdk.httpApi,
                 });
@@ -342,16 +340,15 @@ export class Api extends Construct {
                     if (!value.userPool) {
                         throw new Error(`Missing "userPool" for "${key}" authorizer`);
                     }
-                    const userPool = cognito.UserPool.fromUserPoolId(this, `Api-${this.node.id}-Authorizer-${key}-UserPool`, value.userPool.id);
+                    const userPool = UserPool.fromUserPoolId(this, `Api-${this.node.id}-Authorizer-${key}-UserPool`, value.userPool.id);
                     const userPoolClients = value.userPool.clientIds &&
-                        value.userPool.clientIds.map((clientId, i) => cognito.UserPoolClient.fromUserPoolClientId(this, `Api-${this.node.id}-Authorizer-${key}-UserPoolClient-${i}`, clientId));
-                    this.authorizersData[key] =
-                        new apigAuthorizers.HttpUserPoolAuthorizer(key, userPool, {
-                            authorizerName: value.name,
-                            identitySource: value.identitySource,
-                            userPoolClients,
-                            userPoolRegion: value.userPool.region,
-                        });
+                        value.userPool.clientIds.map((clientId, i) => UserPoolClient.fromUserPoolClientId(this, `Api-${this.node.id}-Authorizer-${key}-UserPoolClient-${i}`, clientId));
+                    this.authorizersData[key] = new HttpUserPoolAuthorizer(key, userPool, {
+                        authorizerName: value.name,
+                        identitySource: value.identitySource,
+                        userPoolClients,
+                        userPoolRegion: value.userPool.region,
+                    });
                 }
             }
             else if (value.type === "jwt") {
@@ -362,7 +359,7 @@ export class Api extends Construct {
                     if (!value.jwt) {
                         throw new Error(`Missing "jwt" for "${key}" authorizer`);
                     }
-                    this.authorizersData[key] = new apigAuthorizers.HttpJwtAuthorizer(key, value.jwt.issuer, {
+                    this.authorizersData[key] = new HttpJwtAuthorizer(key, value.jwt.issuer, {
                         authorizerName: value.name,
                         identitySource: value.identitySource,
                         jwtAudience: value.jwt.audience,
@@ -377,14 +374,14 @@ export class Api extends Construct {
                     if (!value.function) {
                         throw new Error(`Missing "function" for "${key}" authorizer`);
                     }
-                    this.authorizersData[key] = new apigAuthorizers.HttpLambdaAuthorizer(key, value.function, {
+                    this.authorizersData[key] = new HttpLambdaAuthorizer(key, value.function, {
                         authorizerName: value.name,
                         identitySource: value.identitySource,
                         responseTypes: value.responseTypes &&
-                            value.responseTypes.map((type) => apigAuthorizers.HttpLambdaResponseType[type.toUpperCase()]),
+                            value.responseTypes.map((type) => HttpLambdaResponseType[type.toUpperCase()]),
                         resultsCacheTtl: value.resultsCacheTtl
                             ? toCdkDuration(value.resultsCacheTtl)
-                            : cdkLib.Duration.seconds(0),
+                            : toCdkDuration("0 seconds"),
                     });
                 }
             }
@@ -407,7 +404,7 @@ export class Api extends Construct {
         let path;
         if (routeKey === "$default") {
             postfixName = "default";
-            httpRouteKey = apig.HttpRouteKey.DEFAULT;
+            httpRouteKey = HttpRouteKey.DEFAULT;
             method = "ANY";
             path = routeKey;
         }
@@ -417,7 +414,7 @@ export class Api extends Construct {
                 throw new Error(`Invalid route ${routeKey}`);
             }
             method = routeKeyParts[0].toUpperCase();
-            if (!apig.HttpMethod[method]) {
+            if (!HttpMethod[method]) {
                 throw new Error(`Invalid method defined for "${routeKey}"`);
             }
             path = routeKeyParts[1];
@@ -425,7 +422,7 @@ export class Api extends Construct {
                 throw new Error(`Invalid path defined for "${routeKey}"`);
             }
             postfixName = `${method}_${path}`;
-            httpRouteKey = apig.HttpRouteKey.with(path, apig.HttpMethod[method]);
+            httpRouteKey = HttpRouteKey.with(path, HttpMethod[method]);
         }
         ///////////////////
         // Create route
@@ -487,7 +484,7 @@ export class Api extends Construct {
             throw new Error(`Invalid route type "${routeValue.type}" for "${routeKey}".`);
         })();
         const { authorizationType, authorizer, authorizationScopes } = this.buildRouteAuth(routeProps);
-        const route = new apig.HttpRoute(scope, `Route_${postfixName}`, {
+        const route = new HttpRoute(scope, `Route_${postfixName}`, {
             httpApi: this.cdk.httpApi,
             routeKey: httpRouteKey,
             integration,
@@ -536,7 +533,7 @@ export class Api extends Construct {
         // Create integration
         const integration = new HttpAwsIntegration(`Integration_${postfixName}`, {
             ...routeProps.cdk.integration,
-            credentials: apig.IntegrationCredentials.fromRole(role),
+            credentials: IntegrationCredentials.fromRole(role),
         });
         // Store route
         this.routesData[routeKey] = {
@@ -544,7 +541,7 @@ export class Api extends Construct {
         };
         return integration;
     }
-    createHttpIntegration(scope, routeKey, routeProps, postfixName) {
+    createHttpIntegration(_scope, routeKey, routeProps, postfixName) {
         ///////////////////
         // Create integration
         ///////////////////
@@ -556,7 +553,7 @@ export class Api extends Construct {
         };
         return integration;
     }
-    createAlbIntegration(scope, routeKey, routeProps, postfixName) {
+    createAlbIntegration(_scope, routeKey, routeProps, postfixName) {
         ///////////////////
         // Create integration
         ///////////////////
@@ -568,7 +565,7 @@ export class Api extends Construct {
         };
         return integration;
     }
-    createNlbIntegration(scope, routeKey, routeProps, postfixName) {
+    createNlbIntegration(_scope, routeKey, routeProps, postfixName) {
         ///////////////////
         // Create integration
         ///////////////////
@@ -598,7 +595,7 @@ export class Api extends Construct {
         }
         return result;
     }
-    createCdkFunctionIntegration(scope, routeKey, routeProps, postfixName) {
+    createCdkFunctionIntegration(_scope, routeKey, routeProps, postfixName) {
         ///////////////////
         // Get payload format
         ///////////////////
@@ -609,8 +606,8 @@ export class Api extends Construct {
             throw new Error(`PayloadFormatVersion: sst.Api does not currently support ${payloadFormatVersion} payload format version. Only "V1" and "V2" are currently supported.`);
         }
         const integrationPayloadFormatVersion = payloadFormatVersion === "1.0"
-            ? apig.PayloadFormatVersion.VERSION_1_0
-            : apig.PayloadFormatVersion.VERSION_2_0;
+            ? PayloadFormatVersion.VERSION_1_0
+            : PayloadFormatVersion.VERSION_2_0;
         ///////////////////
         // Create Function
         ///////////////////
@@ -639,8 +636,8 @@ export class Api extends Construct {
             throw new Error(`PayloadFormatVersion: sst.Api does not currently support ${payloadFormatVersion} payload format version. Only "V1" and "V2" are currently supported.`);
         }
         const integrationPayloadFormatVersion = payloadFormatVersion === "1.0"
-            ? apig.PayloadFormatVersion.VERSION_1_0
-            : apig.PayloadFormatVersion.VERSION_2_0;
+            ? PayloadFormatVersion.VERSION_1_0
+            : PayloadFormatVersion.VERSION_2_0;
         ///////////////////
         // Create Function
         ///////////////////
@@ -675,13 +672,13 @@ export class Api extends Construct {
         if (authorizerKey === "none") {
             return {
                 authorizationType: "none",
-                authorizer: new apig.HttpNoneAuthorizer(),
+                authorizer: new HttpNoneAuthorizer(),
             };
         }
         else if (authorizerKey === "iam") {
             return {
                 authorizationType: "iam",
-                authorizer: new apigAuthorizers.HttpIamAuthorizer(),
+                authorizer: new HttpIamAuthorizer(),
             };
         }
         if (!this.props.authorizers ||

package/constructs/App.d.ts

@@ -1,10 +1,11 @@
-import * as cdk from "aws-cdk-lib";
-import * as lambda from "aws-cdk-lib/aws-lambda";
+import { Stack } from "./Stack.js";
 import { SSTConstruct } from "./Construct.js";
 import { FunctionProps } from "./Function.js";
 import { Permissions } from "./util/permission.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";
+import { ILayerVersion } from "aws-cdk-lib/aws-lambda";
 /**
  * @internal
  */
@@ -38,12 +39,12 @@ export interface AppDeployProps {
     readonly debugIncreaseTimeout?: boolean;
     readonly mode: "deploy" | "dev" | "remove";
 }
-type AppRemovalPolicy = Lowercase<keyof typeof cdk.RemovalPolicy>;
-export type AppProps = cdk.AppProps;
+type AppRemovalPolicy = Lowercase<RemovalPolicy>;
+export type AppProps = CDKAppProps;
 /**
  * The App construct extends cdk.App and is used internally by SST.
  */
-export declare class App extends cdk.App {
+export declare class App extends CDKApp {
     /**
      * Whether or not the app is running locally under `sst start`
      */
@@ -83,7 +84,7 @@ export declare class App extends cdk.App {
     /** @internal */
     readonly appPath: string;
     /** @internal */
-    defaultFunctionProps: (FunctionProps | ((stack: cdk.Stack) => FunctionProps))[];
+    defaultFunctionProps: (FunctionProps | ((stack: Stack) => FunctionProps))[];
     private _defaultRemovalPolicy?;
     /** @internal */
     get defaultRemovalPolicy(): "destroy" | "retain" | "snapshot" | undefined;
@@ -137,7 +138,7 @@ export declare class App extends cdk.App {
      * })
      * ```
      */
-    setDefaultFunctionProps(props: FunctionProps | ((stack: cdk.Stack) => FunctionProps)): void;
+    setDefaultFunctionProps(props: FunctionProps | ((stack: CDKStack) => FunctionProps)): void;
     /**
      * Adds additional default Permissions to be applied to all Lambda functions in the app.
      *
@@ -170,7 +171,7 @@ export declare class App extends cdk.App {
     /**
      * Adds additional default layers to be applied to all Lambda functions in the stack.
      */
-    addDefaultFunctionLayers(layers: lambda.ILayerVersion[]): void;
+    addDefaultFunctionLayers(layers: ILayerVersion[]): void;
     private isFinished;
     finish(): Promise<void>;
     isRunningSSTTest(): boolean;

package/constructs/App.js

@@ -1,10 +1,5 @@
 import path from "path";
 import fs from "fs";
-import * as cdk from "aws-cdk-lib";
-import * as s3 from "aws-cdk-lib/aws-s3";
-import * as iam from "aws-cdk-lib/aws-iam";
-import * as logs from "aws-cdk-lib/aws-logs";
-import * as lambda from "aws-cdk-lib/aws-lambda";
 import { Stack } from "./Stack.js";
 import { isSSTConstruct, isStackConstruct, } from "./Construct.js";
 import { Function } from "./Function.js";
@@ -17,6 +12,11 @@ import { AppContext } from "./context.js";
 import { useProject } from "../project.js";
 import { Logger } from "../logger.js";
 import { SiteEnv } from "../site-env.js";
+import { App as CDKApp, Tags, CfnResource, RemovalPolicy, CustomResourceProvider, CustomResourceProviderRuntime, CustomResource, Aspects, } from "aws-cdk-lib";
+import { CfnFunction } from "aws-cdk-lib/aws-lambda";
+import { Bucket } from "aws-cdk-lib/aws-s3";
+import { ArnPrincipal, PolicyStatement } from "aws-cdk-lib/aws-iam";
+import { CfnLogGroup } from "aws-cdk-lib/aws-logs";
 const require = createRequire(import.meta.url);
 function exitWithMessage(message) {
     console.error(message);
@@ -25,7 +25,7 @@ function exitWithMessage(message) {
 /**
  * The App construct extends cdk.App and is used internally by SST.
  */
-export class App extends cdk.App {
+export class App extends CDKApp {
     /**
      * Whether or not the app is running locally under `sst start`
      */
@@ -217,8 +217,8 @@ export class App extends cdk.App {
         for (const child of this.node.children) {
             if (isStackConstruct(child)) {
                 // Tag stacks
-                cdk.Tags.of(child).add("sst:app", this.name);
-                cdk.Tags.of(child).add("sst:stage", this.stage);
+                Tags.of(child).add("sst:app", this.name);
+                Tags.of(child).add("sst:stage", this.stage);
                 // Set removal policy
                 if (this._defaultRemovalPolicy)
                     this.applyRemovalPolicy(child, this._defaultRemovalPolicy);
@@ -257,7 +257,7 @@ export class App extends cdk.App {
                 bindParameters(c);
             }
         }
-        cdk.Aspects.of(this).add(new CreateSsmParameters());
+        Aspects.of(this).add(new CreateSsmParameters());
     }
     buildConstructsMetadata() {
         const constructs = this.buildConstructsMetadata_collectConstructs(this);
@@ -302,22 +302,22 @@ export class App extends cdk.App {
         ].filter((c) => Boolean(c));
     }
     applyRemovalPolicy(current, policy) {
-        if (current instanceof cdk.CfnResource) {
-            current.applyRemovalPolicy(cdk.RemovalPolicy[policy.toUpperCase()]);
+        if (current instanceof CfnResource) {
+            current.applyRemovalPolicy(RemovalPolicy[policy.toUpperCase()]);
         }
         // Had to copy this in to enable deleting objects in bucket
         // https://github.com/aws/aws-cdk/blob/master/packages/%40aws-cdk/aws-s3/lib/bucket.ts#L1910
-        if (current instanceof s3.Bucket &&
+        if (current instanceof Bucket &&
             !current.node.tryFindChild("AutoDeleteObjectsCustomResource")) {
             const AUTO_DELETE_OBJECTS_RESOURCE_TYPE = "Custom::S3AutoDeleteObjects";
-            const provider = cdk.CustomResourceProvider.getOrCreateProvider(current, AUTO_DELETE_OBJECTS_RESOURCE_TYPE, {
+            const provider = CustomResourceProvider.getOrCreateProvider(current, AUTO_DELETE_OBJECTS_RESOURCE_TYPE, {
                 codeDirectory: path.join(require.resolve("aws-cdk-lib/aws-s3"), "../lib/auto-delete-objects-handler"),
-                runtime: cdk.CustomResourceProviderRuntime.NODEJS_16_X,
+                runtime: CustomResourceProviderRuntime.NODEJS_16_X,
                 description: `Lambda function for auto-deleting objects in ${current.bucketName} S3 bucket.`,
             });
             // Use a bucket policy to allow the custom resource to delete
             // objects in the bucket
-            current.addToResourcePolicy(new iam.PolicyStatement({
+            current.addToResourcePolicy(new PolicyStatement({
                 actions: [
                     // list objects
                     "s3:GetBucket*",
@@ -326,9 +326,9 @@ export class App extends cdk.App {
                     "s3:DeleteObject*",
                 ],
                 resources: [current.bucketArn, current.arnForObjects("*")],
-                principals: [new iam.ArnPrincipal(provider.roleArn)],
+                principals: [new ArnPrincipal(provider.roleArn)],
             }));
-            const customResource = new cdk.CustomResource(current, "AutoDeleteObjectsCustomResource", {
+            const customResource = new CustomResource(current, "AutoDeleteObjectsCustomResource", {
                 resourceType: AUTO_DELETE_OBJECTS_RESOURCE_TYPE,
                 serviceToken: provider.serviceToken,
                 properties: {
@@ -350,15 +350,15 @@ export class App extends cdk.App {
         }
         class RemoveGovCloudUnsupportedResourceProperties {
             visit(node) {
-                if (node instanceof lambda.CfnFunction) {
+                if (node instanceof CfnFunction) {
                     node.addPropertyDeletionOverride("EphemeralStorage");
                 }
-                else if (node instanceof logs.CfnLogGroup) {
+                else if (node instanceof CfnLogGroup) {
                     node.addPropertyDeletionOverride("Tags");
                 }
             }
         }
-        cdk.Aspects.of(this).add(new RemoveGovCloudUnsupportedResourceProperties());
+        Aspects.of(this).add(new RemoveGovCloudUnsupportedResourceProperties());
     }
     ensureUniqueConstructIds() {
         // "ids" has the shape of:
@@ -426,7 +426,7 @@ export class App extends cdk.App {
                 ids[className] = existingIds;
             }
         }
-        cdk.Aspects.of(this).add(new EnsureUniqueConstructIds());
+        Aspects.of(this).add(new EnsureUniqueConstructIds());
     }
     codegenTypes() {
         const project = useProject();
@@ -484,7 +484,7 @@ export class App extends cdk.App {
                     ]).join("\n"));
             }
         }
-        cdk.Aspects.of(this).add(new CodegenTypes());
+        Aspects.of(this).add(new CodegenTypes());
     }
     // Functional Stack
     // This is a magical global to avoid having to pass app everywhere.