sst 2.0.0-rc.65 → 2.0.0-rc.67

package/cli/commands/deploy.js

@@ -63,7 +63,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         process.exit(1);
     }
     const component = render(React.createElement(DeploymentUI, { assembly: assembly }));
-    const results = await Stacks.deployMany(assembly.stacks);
+    const results = await Stacks.deployMany(target);
     component.clear();
     component.unmount();
     printDeploymentResults(assembly, results);

package/cli/commands/dev.js

@@ -74,7 +74,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         bus.subscribe("function.build.failed", async (evt) => {
             const info = useFunctions().fromID(evt.properties.functionID);
-            if (!info.enableLiveDev)
+            if (info.enableLiveDev === false)
                 return;
             Colors.gap();
             Colors.line(Colors.danger("✖ "), "Build failed", info.handler);

package/cli/ui/deploy.js

@@ -23,7 +23,7 @@ export const DeploymentUI = (props) => {
                         ? Colors.dim(`${stackNameToId(event.StackName)} ${readable} ${event.ResourceType}`)
                         : Colors.dim(`${stackNameToId(event.StackName)} ${event.ResourceType}`), Stacks.isFailed(event.ResourceStatus)
                         ? Colors.danger(event.ResourceStatus)
-                        : Colors.dim(event.ResourceStatus));
+                        : Colors.dim(event.ResourceStatus), Stacks.isFailed(event.ResourceStatus) && event.ResourceStatusReason);
                     const { [event.LogicalResourceId]: _, ...next } = previous;
                     return next;
                 }

package/constructs/ApiGatewayV1Api.d.ts

@@ -9,7 +9,6 @@ import * as apigV1AccessLog from "./util/apiGatewayV1AccessLog.js";
 import { Bucket } from "./Bucket.js";
 import { Duration } from "./util/duration.js";
 import { SSTConstruct } from "./Construct.js";
-import { DnsValidatedCertificate } from "./cdk/dns-validated-certificate.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
 import { Permissions } from "./util/permission.js";
 export interface ApiGatewayV1ApiAccessLogProps extends apigV1AccessLog.AccessLogProps {
@@ -492,7 +491,7 @@ export declare class ApiGatewayV1Api<Authorizers extends Record<string, ApiGatew
         /**
          * The internally created certificate
          */
-        certificate?: acm.Certificate | DnsValidatedCertificate;
+        certificate?: acm.ICertificate;
     };
     private _deployment?;
     private _customDomainUrl?;

package/constructs/Auth.js

@@ -112,6 +112,7 @@ export class Auth extends Construct {
                 [path]: {
                     type: "function",
                     function: this.authenticator,
+                    authorizer: "none",
                 },
             });
             // Auth construct has two types of Function bindinds:

package/constructs/NextjsSite.js

@@ -112,8 +112,7 @@ export class NextjsSite extends SsrSite {
             allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
             cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.cachePolicies?.serverRequests ??
-                this.createCloudFrontServerCachePolicy(),
+            cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
             edgeLambdas: isMiddlewareEnabled
                 ? [
                     {

package/constructs/SsrSite.d.ts

@@ -147,18 +147,13 @@ export interface SsrSiteProps {
          */
         distribution?: SsrCdkDistributionProps;
         /**
-         * Override the default CloudFront cache policies created internally.
+         * Override the CloudFront cache policy properties for responses from the
+         * server rendering Lambda.
+         *
+         * @note The default cache policy that is used in the abscene of this property
+         * is one that performs no caching of the server response.
          */
-        cachePolicies?: {
-            /**
-             * Override the CloudFront cache policy properties for responses from the
-             * server rendering Lambda.
-             *
-             * @note The default cache policy that is used in the abscene of this property
-             * is one that performs no caching of the server response.
-             */
-            serverRequests?: ICachePolicy;
-        };
+        serverCachePolicy?: ICachePolicy;
         server?: Pick<FunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture">;
     };
 }

package/constructs/SsrSite.js

@@ -483,8 +483,7 @@ export class SsrSite extends Construct {
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.cachePolicies?.serverRequests ??
-                this.createCloudFrontServerCachePolicy(),
+            cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
         };
     }
@@ -497,8 +496,7 @@ export class SsrSite extends Construct {
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
             compress: true,
-            cachePolicy: cdk?.cachePolicies?.serverRequests ??
-                this.createCloudFrontServerCachePolicy(),
+            cachePolicy: cdk?.serverCachePolicy ?? this.createCloudFrontServerCachePolicy(),
             ...(cfDistributionProps.defaultBehavior || {}),
             // concatenate edgeLambdas
             edgeLambdas: [

package/constructs/index.d.ts

@@ -15,7 +15,6 @@ export * from "./Script.js";
 export * from "./EventBus.js";
 export * from "./Function.js";
 export * from "./AppSyncApi.js";
-export * from "./DebugStack.js";
 export * from "./WebSocketApi.js";
 export * from "./KinesisStream.js";
 export * from "./ApiGatewayV1Api.js";
@@ -28,6 +27,4 @@ export * from "./util/duration.js";
 export * from "./util/permission.js";
 export * as Config from "./Config.js";
 export * as Metadata from "./Metadata.js";
-export * from "./DebugApp.js";
-export * from "./DebugStack.js";
 export { use, dependsOn, getStack, StackContext } from "./FunctionalStack.js";

package/constructs/index.js

@@ -15,7 +15,6 @@ export * from "./Script.js";
 export * from "./EventBus.js";
 export * from "./Function.js";
 export * from "./AppSyncApi.js";
-export * from "./DebugStack.js";
 export * from "./WebSocketApi.js";
 export * from "./KinesisStream.js";
 export * from "./ApiGatewayV1Api.js";
@@ -28,6 +27,4 @@ export * from "./util/duration.js";
 export * from "./util/permission.js";
 export * as Config from "./Config.js";
 export * as Metadata from "./Metadata.js";
-export * from "./DebugApp.js";
-export * from "./DebugStack.js";
 export { use, dependsOn, getStack } from "./FunctionalStack.js";

package/node/api/index.d.ts

@@ -10,13 +10,10 @@ export interface ApiGatewayV1ApiResources {
 }
 export interface WebSocketApiResources {
 }
-export interface GraphQLApiResources {
-}
 export declare const Api: ApiResources;
 export declare const AppSyncApi: AppSyncApiResources;
 export declare const ApiGatewayV1Api: ApiGatewayV1ApiResources;
 export declare const WebSocketApi: WebSocketApiResources;
-export declare const GraphQLApi: GraphQLApiResources;
 /**
  * Create a new api handler that can be used to create an authenticated session.
  *

package/node/api/index.js

@@ -5,12 +5,10 @@ export const Api = createProxy("Api");
 export const AppSyncApi = createProxy("AppSyncApi");
 export const ApiGatewayV1Api = createProxy("ApiGatewayV1Api");
 export const WebSocketApi = createProxy("WebSocketApi");
-export const GraphQLApi = createProxy("GraphQLApi");
 Object.assign(Api, parseEnvironment("Api", ["url"]));
 Object.assign(AppSyncApi, parseEnvironment("AppSyncApi", ["url"]));
 Object.assign(ApiGatewayV1Api, parseEnvironment("ApiGatewayV1Api", ["url"]));
 Object.assign(WebSocketApi, parseEnvironment("WebSocketApi", ["url"]));
-Object.assign(GraphQLApi, parseEnvironment("GraphQLApi", ["url"]));
 /**
  * Create a new api handler that can be used to create an authenticated session.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.65",
+  "version": "2.0.0-rc.67",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -5443,7 +5443,8 @@ var init_deploy2 = __esm({
                 ) : Colors.dim(
                   `${stackNameToId(event2.StackName)} ${event2.ResourceType}`
                 ),
-                stacks_exports.isFailed(event2.ResourceStatus) ? Colors.danger(event2.ResourceStatus) : Colors.dim(event2.ResourceStatus)
+                stacks_exports.isFailed(event2.ResourceStatus) ? Colors.danger(event2.ResourceStatus) : Colors.dim(event2.ResourceStatus),
+                stacks_exports.isFailed(event2.ResourceStatus) && event2.ResourceStatusReason
               );
               const { [event2.LogicalResourceId]: _, ...next } = previous2;
               return next;
@@ -6272,7 +6273,7 @@ var dev = (program2) => program2.command(
       });
       bus.subscribe("function.build.failed", async (evt) => {
         const info = useFunctions3().fromID(evt.properties.functionID);
-        if (!info.enableLiveDev)
+        if (info.enableLiveDev === false)
           return;
         Colors.gap();
         Colors.line(Colors.danger("\u2716 "), "Build failed", info.handler);
@@ -6611,7 +6612,7 @@ var deploy2 = (program2) => program2.command(
       process.exit(1);
     }
     const component = render(/* @__PURE__ */ React2.createElement(DeploymentUI2, { assembly }));
-    const results = await Stacks.deployMany(assembly.stacks);
+    const results = await Stacks.deployMany(target);
     component.clear();
     component.unmount();
     printDeploymentResults2(assembly, results);

package/constructs/DebugApp.d.ts

@@ -1,49 +0,0 @@
-import { App, StageSynthesisOptions } from "aws-cdk-lib";
-import { CloudAssembly } from "aws-cdk-lib/cx-api";
-/**
- * Deploy props for apps.
- */
-export interface DebugAppDeployProps {
-    /**
-     * The app name, used to prefix stacks.
-     */
-    name: string;
-    /**
-     * The stage to deploy this app to.
-     */
-    stage: string;
-    /**
-     * The region to deploy this app to.
-     */
-    region: string;
-}
-/**
- * The DebugApp construct is used internally by SST to create the resources needed to power Live Lambda Development.
- */
-export declare class DebugApp extends App {
-    /**
-     * The name of the app. This comes from the `name` in your `sst.json`.
-     */
-    readonly name: string;
-    /**
-     * The stage the app is being deployed to. If this is not specified as the [`--stage`](/packages/sst.md#--stage) option, it'll default to the stage configured during the initial run of the SST CLI.
-     */
-    readonly stage: string;
-    /**
-     * The region the app is being deployed to. If this is not specified as the [`--region`](/packages/sst.md#--region) option in the SST CLI, it'll default to the `region` in your `sst.json`.
-     */
-    readonly region: string;
-    /**
-     * The AWS account the app is being deployed to. This comes from the IAM credentials being used to run the SST CLI.
-     */
-    readonly account: string;
-    /**
-     * @internal
-     */
-    constructor(deployProps: DebugAppDeployProps);
-    synth(options?: StageSynthesisOptions): CloudAssembly;
-    /**
-     * Use this method to prefix resource names in your stacks to make sure they don't thrash when deployed to different stages in the same AWS account. This method will prefix a given resource name with the stage and app name. Using the format `${stage}-${name}-${logicalName}`.
-     */
-    logicalPrefixedName(logicalName: string): string;
-}

package/constructs/DebugApp.js

@@ -1,63 +0,0 @@
-import { App } from "aws-cdk-lib";
-import { isStackConstruct, isSSTDebugStack } from "./Construct.js";
-/**
- * The DebugApp construct is used internally by SST to create the resources needed to power Live Lambda Development.
- */
-export class DebugApp extends App {
-    /**
-     * The name of the app. This comes from the `name` in your `sst.json`.
-     */
-    name;
-    /**
-     * The stage the app is being deployed to. If this is not specified as the [`--stage`](/packages/sst.md#--stage) option, it'll default to the stage configured during the initial run of the SST CLI.
-     */
-    stage;
-    /**
-     * The region the app is being deployed to. If this is not specified as the [`--region`](/packages/sst.md#--region) option in the SST CLI, it'll default to the `region` in your `sst.json`.
-     */
-    region;
-    /**
-     * The AWS account the app is being deployed to. This comes from the IAM credentials being used to run the SST CLI.
-     */
-    account;
-    /**
-     * @internal
-     */
-    constructor(deployProps) {
-        super();
-        this.name = deployProps.name;
-        this.stage = deployProps.stage;
-        this.region = deployProps.region;
-        this.account = process.env.CDK_DEFAULT_ACCOUNT || "my-account";
-    }
-    synth(options = {}) {
-        // Check app has stack
-        const stacks = this.node.children.filter((child) => isSSTDebugStack(child));
-        if (stacks.length > 1) {
-            console.error(`Error: You can only create 1 DebugStack inside the "debugApp()" callback.\n`);
-            process.exit(1);
-        }
-        if (stacks.length === 0) {
-            console.error(`Error: The "debugApp()" callback is not creating a DebugStack.\n`);
-            process.exit(1);
-        }
-        for (const child of this.node.children) {
-            if (isStackConstruct(child)) {
-                // Stack names need to be parameterized with the stage name
-                if (!child.stackName.startsWith(`${this.stage}-`) &&
-                    !child.stackName.endsWith(`-${this.stage}`) &&
-                    child.stackName.indexOf(`-${this.stage}-`) === -1) {
-                    console.error(`Error: Stack "${child.stackName}" is not parameterized with the stage name. The stack name needs to either start with "$stage-", end in "-$stage", or contain the stage name "-$stage-".\n`);
-                    process.exit(1);
-                }
-            }
-        }
-        return super.synth(options);
-    }
-    /**
-     * Use this method to prefix resource names in your stacks to make sure they don't thrash when deployed to different stages in the same AWS account. This method will prefix a given resource name with the stage and app name. Using the format `${stage}-${name}-${logicalName}`.
-     */
-    logicalPrefixedName(logicalName) {
-        return `${this.stage}-${this.name}-${logicalName}`;
-    }
-}

package/constructs/DebugStack.d.ts

@@ -1,34 +0,0 @@
-import { Construct } from "constructs";
-import * as cdk from "aws-cdk-lib";
-import * as dynamodb from "aws-cdk-lib/aws-dynamodb";
-/**
- * Stack properties for the DebugStack.
- */
-export interface DebugStackProps extends cdk.StackProps {
-    /**
-     * S3 bucket to store large websocket payloads.
-     */
-    payloadBucketArn?: string;
-    /**
-     * Lambda function props for WebSocket request handlers.
-     */
-    websocketHandlerRoleArn?: string;
-    cdk?: {
-        /**
-         * Override the settings of the internally created DynamoDB table
-         */
-        table?: Omit<dynamodb.TableProps, "partitionKey" | "sortKey">;
-    };
-}
-/**
- * The `DebugStack` construct is used internally to create the resources needed to power Live Lambda Development. Note that, the `DebugStack` construct should only be created inside the [`DebugApp`](DebugApp).
- */
-export declare class DebugStack extends cdk.Stack {
-    readonly stage: string;
-    private readonly api;
-    private readonly table;
-    private readonly bucket;
-    constructor(scope: Construct, id: string, props?: DebugStackProps);
-    private addApiRoute;
-    private static checkForEnvInProps;
-}

package/constructs/DebugStack.js

@@ -1,132 +0,0 @@
-import * as path from "path";
-import url from "url";
-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 * as apig from "aws-cdk-lib/aws-apigatewayv2";
-import * as dynamodb from "aws-cdk-lib/aws-dynamodb";
-const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
-/**
- * The `DebugStack` construct is used internally to create the resources needed to power Live Lambda Development. Note that, the `DebugStack` construct should only be created inside the [`DebugApp`](DebugApp).
- */
-export class DebugStack extends cdk.Stack {
-    stage;
-    api;
-    table;
-    bucket;
-    constructor(scope, id, props) {
-        const app = scope.node.root;
-        const stackId = app.logicalPrefixedName(id);
-        DebugStack.checkForEnvInProps(id, props);
-        super(scope, stackId, {
-            ...props,
-            env: {
-                account: app.account,
-                region: app.region,
-            },
-        });
-        this.stage = app.stage;
-        // Create connection table
-        this.table = new dynamodb.Table(this, "Table", {
-            partitionKey: { name: "pk", type: dynamodb.AttributeType.STRING },
-            billingMode: dynamodb.BillingMode.PAY_PER_REQUEST,
-            removalPolicy: cdk.RemovalPolicy.DESTROY,
-            ...props?.cdk?.table,
-        });
-        // Create S3 bucket for storing large payloads
-        this.bucket = props?.payloadBucketArn
-            ? s3.Bucket.fromBucketArn(this, "Bucket", props.payloadBucketArn)
-            : new s3.Bucket(this, "Bucket", {
-                lifecycleRules: [
-                    {
-                        expiration: cdk.Duration.days(1),
-                        prefix: "payloads/",
-                    },
-                ],
-                encryption: s3.BucketEncryption.S3_MANAGED,
-                removalPolicy: cdk.RemovalPolicy.DESTROY,
-                autoDeleteObjects: true,
-                blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,
-            });
-        // Create API
-        this.api = new apig.CfnApi(this, "Api", {
-            name: `${this.stackName}-api`,
-            protocolType: "WEBSOCKET",
-            routeSelectionExpression: "$request.body.action",
-        });
-        new apig.CfnStage(this, "ApiStage", {
-            apiId: this.api.ref,
-            autoDeploy: true,
-            stageName: this.stage,
-        });
-        // Create API routes
-        const role = props?.websocketHandlerRoleArn
-            ? iam.Role.fromRoleArn(this, "HandlerRole", props.websocketHandlerRoleArn)
-            : undefined;
-        this.addApiRoute("Connect", "$connect", "wsConnect.main", role);
-        this.addApiRoute("Disconnect", "$disconnect", "wsDisconnect.main", role);
-        this.addApiRoute("Default", "$default", "wsDefault.main", role);
-        // Stack Output
-        new cdk.CfnOutput(this, "Endpoint", {
-            value: `${this.api.attrApiEndpoint}/${this.stage}`,
-        });
-        new cdk.CfnOutput(this, "BucketArn", {
-            value: this.bucket.bucketArn,
-        });
-        new cdk.CfnOutput(this, "BucketName", {
-            value: this.bucket.bucketName,
-        });
-    }
-    addApiRoute(id, routeKey, handler, role) {
-        // Create execution policy
-        const policyStatement = new iam.PolicyStatement();
-        policyStatement.addAllResources();
-        policyStatement.addActions("apigateway:*", "dynamodb:*", "execute-api:ManageConnections");
-        // Create Lambda
-        const lambdaFunc = new lambda.Function(this, id, {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../assets/DebugStack")),
-            handler,
-            runtime: lambda.Runtime.NODEJS_16_X,
-            timeout: cdk.Duration.seconds(10),
-            memorySize: 256,
-            logRetention: logs.RetentionDays.ONE_WEEK,
-            logRetentionRole: role,
-            environment: {
-                TABLE_NAME: this.table.tableName,
-            },
-            role,
-            initialPolicy: [policyStatement],
-        });
-        lambdaFunc.addPermission(`${id}Permission`, {
-            principal: new iam.ServicePrincipal("apigateway.amazonaws.com"),
-        });
-        // Create API integrations
-        const integration = new apig.CfnIntegration(this, `${id}Integration`, {
-            apiId: this.api.ref,
-            integrationType: "AWS_PROXY",
-            integrationUri: `arn:${this.partition}:apigateway:${this.region}:lambda:path/2015-03-31/functions/${lambdaFunc.functionArn}/invocations`,
-        });
-        // Create API routes
-        new apig.CfnRoute(this, `${id}Route`, {
-            apiId: this.api.ref,
-            routeKey,
-            authorizationType: "NONE",
-            target: `integrations/${integration.ref}`,
-        });
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    static checkForEnvInProps(id, props) {
-        if (props && props.env) {
-            let envS = "";
-            try {
-                envS = " (" + JSON.stringify(props.env) + ")";
-            }
-            catch (e) {
-                // Ignore
-            }
-            throw new Error(`Do not set the "env" prop while initializing "${id}" stack${envS}. Use the "AWS_PROFILE" environment variable and "--region" CLI option instead.`);
-        }
-    }
-}