sst 2.0.15 → 2.0.16

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.16",
   "bin": {
     "sst": "cli/sst.js"
   },