sst 2.40.6 → 2.40.8

package/cli/commands/types.js

@@ -21,7 +21,7 @@ export const types = (program) => program.command("types", "Generate resource ty
             name: project.config.name,
             region: project.config.region,
         });
-        sstConfig.stacks(app);
+        await sstConfig.stacks(app);
         Colors.line(Colors.success(`✔ `), `Types generated in ${path.resolve(project.paths.out, "types")}`);
         await exit();
     }

package/constructs/Function.js

@@ -149,11 +149,15 @@ export class Function extends CDKFunction {
                     timeout: toCdkDuration("900 second"),
                 };
             }
+            // Ensure descriptions fits the 256 chars limit
+            const description = props.description
+                ? `${props.description.substring(0, 240)} (live)`
+                : `live`;
             super(scope, id, {
                 ...props,
                 ...(props.runtime === "container"
                     ? {
-                        description: "SST Live Lambda handler",
+                        description,
                         code: Code.fromAssetImage(path.resolve(__dirname, "../support/bridge"), {
                             ...(architecture?.dockerPlatform
                                 ? { platform: Platform.custom(architecture.dockerPlatform) }
@@ -164,7 +168,7 @@ export class Function extends CDKFunction {
                         layers: undefined,
                     }
                     : {
-                        description: "SST Live Lambda handler",
+                        description,
                         runtime: CDKRuntime.NODEJS_18_X,
                         code: Code.fromAsset(path.resolve(__dirname, "../support/bridge")),
                         handler: "live-lambda.handler",

package/constructs/NextjsSite.js

@@ -20,7 +20,7 @@ import { useFunctions } from "./Function.js";
 import { useDeferredTasks } from "./deferred_task.js";
 import { Logger } from "../logger.js";
 const LAYER_VERSION = "2";
-const DEFAULT_OPEN_NEXT_VERSION = "2.3.5";
+const DEFAULT_OPEN_NEXT_VERSION = "2.3.7";
 const DEFAULT_CACHE_POLICY_ALLOWED_HEADERS = [
     "accept",
     "rsc",

package/constructs/Service.d.ts

@@ -6,7 +6,7 @@ import { SSTConstruct } from "./Construct.js";
 import { Permissions } from "./util/permission.js";
 import { BindingProps, BindingResource } from "./util/binding.js";
 import { IVpc } from "aws-cdk-lib/aws-ec2";
-import { Cluster, ContainerDefinitionOptions, CpuArchitecture, FargateService, FargateTaskDefinition, FargateServiceProps } from "aws-cdk-lib/aws-ecs";
+import { ContainerDefinitionOptions, CpuArchitecture, FargateService, FargateTaskDefinition, FargateServiceProps, ICluster } from "aws-cdk-lib/aws-ecs";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { ApplicationLoadBalancer, ApplicationLoadBalancerProps, ApplicationTargetGroupProps } from "aws-cdk-lib/aws-elasticloadbalancingv2";
 declare const supportedCpus: {
@@ -399,7 +399,22 @@ export interface ServiceProps {
             image?: ContainerDefinitionOptions["image"];
         };
         /**
-         * Runs codebuild job in the specified VPC. Note this will only work once deployed.
+         * Create the service in an existing ECS cluster.
+         *
+         * @example
+         * ```js
+         * import { Cluster } from "aws-cdk-lib/aws-ecs";
+         *
+         * {
+         *   cdk: {
+         *     cluster: Cluster.fromClusterArn(stack, "Cluster", "arn:aws:ecs:us-east-1:123456789012:cluster/my-cluster"),
+         *   }
+         * }
+         * ```
+         */
+        cluster?: ICluster;
+        /**
+         * Create the service in the specified VPC. Note this will only work once deployed.
          *
          * @example
          * ```js
@@ -463,7 +478,7 @@ export declare class Service extends Construct implements SSTConstruct {
      */
     get cdk(): {
         vpc: IVpc | undefined;
-        cluster: Cluster | undefined;
+        cluster: ICluster | undefined;
         fargateService: FargateService | undefined;
         taskDefinition: FargateTaskDefinition | undefined;
         distribution: import("aws-cdk-lib/aws-cloudfront").IDistribution | undefined;
@@ -519,6 +534,7 @@ export declare class Service extends Construct implements SSTConstruct {
     private validateServiceExists;
     private validateMemoryCpuAndStorage;
     private createVpc;
+    private createCluster;
     private createService;
     private createLoadBalancer;
     private createAutoScaling;

package/constructs/Service.js

@@ -175,7 +175,8 @@ export class Service extends Construct {
         }
         // Create ECS cluster
         const vpc = this.createVpc();
-        const { cluster, container, taskDefinition, service } = this.createService(vpc);
+        const cluster = this.createCluster(vpc);
+        const { container, taskDefinition, service } = this.createService(cluster);
         const { alb, target } = this.createLoadBalancer(vpc, service);
         this.createAutoScaling(service, target);
         this.alb = alb;
@@ -398,21 +399,26 @@ export class Service extends Construct {
                 natGateways: 1,
             }));
     }
-    createService(vpc) {
-        const { architecture, cpu, memory, storage, port, logRetention, cdk } = this.props;
+    createCluster(vpc) {
+        if (this.props.cdk?.cluster)
+            return this.props.cdk.cluster;
         const app = this.node.root;
         const clusterName = app.logicalPrefixedName(this.node.id);
+        return new Cluster(this, "Cluster", {
+            clusterName,
+            vpc,
+        });
+    }
+    createService(cluster) {
+        const { architecture, cpu, memory, storage, port, logRetention, cdk } = this.props;
+        const app = this.node.root;
         const logGroup = new LogRetention(this, "LogRetention", {
-            logGroupName: `/sst/service/${clusterName}`,
+            logGroupName: `/sst/service/${cluster.clusterName}`,
             retention: RetentionDays[logRetention.toUpperCase()],
             logRetentionRetryOptions: {
                 maxRetries: 100,
             },
         });
-        const cluster = new Cluster(this, "Cluster", {
-            clusterName,
-            vpc,
-        });
         const ephemeralStorageGiB = toCdkSize(storage).toGibibytes();
         const taskDefinition = new FargateTaskDefinition(this, `TaskDefinition`, {
             // @ts-expect-error

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.40.6",
+  "version": "2.40.8",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -118,7 +118,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.40.6",
+    "astro-sst": "2.40.8",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",

package/support/custom-resources/index.mjs

@@ -147118,7 +147118,7 @@ function safeHandler(block) {
         }
       }
       const reason = [
-        e.message,
+        e.message.slice(0, 3e3),
         `Logs: https://${process.env.AWS_REGION}.console.aws.amazon.com/cloudwatch/home?region=${process.env.AWS_REGION}#logsV2:log-groups/log-group/${encodeURIComponent(
           process.env.AWS_LAMBDA_LOG_GROUP_NAME
         )}/log-events/${encodeURIComponent(
@@ -153756,7 +153756,7 @@ function storeVariable(variablesAcc, variable, value) {
 }
 
 // support/custom-resources/secret-prefetcher.ts
-var lambda3 = new import_client_lambda3.LambdaClient({ logger: sdkLogger });
+var lambda3 = useAWSClient(import_client_lambda3.LambdaClient);
 async function SecretPrefetcher(cfnRequest) {
   switch (cfnRequest.RequestType) {
     case "Create":
@@ -153764,10 +153764,12 @@ async function SecretPrefetcher(cfnRequest) {
       const props = cfnRequest.ResourceProperties;
       const processEnvBackup = { ...process.env };
       try {
-        const ret = await lambda3.send(
-          new import_client_lambda3.GetFunctionCommand({
-            FunctionName: props.functionName
-          })
+        const ret = await retryOnAccessDenied(
+          () => lambda3.send(
+            new import_client_lambda3.GetFunctionCommand({
+              FunctionName: props.functionName
+            })
+          )
         );
         const envs = ret.Configuration?.Environment?.Variables ?? {};
         Object.entries(envs).filter(
@@ -153779,13 +153781,15 @@ async function SecretPrefetcher(cfnRequest) {
         Object.entries(allVariables2["Secret"] ?? {}).map(([key, value]) => {
           envs[`SST_Secret_value_${key}`] = value.value.toString();
         });
-        await lambda3.send(
-          new import_client_lambda3.UpdateFunctionConfigurationCommand({
-            FunctionName: props.functionName,
-            Environment: {
-              Variables: envs
-            }
-          })
+        await retryOnAccessDenied(
+          () => lambda3.send(
+            new import_client_lambda3.UpdateFunctionConfigurationCommand({
+              FunctionName: props.functionName,
+              Environment: {
+                Variables: envs
+              }
+            })
+          )
         );
       } finally {
         process.env = processEnvBackup;
@@ -153797,6 +153801,17 @@ async function SecretPrefetcher(cfnRequest) {
       throw new Error("Unsupported request type");
   }
 }
+async function retryOnAccessDenied(cb, attempt = 0) {
+  try {
+    return await cb();
+  } catch (e) {
+    if ((e.name === "AccessDenied" || e.name === "AccessDeniedException") && e.message.includes("is not authorized to perform") && attempt < 10) {
+      await new Promise((resolve) => setTimeout(resolve, 5e3));
+      return retryOnAccessDenied(cb, attempt + 1);
+    }
+    throw e;
+  }
+}
 
 // support/custom-resources/index.ts
 var handler = (event) => {