sst 2.0.0-rc.9 → 2.0.1

package/constructs/Stack.d.ts

@@ -2,10 +2,9 @@ import { Construct } from "constructs";
 import * as cdk from "aws-cdk-lib";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import { FunctionProps, Function as Fn } from "./Function.js";
-import * as Config from "./Config.js";
 import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
-export declare type StackProps = cdk.StackProps;
+export type StackProps = cdk.StackProps;
 /**
  * The Stack construct extends cdk.Stack. It automatically prefixes the stack names with the stage and app name to ensure that they can be deployed to multiple regions in the same AWS account. It also ensure that the stack uses the same AWS profile and region as the app. They're defined using functions that return resources that can be imported by other stacks.
  *
@@ -32,7 +31,6 @@ export declare class Stack extends cdk.Stack {
      * @internal
      */
     readonly customResourceHandler: lambda.Function;
-    private readonly metadata;
     constructor(scope: Construct, id: string, props?: StackProps);
     /**
      * The default function props to be applied to all the Lambda functions in the stack.
@@ -66,21 +64,6 @@ export declare class Stack extends cdk.Stack {
      * ```
      */
     addDefaultFunctionEnv(environment: Record<string, string>): void;
-    /**
-     * Adds additional default config to be applied to all Lambda functions in the stack.
-     *
-     * @deprecated The "addDefaultFunctionConfig" method will be removed in SST v2. Pass Parameters and Secrets in through the "addDefaultFunctionBinding" function. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116
-     *
-     * @example
-     * ```js
-     * // Change
-     * stack.addDefaultFunctionConfig([STRIPE_KEY]);
-     *
-     * // To
-     * stack.addDefaultFunctionBinding([STRIPE_KEY]);
-     * ```
-     */
-    addDefaultFunctionConfig(config: (Config.Secret | Config.Parameter)[]): void;
     /**
      * Binds additional resources to be applied to all Lambda functions in the stack.
      *
@@ -129,9 +112,7 @@ export declare class Stack extends cdk.Stack {
      * ```
      */
     addOutputs(outputs: Record<string, string | cdk.CfnOutputProps>): void;
-    setStackMetadata(metadata: any): void;
     private createCustomResourceHandler;
-    private createStackMetadataResource;
     private static checkForPropsIsConstruct;
     private static checkForEnvInProps;
 }

package/constructs/Stack.js

@@ -1,14 +1,9 @@
 import url from "url";
 import * as path from "path";
 import * as cdk from "aws-cdk-lib";
-import * as iam from "aws-cdk-lib/aws-iam";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import { Function as Fn } from "./Function.js";
 import { isConstruct } from "./Construct.js";
-import { createRequire } from "module";
-import { useApp } from "./context.js";
-import { useProject } from "../app.js";
-const require = createRequire(import.meta.url);
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /**
  * The Stack construct extends cdk.Stack. It automatically prefixes the stack names with the stage and app name to ensure that they can be deployed to multiple regions in the same AWS account. It also ensure that the stack uses the same AWS profile and region as the app. They're defined using functions that return resources that can be imported by other stacks.
@@ -36,7 +31,6 @@ export class Stack extends cdk.Stack {
      * @internal
      */
     customResourceHandler;
-    metadata;
     constructor(scope, id, props) {
         const root = scope.node.root;
         const stackId = root.logicalPrefixedName(id);
@@ -51,15 +45,9 @@ export class Stack extends cdk.Stack {
         });
         this.stage = root.stage;
         this.defaultFunctionProps = root.defaultFunctionProps.map((dfp) => typeof dfp === "function" ? dfp(this) : dfp);
-        // We created the Metadata resource first with empty metadata, and on
-        // app synthesis we'll update it with the actual metadata.
-        // We do this two step process because we call the "Template.fromStack"
-        // method in the tests. And the call triggers an app synethsis. And we
-        // end up synthesize an app multiple times. If we created the Metadata
-        // resource on app synth, the tests would fail because the resource
-        // would already exist.
+        // Create a custom resource handler per stack. This handler will
+        // be used by all the custom resources in the stack.
         this.customResourceHandler = this.createCustomResourceHandler();
-        this.metadata = this.createStackMetadataResource();
     }
     /**
      * The default function props to be applied to all the Lambda functions in the stack.
@@ -106,23 +94,6 @@ export class Stack extends cdk.Stack {
             environment,
         });
     }
-    /**
-     * Adds additional default config to be applied to all Lambda functions in the stack.
-     *
-     * @deprecated The "addDefaultFunctionConfig" method will be removed in SST v2. Pass Parameters and Secrets in through the "addDefaultFunctionBinding" function. Read more about how to upgrade here — https://docs.serverless-stack.com/upgrade-guide#upgrade-to-v116
-     *
-     * @example
-     * ```js
-     * // Change
-     * stack.addDefaultFunctionConfig([STRIPE_KEY]);
-     *
-     * // To
-     * stack.addDefaultFunctionBinding([STRIPE_KEY]);
-     * ```
-     */
-    addDefaultFunctionConfig(config) {
-        this.defaultFunctionProps.push({ config });
-    }
     /**
      * Binds additional resources to be applied to all Lambda functions in the stack.
      *
@@ -200,13 +171,10 @@ export class Stack extends cdk.Stack {
             }
         });
     }
-    setStackMetadata(metadata) {
-        this.metadata.node.defaultChild.addPropertyOverride("Metadata", metadata);
-    }
     createCustomResourceHandler() {
         return new lambda.Function(this, "CustomResourceHandler", {
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/custom-resources/"), {
-                assetHash: this.stackName + "-custom-resources-v1",
+                assetHash: this.stackName + "-custom-resources-20230130",
             }),
             handler: "index.handler",
             runtime: lambda.Runtime.NODEJS_16_X,
@@ -214,36 +182,6 @@ export class Stack extends cdk.Stack {
             memorySize: 1024,
         });
     }
-    createStackMetadataResource() {
-        const app = useApp();
-        // Create execution policy
-        this.customResourceHandler.addToRolePolicy(new iam.PolicyStatement({
-            actions: ["s3:PutObject", "s3:DeleteObject"],
-            resources: [`arn:aws:s3:::${app.bootstrap.bucket}/*`],
-        }));
-        // Temporary: Add permissions to migrate SSM paths for secrets (piggybacking on the stack metadata custom resource handler)
-        this.customResourceHandler.addToRolePolicy(new iam.PolicyStatement({
-            actions: ["ssm:GetParametersByPath", "ssm:PutParameter"],
-            resources: [
-                `arn:aws:ssm:${app.region}:${app.account}:parameter/sst/${app.name}/${app.stage}/*`,
-                `arn:aws:ssm:${app.region}:${app.account}:parameter/sst/${app.name}/.fallback/*`,
-            ],
-        }));
-        return new cdk.CustomResource(this, "StackMetadata", {
-            serviceToken: this.customResourceHandler.functionArn,
-            resourceType: "Custom::StackMetadata",
-            properties: {
-                App: app.name,
-                Stage: this.stage,
-                Stack: this.stackName,
-                SSTVersion: useProject().version,
-                BootstrapBucketName: app.bootstrap.bucket,
-                ForceUpdate: process.env.SST_FORCE_UPDATE_METADATA
-                    ? Date.now().toString()
-                    : undefined,
-            },
-        });
-    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     static checkForPropsIsConstruct(id, props) {
         // If a construct is passed in as stack props, let's detect it and throw a

package/constructs/StaticSite.d.ts

@@ -14,7 +14,7 @@ export interface StaticSiteFileOptions {
 export interface StaticSiteProps {
     /**
      * Path to the directory where the website source is located.
-     *
+     * @default "."
      * @example
      * ```js
      * new StaticSite(stack, "Site", {
@@ -22,7 +22,7 @@ export interface StaticSiteProps {
      * });
      * ```
      */
-    path: string;
+    path?: string;
     /**
      * The name of the index page (e.g. "index.html") of the website.
      * @default "index.html"
@@ -179,19 +179,21 @@ export interface StaticSiteProps {
      * ```
      */
     purgeFiles?: boolean;
-    /**
-     * When running `sst start`, a placeholder site is deployed. This is to ensure that the site content remains unchanged, and subsequent `sst start` can start up quickly.
-     *
-     * @default false
-     *
-     * @example
-     * ```js
-     * new StaticSite(stack, "frontend", {
-     *  disablePlaceholder: true
-     * });
-     * ```
-     */
-    disablePlaceholder?: boolean;
+    dev?: {
+        /**
+         * When running `sst dev, site is not deployed. This is to ensure `sst dev` can start up quickly.
+         * @default false
+         * @example
+         * ```js
+         * new StaticSite(stack, "frontend", {
+         *  dev: {
+         *    deploy: true
+         *  }
+         * });
+         * ```
+         */
+        deploy?: boolean;
+    };
     vite?: {
         /**
          * The path where code-gen should place the type definition for environment variables
@@ -209,11 +211,11 @@ export interface StaticSiteProps {
     };
     /**
      * While deploying, SST waits for the CloudFront cache invalidation process to finish. This ensures that the new content will be served once the deploy command finishes. However, this process can sometimes take more than 5 mins. For non-prod environments it might make sense to pass in `false`. That'll skip waiting for the cache to invalidate and speed up the deploy process.
-     * @default true
+     * @default false
      * @example
      * ```js
      * new StaticSite(stack, "frontend", {
-     *  waitForInvalidation: false
+     *  waitForInvalidation: true
      * });
      * ```
      */
@@ -280,55 +282,33 @@ export interface StaticSiteCdkDistributionProps extends BaseSiteCdkDistributionP
  */
 export declare class StaticSite extends Construct implements SSTConstruct {
     readonly id: string;
-    readonly cdk: {
-        /**
-         * The internally created CDK `Bucket` instance.
-         */
-        bucket: s3.Bucket;
-        /**
-         * The internally created CDK `Distribution` instance.
-         */
-        distribution: cloudfront.Distribution;
-        /**
-         * The Route 53 hosted zone for the custom domain.
-         */
-        hostedZone?: route53.IHostedZone;
-        certificate?: acm.ICertificate;
-    };
     private props;
-    private isPlaceholder;
-    private assets;
-    private filenamesAsset?;
-    private awsCliLayer;
-    constructor(scope: Construct, id: string, props: StaticSiteProps);
+    private doNotDeploy;
+    private bucket;
+    private distribution;
+    private hostedZone?;
+    private certificate?;
+    constructor(scope: Construct, id: string, props?: StaticSiteProps);
     /**
      * The CloudFront URL of the website.
      */
-    get url(): string;
+    get url(): string | undefined;
     /**
      * If the custom domain is enabled, this is the URL of the website with the custom domain.
      */
     get customDomainUrl(): string | undefined;
     /**
-     * The ARN of the internally created S3 Bucket.
+     * The internally created CDK resources.
      */
-    get bucketArn(): string;
-    /**
-     * The name of the internally created S3 Bucket.
-     */
-    get bucketName(): string;
-    /**
-     * The ID of the internally created CloudFront Distribution.
-     */
-    get distributionId(): string;
-    /**
-     * The domain name of the internally created CloudFront Distribution.
-     */
-    get distributionDomain(): string;
+    get cdk(): {
+        bucket: s3.Bucket;
+        distribution: cloudfront.Distribution;
+        hostedZone: route53.IHostedZone | undefined;
+        certificate: acm.ICertificate | undefined;
+    };
     getConstructMetadata(): {
         type: "StaticSite";
         data: {
-            distributionId: string;
             customDomainUrl: string | undefined;
         };
     };