sst 2.0.15 → 2.0.17

package/bootstrap.js

@@ -3,7 +3,7 @@ import path from "path";
 import { bold, dim } from "colorette";
 import { spawn } from "child_process";
 import { DescribeStacksCommand, CloudFormationClient, } from "@aws-sdk/client-cloudformation";
-import { Tags, Stack, RemovalPolicy, App, CfnOutput } from "aws-cdk-lib";
+import { Duration, Tags, Stack, RemovalPolicy, App, CfnOutput, } from "aws-cdk-lib";
 import { Function, Runtime, Code } from "aws-cdk-lib/aws-lambda";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
@@ -21,7 +21,7 @@ import { Stacks } from "./stacks/index.js";
 const STACK_NAME = "SSTBootstrap";
 const OUTPUT_VERSION = "Version";
 const OUTPUT_BUCKET = "BucketName";
-const LATEST_VERSION = "6";
+const LATEST_VERSION = "7";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 export const useBootstrap = Context.memo(async () => {
     Logger.debug("Initializing bootstrap context");
@@ -80,7 +80,6 @@ async function loadCDKStatus() {
             throw e;
         }
     }
-    return false;
 }
 export async function bootstrapSST(tags) {
     // Create bootstrap stack
@@ -127,7 +126,10 @@ export async function bootstrapSST(tags) {
             }),
         ],
     });
-    const queue = new Queue(stack, "MetadataQueue");
+    const queue = new Queue(stack, "MetadataQueue", {
+        visibilityTimeout: Duration.seconds(30),
+        retentionPeriod: Duration.minutes(2),
+    });
     fn.addEventSource(new SqsEventSource(queue));
     const rule = new Rule(stack, "MetadataRule", {
         eventPattern: {

package/constructs/Auth.js

@@ -37,15 +37,7 @@ export class Auth extends Construct {
         this.id = id;
         const stack = Stack.of(scope);
         this.authenticator = props.authenticator;
-        new CustomResource(this, "StackMetadata", {
-            serviceToken: stack.customResourceHandler.functionArn,
-            resourceType: "Custom::AuthKeys",
-            properties: {
-                publicPath: getParameterPath(this, PUBLIC_KEY_PROP),
-                privatePath: getParameterPath(this, PRIVATE_KEY_PROP),
-            },
-        });
-        stack.customResourceHandler.role?.attachInlinePolicy(new Policy(this, "CloudFrontInvalidatorPolicy", {
+        const policy = new Policy(this, "CloudFrontInvalidatorPolicy", {
             statements: [
                 new PolicyStatement({
                     actions: [
@@ -58,7 +50,17 @@ export class Auth extends Construct {
                     ],
                 }),
             ],
-        }));
+        });
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
+        const resource = new CustomResource(this, "StackMetadata", {
+            serviceToken: stack.customResourceHandler.functionArn,
+            resourceType: "Custom::AuthKeys",
+            properties: {
+                publicPath: getParameterPath(this, PUBLIC_KEY_PROP),
+                privatePath: getParameterPath(this, PRIVATE_KEY_PROP),
+            },
+        });
+        resource.node.addDependency(policy);
     }
     /** @internal */
     getConstructMetadata() {

package/constructs/EdgeFunction.js

@@ -150,6 +150,16 @@ ${exports}
         //       They need to be replaced with real values before the Lambda
         //       functions get deployed.
         const stack = Stack.of(this);
+        const policy = new Policy(this, "AssetReplacerPolicy", {
+            statements: [
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["s3:GetObject", "s3:PutObject"],
+                    resources: [`arn:${stack.partition}:s3:::${asset.s3BucketName}/*`],
+                }),
+            ],
+        });
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
         const resource = new CustomResource(this.scope, "AssetReplacer", {
             serviceToken: stack.customResourceHandler.functionArn,
             resourceType: "Custom::AssetReplacer",
@@ -159,15 +169,7 @@ ${exports}
                 replacements: this.getLambdaContentReplaceValues(),
             },
         });
-        stack.customResourceHandler.role?.attachInlinePolicy(new Policy(this, "AssetReplacerPolicy", {
-            statements: [
-                new PolicyStatement({
-                    effect: Effect.ALLOW,
-                    actions: ["s3:GetObject", "s3:PutObject"],
-                    resources: [`arn:${stack.partition}:s3:::${asset.s3BucketName}/*`],
-                }),
-            ],
-        }));
+        resource.node.addDependency(policy);
         return resource;
     }
     createSingletonBucketCR() {

package/constructs/SsrFunction.js

@@ -78,6 +78,16 @@ export class SsrFunction extends Construct {
         //       They need to be replaced with real values before the Lambda
         //       functions get deployed.
         const stack = Stack.of(this);
+        const policy = new Policy(this, "AssetReplacerPolicy", {
+            statements: [
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
+                    actions: ["s3:GetObject", "s3:PutObject"],
+                    resources: [`arn:${stack.partition}:s3:::${asset.s3BucketName}/*`],
+                }),
+            ],
+        });
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
         const resource = new CustomResource(this, "AssetReplacer", {
             serviceToken: stack.customResourceHandler.functionArn,
             resourceType: "Custom::AssetReplacer",
@@ -87,15 +97,7 @@ export class SsrFunction extends Construct {
                 replacements: this.getLambdaContentReplaceValues(),
             },
         });
-        stack.customResourceHandler.role?.attachInlinePolicy(new Policy(this, "AssetReplacerPolicy", {
-            statements: [
-                new PolicyStatement({
-                    effect: Effect.ALLOW,
-                    actions: ["s3:GetObject", "s3:PutObject"],
-                    resources: [`arn:${stack.partition}:s3:::${asset.s3BucketName}/*`],
-                }),
-            ],
-        }));
+        resource.node.addDependency(policy);
         return resource;
     }
     getLambdaContentReplaceValues() {

package/constructs/SsrSite.js

@@ -552,17 +552,7 @@ export class SsrSite extends Construct {
     }
     createCloudFrontInvalidation() {
         const stack = Stack.of(this);
-        const resource = new CustomResource(this, "CloudFrontInvalidator", {
-            serviceToken: stack.customResourceHandler.functionArn,
-            resourceType: "Custom::CloudFrontInvalidator",
-            properties: {
-                buildId: this.generateBuildId(),
-                distributionId: this.distribution.distributionId,
-                paths: ["/*"],
-                waitForInvalidation: this.props.waitForInvalidation,
-            },
-        });
-        stack.customResourceHandler.role?.attachInlinePolicy(new Policy(this, "CloudFrontInvalidatorPolicy", {
+        const policy = new Policy(this, "CloudFrontInvalidatorPolicy", {
             statements: [
                 new PolicyStatement({
                     effect: Effect.ALLOW,
@@ -575,7 +565,19 @@ export class SsrSite extends Construct {
                     ],
                 }),
             ],
-        }));
+        });
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
+        const resource = new CustomResource(this, "CloudFrontInvalidator", {
+            serviceToken: stack.customResourceHandler.functionArn,
+            resourceType: "Custom::CloudFrontInvalidator",
+            properties: {
+                buildId: this.generateBuildId(),
+                distributionId: this.distribution.distributionId,
+                paths: ["/*"],
+                waitForInvalidation: this.props.waitForInvalidation,
+            },
+        });
+        resource.node.addDependency(policy);
         return resource;
     }
     /////////////////////

package/constructs/StaticSite.js

@@ -427,17 +427,7 @@ interface ImportMeta {
             .createHash("md5")
             .update(assets.map(({ assetHash }) => assetHash).join(""))
             .digest("hex");
-        const resource = new CustomResource(this, "CloudFrontInvalidator", {
-            serviceToken: stack.customResourceHandler.functionArn,
-            resourceType: "Custom::CloudFrontInvalidator",
-            properties: {
-                assetsHash,
-                distributionId: this.distribution.distributionId,
-                paths: ["/*"],
-                waitForInvalidation: this.props.waitForInvalidation,
-            },
-        });
-        stack.customResourceHandler.role?.attachInlinePolicy(new Policy(this, "CloudFrontInvalidatorPolicy", {
+        const policy = new Policy(this, "CloudFrontInvalidatorPolicy", {
             statements: [
                 new PolicyStatement({
                     effect: Effect.ALLOW,
@@ -450,7 +440,19 @@ interface ImportMeta {
                     ],
                 }),
             ],
-        }));
+        });
+        stack.customResourceHandler.role?.attachInlinePolicy(policy);
+        const resource = new CustomResource(this, "CloudFrontInvalidator", {
+            serviceToken: stack.customResourceHandler.functionArn,
+            resourceType: "Custom::CloudFrontInvalidator",
+            properties: {
+                assetsHash,
+                distributionId: this.distribution.distributionId,
+                paths: ["/*"],
+                waitForInvalidation: this.props.waitForInvalidation,
+            },
+        });
+        resource.node.addDependency(policy);
         return resource;
     }
     /////////////////////

package/package.json

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

package/runtime/handlers/python.js

@@ -78,6 +78,7 @@ export const usePythonHandler = Context.memo(async () => {
             const src = await findAbove(input.props.handler, "requirements.txt");
             await fs.cp(src, input.out, {
                 recursive: true,
+                filter: (src) => !src.includes(".sst"),
             });
             if (input.props.python?.installCommands) {
                 for (const cmd of input.props.python.installCommands) {

package/sst.mjs

@@ -2627,7 +2627,14 @@ import {
   DescribeStacksCommand,
   CloudFormationClient
 } from "@aws-sdk/client-cloudformation";
-import { Tags, Stack, RemovalPolicy, App, CfnOutput } from "aws-cdk-lib";
+import {
+  Duration,
+  Tags,
+  Stack,
+  RemovalPolicy,
+  App,
+  CfnOutput
+} from "aws-cdk-lib";
 import { Function, Runtime, Code } from "aws-cdk-lib/aws-lambda";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
@@ -2665,7 +2672,6 @@ async function loadCDKStatus() {
       throw e;
     }
   }
-  return false;
 }
 async function bootstrapSST(tags) {
   const project = useProject();
@@ -2710,7 +2716,10 @@ async function bootstrapSST(tags) {
       })
     ]
   });
-  const queue = new Queue(stack, "MetadataQueue");
+  const queue = new Queue(stack, "MetadataQueue", {
+    visibilityTimeout: Duration.seconds(30),
+    retentionPeriod: Duration.minutes(2)
+  });
   fn.addEventSource(new SqsEventSource(queue));
   const rule = new Rule(stack, "MetadataRule", {
     eventPattern: {
@@ -2836,7 +2845,7 @@ var init_bootstrap = __esm({
     STACK_NAME = "SSTBootstrap";
     OUTPUT_VERSION = "Version";
     OUTPUT_BUCKET = "BucketName";
-    LATEST_VERSION = "6";
+    LATEST_VERSION = "7";
     __dirname = url3.fileURLToPath(new URL(".", import.meta.url));
     useBootstrap = Context.memo(async () => {
       Logger.debug("Initializing bootstrap context");
@@ -5132,7 +5141,8 @@ var init_python = __esm({
             };
           const src = await findAbove(input.props.handler, "requirements.txt");
           await fs12.cp(src, input.out, {
-            recursive: true
+            recursive: true,
+            filter: (src2) => !src2.includes(".sst")
           });
           if (input.props.python?.installCommands) {
             for (const cmd of input.props.python.installCommands) {
@@ -6260,7 +6270,7 @@ var init_config = __esm({
 });
 
 // src/cli/sst.ts
-import { blue as blue3, red as red2 } from "colorette";
+import { blue as blue3, red } from "colorette";
 
 // src/cli/program.ts
 import yargs from "yargs";
@@ -6927,7 +6937,7 @@ var get = (program2) => program2.command(
     describe: "Get the fallback value"
   }),
   async (args) => {
-    const { red: red3 } = await import("colorette");
+    const { red: red2 } = await import("colorette");
     const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
     try {
@@ -7428,7 +7438,7 @@ process.on("uncaughtException", (err) => {
     if (spinner.isSpinning)
       spinner.fail(spinner.text);
   }
-  console.log(red2("Error:"), err.message);
+  console.log(red("Error:"), err.message);
   if (!(err instanceof VisibleError)) {
     console.log();
     console.trace(err.stack);