sst 2.24.0 → 2.24.2

package/cli/commands/bind.js

@@ -167,7 +167,7 @@ export const bind = (program) => program
         ]);
         const metadataData = await metadataForStack(ssrSite.stack);
         const metadata = metadataData
-            .filter((c) => [
+            ?.filter((c) => [
             "NextjsSite",
             "AstroSite",
             "RemixSite",
@@ -198,7 +198,7 @@ export const bind = (program) => program
         const { metadataForStack } = await import("../../stacks/metadata.js");
         const metadataData = await metadataForStack(staticSite.stack);
         const metadata = metadataData
-            .filter((c) => ["StaticSite", "SlsNextjsSite"].includes(c.type))
+            ?.filter((c) => ["StaticSite", "SlsNextjsSite"].includes(c.type))
             .find((c) => {
             // metadata prior to SST v2.3.0 doesn't have path
             if (!c.data.path || !c.data.environment) {
@@ -224,7 +224,7 @@ export const bind = (program) => program
         // Get metadata
         const metadataData = await metadataForStack(service.stack);
         const metadata = metadataData
-            .filter((c) => ["Service"].includes(c.type))
+            ?.filter((c) => ["Service"].includes(c.type))
             .find((c) => {
             return (path.resolve(project.paths.root, c.data.path) === process.cwd());
         });

package/constructs/Service.d.ts

@@ -242,6 +242,28 @@ export interface ServiceProps {
         url?: string;
     };
     cdk?: {
+        /**
+         * By default, SST creates a CloudFront distribution. Set this to `false` to skip creating the distribution.
+         * @default true
+         * @example
+         * ```js
+         * {
+         *   cloudfrontDistribution: false
+         * }
+         * ```
+         */
+        cloudfrontDistribution?: boolean;
+        /**
+         * By default, SST creates an Application Load Balancer to distribute requests across containers. Set this to `false` to skip creating the load balancer.
+         * @default true
+         * @example
+         * ```js
+         * {
+         *   applicationLoadBalancer: false
+         * }
+         * ```
+         */
+        applicationLoadBalancer?: boolean;
         /**
          * Customizing the container definition for the ECS task.
          * @example
@@ -305,7 +327,7 @@ export declare class Service extends Construct implements SSTConstruct {
     private cluster;
     private container;
     private taskDefinition;
-    private distribution;
+    private distribution?;
     constructor(scope: Construct, id: string, props?: ServiceProps);
     /**
      * The CloudFront URL of the website.
@@ -322,7 +344,7 @@ export declare class Service extends Construct implements SSTConstruct {
     get cdk(): {
         vpc: IVpc;
         cluster: Cluster;
-        distribution: import("aws-cdk-lib/aws-cloudfront").IDistribution;
+        distribution: import("aws-cdk-lib/aws-cloudfront").IDistribution | undefined;
         hostedZone: import("aws-cdk-lib/aws-route53").IHostedZone | undefined;
         certificate: import("aws-cdk-lib/aws-certificatemanager").ICertificate | undefined;
     } | undefined;

package/constructs/Service.js

@@ -206,7 +206,7 @@ export class Service extends Construct {
                 this.updateContainerImage(dockerfile, taskDefinition, container);
             }
             // Invalidate CloudFront
-            this.distribution.createInvalidation();
+            this.distribution?.createInvalidation();
         });
     }
     /////////////////////
@@ -218,7 +218,7 @@ export class Service extends Construct {
     get url() {
         if (this.doNotDeploy)
             return this.props.dev?.url;
-        return this.distribution.url;
+        return this.distribution?.url;
     }
     /**
      * If the custom domain is enabled, this is the URL of the website with the
@@ -227,7 +227,7 @@ export class Service extends Construct {
     get customDomainUrl() {
         if (this.doNotDeploy)
             return;
-        return this.distribution.customDomainUrl;
+        return this.distribution?.customDomainUrl;
     }
     /**
      * The internally created CDK resources.
@@ -238,9 +238,9 @@ export class Service extends Construct {
         return {
             vpc: this.vpc,
             cluster: this.cluster,
-            distribution: this.distribution.cdk.distribution,
-            hostedZone: this.distribution.cdk.hostedZone,
-            certificate: this.distribution.cdk.certificate,
+            distribution: this.distribution?.cdk.distribution,
+            hostedZone: this.distribution?.cdk.hostedZone,
+            certificate: this.distribution?.cdk.certificate,
         };
     }
     /////////////////////
@@ -268,29 +268,35 @@ export class Service extends Construct {
     /** @internal */
     getFunctionBinding() {
         const app = this.node.root;
-        return {
-            clientPackage: "service",
-            variables: {
-                url: this.doNotDeploy
-                    ? {
-                        type: "plain",
-                        value: this.props.dev?.url ?? "localhost",
-                    }
-                    : {
-                        // Do not set real value b/c we don't want to make the Lambda function
-                        // depend on the Site. B/c often the site depends on the Api, causing
-                        // a CloudFormation circular dependency if the Api and the Site belong
-                        // to different stacks.
-                        type: "site_url",
-                        value: this.customDomainUrl || this.url,
-                    },
-            },
-            permissions: {
-                "ssm:GetParameters": [
-                    `arn:${Stack.of(this).partition}:ssm:${app.region}:${app.account}:parameter${getParameterPath(this, "url")}`,
-                ],
-            },
-        };
+        return this.distribution
+            ? {
+                clientPackage: "service",
+                variables: {
+                    url: this.doNotDeploy
+                        ? {
+                            type: "plain",
+                            value: this.props.dev?.url ?? "localhost",
+                        }
+                        : {
+                            // Do not set real value b/c we don't want to make the Lambda function
+                            // depend on the Site. B/c often the site depends on the Api, causing
+                            // a CloudFormation circular dependency if the Api and the Site belong
+                            // to different stacks.
+                            type: "site_url",
+                            value: this.customDomainUrl || this.url,
+                        },
+                },
+                permissions: {
+                    "ssm:GetParameters": [
+                        `arn:${Stack.of(this).partition}:ssm:${app.region}:${app.account}:parameter${getParameterPath(this, "url")}`,
+                    ],
+                },
+            }
+            : {
+                clientPackage: "service",
+                variables: {},
+                permissions: {},
+            };
     }
     /**
      * Binds additional resources to service.
@@ -404,6 +410,11 @@ export class Service extends Construct {
         return { cluster, taskDefinition, container, service };
     }
     createLoadBalancer(vpc, service) {
+        const { cdk } = this.props;
+        // Do not create load balancer if disabled
+        if (cdk?.applicationLoadBalancer === false) {
+            return {};
+        }
         const alb = new ApplicationLoadBalancer(this, "LoadBalancer", {
             vpc,
             internetFacing: true,
@@ -429,13 +440,18 @@ export class Service extends Construct {
             targetUtilizationPercent: memoryUtilization ?? 70,
             scaleOutCooldown: CdkDuration.seconds(300),
         });
-        scaling.scaleOnRequestCount("RequestScaling", {
-            requestsPerTarget: requestsPerContainer ?? 500,
-            targetGroup: target,
-        });
+        if (target) {
+            scaling.scaleOnRequestCount("RequestScaling", {
+                requestsPerTarget: requestsPerContainer ?? 500,
+                targetGroup: target,
+            });
+        }
     }
     createDistribution(alb) {
-        const { customDomain } = this.props;
+        const { cdk, customDomain } = this.props;
+        // Do not create distribution if disabled or if ALB was not created (ie. disabled)
+        if (!alb || cdk?.cloudfrontDistribution === false)
+            return;
         const cachePolicy = new CachePolicy(this, "CachePolicy", {
             queryStringBehavior: CacheQueryStringBehavior.all(),
             headerBehavior: CacheHeaderBehavior.none(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.24.0",
+  "version": "2.24.2",
   "bin": {
     "sst": "cli/sst.js"
   },

package/stacks/metadata.d.ts

@@ -6,6 +6,6 @@ declare module "../bus.js" {
         "stacks.metadata.deleted": {};
     }
 }
-export declare function metadataForStack(stack: String): Promise<Metadata[]>;
+export declare function metadataForStack(stack: String): Promise<Metadata[] | undefined>;
 export declare function metadata(): Promise<Record<string, Metadata[]>>;
 export declare const useMetadata: () => Promise<Record<string, Metadata[]>>;

package/stacks/metadata.js

@@ -16,12 +16,18 @@ export async function metadataForStack(stack) {
         region: project.config.region,
         credentials: credentials,
     });
-    const result = await s3.send(new GetObjectCommand({
-        Key: `stackMetadata/app.${project.config.name}/stage.${project.config.stage}/stack.${stack}.json`,
-        Bucket: bootstrap.bucket,
-    }));
-    const body = await result.Body.transformToString();
-    return JSON.parse(body);
+    try {
+        const result = await s3.send(new GetObjectCommand({
+            Key: `stackMetadata/app.${project.config.name}/stage.${project.config.stage}/stack.${stack}.json`,
+            Bucket: bootstrap.bucket,
+        }));
+        const body = await result.Body.transformToString();
+        return JSON.parse(body);
+    }
+    catch (e) {
+        Logger.debug(`Fetching metadata for stack ${stack} failed`, e);
+        return;
+    }
 }
 export async function metadata() {
     Logger.debug("Fetching all metadata");