sst 2.3.0 → 2.3.2

package/bootstrap.js

@@ -208,7 +208,6 @@ async function bootstrapCDK() {
     const identity = await useSTSIdentity();
     const credentials = await useAWSCredentials();
     const { region, profile, cdk } = useProject().config;
-    cdk || {};
     await new Promise((resolve, reject) => {
         const proc = spawn([
             "npx",
@@ -228,6 +227,9 @@ async function bootstrapCDK() {
             ...(cdk?.fileAssetsBucketName
                 ? ["--toolkit-bucket-name", cdk.fileAssetsBucketName]
                 : []),
+            ...(cdk?.customPermissionsBoundary
+                ? ["--custom-permissions-boundary", cdk.customPermissionsBoundary]
+                : []),
         ].join(" "), {
             env: {
                 ...process.env,

package/cli/colors.js

@@ -15,7 +15,7 @@ export const Colors = {
         }
     },
     hex: chalk.hex,
-    primary: chalk.hex("#E27152"),
+    primary: chalk.hex("#FF9000"),
     link: chalk.cyan,
     success: chalk.green,
     danger: chalk.red,

package/cli/commands/bind.js

@@ -194,6 +194,9 @@ export const bind = (program) => program
             stdio: "inherit",
             shell: true,
         });
+        p.on("exit", (code) => {
+            process.exit();
+        });
     }
     function areEnvsSame(envs1, envs2) {
         return (Object.keys(envs1).length === Object.keys(envs2).length &&

package/cli/commands/dev.js

@@ -23,6 +23,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const fs = await import("fs/promises");
     const crypto = await import("crypto");
     const { useFunctions } = await import("../../constructs/Function.js");
+    const { useSites } = await import("../../constructs/SsrSite.js");
     const { usePothosBuilder } = await import("./plugins/pothos.js");
     const { useKyselyTypeGenerator } = await import("./plugins/kysely.js");
     const { useRDSWarmer } = await import("./plugins/warmer.js");
@@ -172,9 +173,29 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             component.clear();
             component.unmount();
             printDeploymentResults(assembly, results);
-            // Update app state
+            // Run after initial deploy
             if (!lastDeployed) {
                 await saveAppMetadata({ mode: "dev" });
+                // print start frontend commands
+                useSites()
+                    .all.filter(({ props }) => props.dev?.deploy !== true)
+                    .forEach(({ type, props }) => {
+                    const framework = type === "AstroSite"
+                        ? "Astro"
+                        : type === "NextjsSite"
+                            ? "Next.js"
+                            : type === "RemixSite"
+                                ? "Remix"
+                                : type === "SolidStartSite"
+                                    ? "SolidStart"
+                                    : undefined;
+                    if (framework) {
+                        const cdCmd = path.resolve(props.path) === process.cwd()
+                            ? ""
+                            : `cd ${props.path} && `;
+                        Colors.line(Colors.danger(`➜ `), Colors.bold(`Start ${framework}:`), `${cdCmd}npm run dev`);
+                    }
+                });
             }
             lastDeployed = nextChecksum;
             // Write outputs.json
@@ -226,7 +247,8 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 return;
             if (evt.properties.app !== project.config.name)
                 return;
-            Colors.line(Colors.danger(`➜ `), "Another sst dev session has been started up for this stage. Exiting");
+            Colors.gap();
+            Colors.line(Colors.danger(`➜ `), "Another `sst dev` session has been started for this stage. Exiting...");
             process.exit(0);
         });
     });

package/constructs/AppSyncApi.d.ts

@@ -12,6 +12,7 @@ import { IServerlessCluster } from "aws-cdk-lib/aws-rds";
 import { ISecret } from "aws-cdk-lib/aws-secretsmanager";
 import { AwsIamConfig, BaseDataSource, CfnDomainName, GraphqlApi, GraphqlApiProps, IGraphqlApi, Resolver, ResolverProps } from "aws-cdk-lib/aws-appsync";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
+import { IDomain } from "aws-cdk-lib/aws-opensearchservice";
 export interface AppSyncApiDomainProps extends appSyncApiDomain.CustomDomainProps {
 }
 interface AppSyncApiBaseDataSourceProps {
@@ -89,7 +90,7 @@ export interface AppSyncApiDynamoDbDataSourceProps extends AppSyncApiBaseDataSou
  *   dataSources: {
  *     rds: {
  *       type: "rds",
- *       rds: MyRDSCluster
+ *       rds: myRDSCluster
  *     },
  *   },
  * });
@@ -116,6 +117,36 @@ export interface AppSyncApiRdsDataSourceProps extends AppSyncApiBaseDataSourcePr
         };
     };
 }
+/**
+ * Used to define a OpenSearch data source
+ *
+ * @example
+ * ```js
+ * new AppSyncApi(stack, "AppSync", {
+ *   dataSources: {
+ *     search: {
+ *       type: "open_search",
+ *       cdk: {
+ *         dataSource: {
+ *           domain: myOpenSearchDomain,
+ *         }
+ *       }
+ *     }
+ *   }
+ * });
+ * ```
+ */
+export interface AppSyncApiOpenSearchDataSourceProps extends AppSyncApiBaseDataSourceProps {
+    /**
+     * String literal to signify that this data source is an OpenSearch domain
+     */
+    type: "open_search";
+    cdk: {
+        dataSource: {
+            domain: IDomain;
+        };
+    };
+}
 /**
  * Used to define an http data source
  *
@@ -283,7 +314,7 @@ export interface AppSyncApiProps {
      * });
      * ```
      */
-    dataSources?: Record<string, FunctionInlineDefinition | AppSyncApiLambdaDataSourceProps | AppSyncApiDynamoDbDataSourceProps | AppSyncApiRdsDataSourceProps | AppSyncApiHttpDataSourceProps | AppSyncApiNoneDataSourceProps>;
+    dataSources?: Record<string, FunctionInlineDefinition | AppSyncApiLambdaDataSourceProps | AppSyncApiDynamoDbDataSourceProps | AppSyncApiRdsDataSourceProps | AppSyncApiOpenSearchDataSourceProps | AppSyncApiHttpDataSourceProps | AppSyncApiNoneDataSourceProps>;
     /**
      * The resolvers for this API. Takes an object, with the key being the type name and field name as a string and the value is either a string with the name of existing data source.
      *
@@ -411,7 +442,7 @@ export declare class AppSyncApi extends Construct implements SSTConstruct {
      * ```
      */
     addDataSources(scope: Construct, dataSources: {
-        [key: string]: FunctionInlineDefinition | AppSyncApiLambdaDataSourceProps | AppSyncApiDynamoDbDataSourceProps | AppSyncApiRdsDataSourceProps | AppSyncApiHttpDataSourceProps | AppSyncApiNoneDataSourceProps;
+        [key: string]: FunctionInlineDefinition | AppSyncApiLambdaDataSourceProps | AppSyncApiDynamoDbDataSourceProps | AppSyncApiRdsDataSourceProps | AppSyncApiOpenSearchDataSourceProps | AppSyncApiHttpDataSourceProps | AppSyncApiNoneDataSourceProps;
     }): void;
     /**
      * Add resolvers the construct has been created

package/constructs/AppSyncApi.js

@@ -346,7 +346,7 @@ export class AppSyncApi extends Construct {
                 description: dsValue.description,
             });
         }
-        // Rds ds
+        // RDS ds
         else if (dsValue.type === "rds") {
             dataSource = this.cdk.graphqlApi.addRdsDataSource(dsKey, dsValue.rds
                 ? dsValue.rds.cdk.cluster
@@ -359,6 +359,13 @@ export class AppSyncApi extends Construct {
                 description: dsValue.description,
             });
         }
+        // OpenSearch ds
+        else if (dsValue.type === "open_search") {
+            dataSource = this.cdk.graphqlApi.addOpenSearchDataSource(dsKey, dsValue.cdk?.dataSource?.domain, {
+                name: dsValue.name,
+                description: dsValue.description,
+            });
+        }
         // Http ds
         else if (dsValue.type === "http") {
             dataSource = this.cdk.graphqlApi.addHttpDataSource(dsKey, dsValue.endpoint, {

package/constructs/SsrSite.d.ts

@@ -13,6 +13,7 @@ import { Size } from "./util/size.js";
 import { Duration } from "./util/duration.js";
 import { Permissions } from "./util/permission.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
+type SsrSiteType = "NextjsSite" | "RemixSite" | "AstroSite" | "SolidStartSite";
 export type SsrBuildConfig = {
     typesPath: string;
     serverBuildOutputFile: string;
@@ -174,6 +175,13 @@ export interface SsrSiteProps {
         server?: Pick<FunctionProps, "vpc" | "vpcSubnets" | "securityGroups" | "allowAllOutbound" | "allowPublicSubnet" | "architecture">;
     };
 }
+type SsrSiteNormalizedProps = SsrSiteProps & {
+    path: Exclude<SsrSiteProps["path"], undefined>;
+    runtime: Exclude<SsrSiteProps["runtime"], undefined>;
+    timeout: Exclude<SsrSiteProps["timeout"], undefined>;
+    memorySize: Exclude<SsrSiteProps["memorySize"], undefined>;
+    waitForInvalidation: Exclude<SsrSiteProps["waitForInvalidation"], undefined>;
+};
 /**
  * The `SsrSite` construct is a higher level CDK construct that makes it easy to create modern web apps with Server Side Rendering capabilities.
  * @example
@@ -187,13 +195,7 @@ export interface SsrSiteProps {
  */
 export declare class SsrSite extends Construct implements SSTConstruct {
     readonly id: string;
-    protected props: SsrSiteProps & {
-        path: Exclude<SsrSiteProps["path"], undefined>;
-        runtime: Exclude<SsrSiteProps["runtime"], undefined>;
-        timeout: Exclude<SsrSiteProps["timeout"], undefined>;
-        memorySize: Exclude<SsrSiteProps["memorySize"], undefined>;
-        waitForInvalidation: Exclude<SsrSiteProps["waitForInvalidation"], undefined>;
-    };
+    protected props: SsrSiteNormalizedProps;
     private doNotDeploy;
     protected buildConfig: SsrBuildConfig;
     private serverLambdaForEdge?;
@@ -235,7 +237,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     attachPermissions(permissions: Permissions): void;
     /** @internal */
     getConstructMetadata(): {
-        type: "NextjsSite" | "RemixSite" | "AstroSite" | "SolidStartSite";
+        type: SsrSiteType;
         data: {
             mode: "placeholder" | "deployed";
             path: string;
@@ -280,3 +282,12 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private writeTypesFile;
     protected generateBuildId(): string;
 }
+export declare const useSites: () => {
+    add(name: string, type: SsrSiteType, props: SsrSiteNormalizedProps): void;
+    readonly all: {
+        name: string;
+        type: SsrSiteType;
+        props: SsrSiteNormalizedProps;
+    }[];
+};
+export {};

package/constructs/SsrSite.js

@@ -18,6 +18,7 @@ import { S3Origin, HttpOrigin } from "aws-cdk-lib/aws-cloudfront-origins";
 import { CloudFrontTarget } from "aws-cdk-lib/aws-route53-targets";
 import { Stack } from "./Stack.js";
 import { Logger } from "../logger.js";
+import { createAppContext } from "./context.js";
 import { isCDKConstruct } from "./Construct.js";
 import { Function } from "./Function.js";
 import { Secret } from "./Secret.js";
@@ -69,6 +70,7 @@ export class SsrSite extends Construct {
         this.buildConfig = this.initBuildConfig();
         this.validateSiteExists();
         this.writeTypesFile();
+        useSites().add(id, this.constructor.name, this.props);
         if (this.doNotDeploy) {
             // @ts-ignore
             this.bucket = this.distribution = null;
@@ -820,3 +822,14 @@ function handler(event) {
         return buildId;
     }
 }
+export const useSites = createAppContext(() => {
+    const sites = [];
+    return {
+        add(name, type, props) {
+            sites.push({ name, type, props });
+        },
+        get all() {
+            return sites;
+        },
+    };
+});

package/constructs/Stack.d.ts

@@ -119,7 +119,7 @@ export declare class Stack extends cdk.Stack {
      * });
      * ```
      */
-    addOutputs(outputs: Record<string, string | cdk.CfnOutputProps>): void;
+    addOutputs(outputs: Record<string, string | cdk.CfnOutputProps | undefined>): void;
     private createCustomResourceHandler;
     private static buildSynthesizer;
     private static checkForPropsIsConstruct;

package/constructs/Stack.js

@@ -170,11 +170,9 @@ export class Stack extends cdk.Stack {
      * ```
      */
     addOutputs(outputs) {
-        Object.keys(outputs).forEach((key) => {
-            const value = outputs[key];
-            if (value === undefined) {
-                throw new Error(`The stack output "${key}" is undefined`);
-            }
+        Object.entries(outputs)
+            .filter((e) => e[1] !== undefined)
+            .forEach(([key, value]) => {
             // Note: add "SSTStackOutput" prefix to the CfnOutput id to ensure the id
             //       does not thrash w/ construct ids in the stack. So users can do this:
             //       ```

package/constructs/deprecated/cross-region-helper.js

@@ -16,7 +16,7 @@ export function getOrCreateBucket(scope) {
     }
     // Create provider
     const provider = new lambda.Function(stack, providerId, {
-        code: lambda.Code.fromAsset(path.join(__dirname, "../../../../support/edge-function")),
+        code: lambda.Code.fromAsset(path.join(__dirname, "../../../support/edge-function")),
         handler: "s3-bucket.handler",
         runtime: lambda.Runtime.NODEJS_16_X,
         timeout: cdk.Duration.minutes(15),
@@ -48,7 +48,7 @@ export function createFunction(scope, name, role, bucketName, functionParams) {
     // Create provider if not already created
     if (!provider) {
         provider = new lambda.Function(stack, providerId, {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../../../../support/edge-function")),
+            code: lambda.Code.fromAsset(path.join(__dirname, "../../../support/edge-function")),
             handler: "edge-lambda.handler",
             runtime: lambda.Runtime.NODEJS_16_X,
             timeout: cdk.Duration.minutes(15),
@@ -86,7 +86,7 @@ export function createVersion(scope, name, functionArn) {
     // Create provider if not already created
     if (!provider) {
         provider = new lambda.Function(stack, providerId, {
-            code: lambda.Code.fromAsset(path.join(__dirname, "../../../../support/edge-function")),
+            code: lambda.Code.fromAsset(path.join(__dirname, "../../../support/edge-function")),
             handler: "edge-lambda-version.handler",
             runtime: lambda.Runtime.NODEJS_16_X,
             timeout: cdk.Duration.minutes(15),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "bin": {
     "sst": "cli/sst.js"
   },

package/project.d.ts

@@ -19,6 +19,7 @@ export interface ConfigOptions {
         toolkitStackName?: string;
         qualifier?: string;
         fileAssetsBucketName?: string;
+        customPermissionsBoundary?: string;
         publicAccessBlockConfiguration?: boolean;
     };
 }

package/sst.mjs

@@ -713,7 +713,7 @@ var init_colors = __esm({
         }
       },
       hex: chalk.hex,
-      primary: chalk.hex("#E27152"),
+      primary: chalk.hex("#FF9000"),
       link: chalk.cyan,
       success: chalk.green,
       danger: chalk.red,
@@ -1987,6 +1987,7 @@ async function monitor(stack) {
           errors: {}
         };
       }
+      throw ex;
     }
     await new Promise((resolve) => setTimeout(resolve, 1e3));
   }
@@ -5270,7 +5271,6 @@ async function bootstrapCDK() {
   const identity = await useSTSIdentity();
   const credentials = await useAWSCredentials();
   const { region, profile, cdk } = useProject().config;
-  cdk || {};
   await new Promise((resolve, reject) => {
     const proc = spawn6(
       [
@@ -5282,7 +5282,8 @@ async function bootstrapCDK() {
         ...cdk?.publicAccessBlockConfiguration === false ? ["--public-access-block-configuration", "false"] : cdk?.publicAccessBlockConfiguration === true ? ["--public-access-block-configuration", "false"] : [],
         ...cdk?.toolkitStackName ? ["--toolkit-stack-name", cdk.toolkitStackName] : [],
         ...cdk?.qualifier ? ["--qualifier", cdk.qualifier] : [],
-        ...cdk?.fileAssetsBucketName ? ["--toolkit-bucket-name", cdk.fileAssetsBucketName] : []
+        ...cdk?.fileAssetsBucketName ? ["--toolkit-bucket-name", cdk.fileAssetsBucketName] : [],
+        ...cdk?.customPermissionsBoundary ? ["--custom-permissions-boundary", cdk.customPermissionsBoundary] : []
       ].join(" "),
       {
         env: {
@@ -6775,6 +6776,7 @@ var dev = (program2) => program2.command(
     const fs18 = await import("fs/promises");
     const crypto2 = await import("crypto");
     const { useFunctions: useFunctions3 } = await import("../src/constructs/Function.js");
+    const { useSites } = await import("../src/constructs/SsrSite.js");
     const { usePothosBuilder: usePothosBuilder2 } = await Promise.resolve().then(() => (init_pothos2(), pothos_exports2));
     const { useKyselyTypeGenerator: useKyselyTypeGenerator2 } = await Promise.resolve().then(() => (init_kysely(), kysely_exports));
     const { useRDSWarmer: useRDSWarmer2 } = await Promise.resolve().then(() => (init_warmer(), warmer_exports));
@@ -6944,6 +6946,17 @@ var dev = (program2) => program2.command(
         printDeploymentResults2(assembly, results);
         if (!lastDeployed) {
           await saveAppMetadata2({ mode: "dev" });
+          useSites().all.filter(({ props }) => props.dev?.deploy !== true).forEach(({ type, props }) => {
+            const framework = type === "AstroSite" ? "Astro" : type === "NextjsSite" ? "Next.js" : type === "RemixSite" ? "Remix" : type === "SolidStartSite" ? "SolidStart" : void 0;
+            if (framework) {
+              const cdCmd = path20.resolve(props.path) === process.cwd() ? "" : `cd ${props.path} && `;
+              Colors2.line(
+                Colors2.danger(`\u279C `),
+                Colors2.bold(`Start ${framework}:`),
+                `${cdCmd}npm run dev`
+              );
+            }
+          });
         }
         lastDeployed = nextChecksum;
         fs18.writeFile(
@@ -7002,9 +7015,10 @@ var dev = (program2) => program2.command(
           return;
         if (evt.properties.app !== project.config.name)
           return;
+        Colors2.gap();
         Colors2.line(
           Colors2.danger(`\u279C `),
-          "Another sst dev session has been started up for this stage. Exiting"
+          "Another `sst dev` session has been started for this stage. Exiting..."
         );
         process.exit(0);
       });
@@ -7281,6 +7295,9 @@ var bind = (program2) => program2.command(
         stdio: "inherit",
         shell: true
       });
+      p.on("exit", (code) => {
+        process.exit();
+      });
     }
     function areEnvsSame(envs1, envs2) {
       return Object.keys(envs1).length === Object.keys(envs2).length && Object.keys(envs1).every((key) => envs1[key] === envs2[key]);

package/stacks/monitor.js

@@ -137,6 +137,7 @@ export async function monitor(stack) {
                     errors: {},
                 };
             }
+            throw ex;
         }
         await new Promise((resolve) => setTimeout(resolve, 1000));
     }