sst 2.45.0 → 2.45.2

package/cli/commands/deploy.js

@@ -9,7 +9,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
 })
     .positional("filter", {
     type: "string",
-    describe: "Optionally filter stacks to deploy",
+    describe: "Optionally filter stacks to deploy using a regex pattern",
 }), async (args) => {
     const React = await import("react");
     const { printDeploymentResults } = await import("../ui/deploy.js");
@@ -59,12 +59,12 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         Colors.line(`   ${Colors.bold("Region:")}  ${project.config.region}`);
         Colors.line(`   ${Colors.bold("Account:")} ${identity.Account}`);
         Colors.gap();
-        const isActiveStack = (stackId) => !args.filter ||
-            stackId
+        const filter = !!args.filter && new RegExp(args.filter, "i");
+        const isActiveStack = (stackId) => !filter ||
+            filter.test(stackId
                 .toLowerCase()
                 .replace(project.config.name.toLowerCase(), "")
-                .replace(project.config.stage.toLowerCase(), "")
-                .includes(args.filter.toLowerCase());
+                .replace(project.config.stage.toLowerCase(), ""));
         // Generate cloud assembly
         // - if --from is specified, we will use the existing cloud assembly
         // - if --from is not specified, we will call synth to generate

package/cli/commands/remove.js

@@ -1,6 +1,6 @@
 export const remove = (program) => program.command("remove [filter]", "Remove your app from AWS", (yargs) => yargs.option("from", { type: "string" }).positional("filter", {
     type: "string",
-    describe: "Optionally filter stacks to remove",
+    describe: "Optionally filter stacks to remove using a regex pattern",
 }), async (args) => {
     const React = await import("react");
     const { dim, blue, bold } = await import("colorette");
@@ -33,12 +33,12 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
                 mode: "remove",
             });
         })();
-        const target = assembly.stacks.filter((s) => !args.filter ||
-            s.id
+        const filter = !!args.filter && new RegExp(args.filter, "i");
+        const target = assembly.stacks.filter((s) => !filter ||
+            filter.test(s.id
                 .toLowerCase()
                 .replace(project.config.name.toLowerCase(), "")
-                .replace(project.config.stage.toLowerCase(), "")
-                .includes(args.filter.toLowerCase()));
+                .replace(project.config.stage.toLowerCase(), "")));
         if (!target.length) {
             console.log(`No stacks found matching ${blue(args.filter)}`);
             throw new SilentError(`No stacks found matching ${args.filter}`);

package/cli/commands/update.js

@@ -1,5 +1,5 @@
 const FIELDS = ["dependencies", "devDependencies"];
-const SST_PKGS = ["sst", "astro-sst", "svelte-kit-sst", "solid-start-sst"];
+const SST_PKGS = ["sst", "svelte-kit-sst", "solid-start-sst"];
 export const update = (program) => program.command("update [version]", "Update your SST and CDK packages", (yargs) => yargs.positional("version", {
     type: "string",
     describe: "Optionally specify a version to update to",

package/constructs/NextjsSite.js

@@ -9,12 +9,13 @@ import { Queue } from "aws-cdk-lib/aws-sqs";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { Stack } from "./Stack.js";
 import { SsrSite, } from "./SsrSite.js";
+import { compareSemver } from "./util/compareSemver.js";
 import { toCdkSize } from "./util/size.js";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { VisibleError } from "../error.js";
 import { Logger } from "../logger.js";
-const DEFAULT_OPEN_NEXT_VERSION = "3.0.2";
+const DEFAULT_OPEN_NEXT_VERSION = "3.2.2";
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.
  * @example
@@ -35,11 +36,14 @@ export class NextjsSite extends SsrSite {
     prerenderManifest;
     openNextOutput;
     constructor(scope, id, props = {}) {
+        const openNextVersion = props.openNextVersion ?? DEFAULT_OPEN_NEXT_VERSION;
         super(scope, id, {
             buildCommand: [
                 "npx",
                 "--yes",
-                `open-next@${props?.openNextVersion ?? DEFAULT_OPEN_NEXT_VERSION}`,
+                `${compareSemver(openNextVersion, "3.1.3") <= 0
+                    ? "open-next"
+                    : "@opennextjs/aws"}@${openNextVersion}`,
                 "build",
             ].join(" "),
             ...props,

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 { ContainerDefinitionOptions, CpuArchitecture, FargateService, FargateTaskDefinition, FargateServiceProps, ICluster } from "aws-cdk-lib/aws-ecs";
+import { ContainerDefinitionOptions, CpuArchitecture, FargateService, FargateTaskDefinition, FargateServiceProps, ICluster, ScalableTaskCount } from "aws-cdk-lib/aws-ecs";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { ApplicationLoadBalancer, ApplicationLoadBalancerProps, ApplicationTargetGroupProps, BaseApplicationListenerProps } from "aws-cdk-lib/aws-elasticloadbalancingv2";
 declare const supportedCpus: {
@@ -119,7 +119,7 @@ export interface ServiceProps {
          */
         maxContainers?: number;
         /**
-         * Scales in or out to achieve a target cpu utilization.
+         * Scales in or out to achieve a target cpu utilization. Set to `false` to disable.
          * @default 70
          * @example
          * ```js
@@ -131,9 +131,9 @@ export interface ServiceProps {
          * }
          *```
          */
-        cpuUtilization?: number;
+        cpuUtilization?: number | false;
         /**
-         * Scales in or out to achieve a target memory utilization.
+         * Scales in or out to achieve a target memory utilization. Set to `false` to disable.
          * @default 70
          * @example
          * ```js
@@ -145,9 +145,9 @@ export interface ServiceProps {
          * }
          *```
          */
-        memoryUtilization?: number;
+        memoryUtilization?: number | false;
         /**
-         * Scales in or out to achieve a target request count per container.
+         * Scales in or out to achieve a target request count per container. Set to `false` to disable.
          * @default 500
          * @example
          * ```js
@@ -158,7 +158,7 @@ export interface ServiceProps {
          * }
          *```
          */
-        requestsPerContainer?: number;
+        requestsPerContainer?: number | false;
     };
     /**
      * Bind resources for the function
@@ -491,6 +491,7 @@ export declare class Service extends Construct implements SSTConstruct {
     private service?;
     private distribution?;
     private alb?;
+    private scaling?;
     constructor(scope: Construct, id: string, props: ServiceProps);
     /**
      * The CloudFront URL of the website.
@@ -513,6 +514,7 @@ export declare class Service extends Construct implements SSTConstruct {
         applicationLoadBalancer: ApplicationLoadBalancer | undefined;
         hostedZone: import("aws-cdk-lib/aws-route53").IHostedZone | undefined;
         certificate: import("aws-cdk-lib/aws-certificatemanager").ICertificate | undefined;
+        scaling: ScalableTaskCount | undefined;
     } | undefined;
     getConstructMetadata(): {
         type: "Service";

package/constructs/Service.js

@@ -149,6 +149,7 @@ export class Service extends Construct {
     service;
     distribution;
     alb;
+    scaling;
     constructor(scope, id, props) {
         super(scope, id);
         const app = scope.node.root;
@@ -178,7 +179,7 @@ export class Service extends Construct {
         const cluster = this.createCluster(vpc);
         const { container, taskDefinition, service } = this.createService(cluster);
         const { alb, target } = this.createLoadBalancer(vpc, service);
-        this.createAutoScaling(service, target);
+        const scaling = this.createAutoScaling(service, target);
         this.alb = alb;
         // Create Distribution
         this.distribution = this.createDistribution(alb);
@@ -187,6 +188,7 @@ export class Service extends Construct {
         this.service = service;
         this.container = container;
         this.taskDefinition = taskDefinition;
+        this.scaling = scaling;
         this.bindForService(props?.bind || []);
         this.attachPermissionsForService(props?.permissions || []);
         Object.entries(props?.environment || {}).map(([key, value]) => this.addEnvironmentForService(key, value));
@@ -253,6 +255,7 @@ export class Service extends Construct {
             applicationLoadBalancer: this.alb,
             hostedZone: this.distribution?.cdk.hostedZone,
             certificate: this.distribution?.cdk.certificate,
+            scaling: this.scaling,
         };
     }
     /////////////////////
@@ -490,20 +493,25 @@ export class Service extends Construct {
             minCapacity: minContainers ?? 1,
             maxCapacity: maxContainers ?? 1,
         });
-        scaling.scaleOnCpuUtilization("CpuScaling", {
-            targetUtilizationPercent: cpuUtilization ?? 70,
-            scaleOutCooldown: CdkDuration.seconds(300),
-        });
-        scaling.scaleOnMemoryUtilization("MemoryScaling", {
-            targetUtilizationPercent: memoryUtilization ?? 70,
-            scaleOutCooldown: CdkDuration.seconds(300),
-        });
-        if (target) {
+        if (cpuUtilization !== false) {
+            scaling.scaleOnCpuUtilization("CpuScaling", {
+                targetUtilizationPercent: cpuUtilization ?? 70,
+                scaleOutCooldown: CdkDuration.seconds(300),
+            });
+        }
+        if (memoryUtilization !== false) {
+            scaling.scaleOnMemoryUtilization("MemoryScaling", {
+                targetUtilizationPercent: memoryUtilization ?? 70,
+                scaleOutCooldown: CdkDuration.seconds(300),
+            });
+        }
+        if (target && requestsPerContainer !== false) {
             scaling.scaleOnRequestCount("RequestScaling", {
                 requestsPerTarget: requestsPerContainer ?? 500,
                 targetGroup: target,
             });
         }
+        return scaling;
     }
     createDistribution(alb) {
         const { cdk, customDomain } = this.props;

package/constructs/util/compareSemver.d.ts

@@ -0,0 +1 @@
+export declare function compareSemver(v1: string, v2: string): number;

package/constructs/util/compareSemver.js

@@ -0,0 +1,17 @@
+export function compareSemver(v1, v2) {
+    if (v1 === "latest")
+        return 1;
+    if (/^[^\d]/.test(v1)) {
+        v1 = v1.substring(1);
+    }
+    if (/^[^\d]/.test(v2)) {
+        v2 = v2.substring(1);
+    }
+    const [major1, minor1, patch1] = v1.split(".").map(Number);
+    const [major2, minor2, patch2] = v2.split(".").map(Number);
+    if (major1 !== major2)
+        return major1 - major2;
+    if (minor1 !== minor2)
+        return minor1 - minor2;
+    return patch1 - patch2;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.45.0",
+  "version": "2.45.2",
   "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.45.0",
+    "astro-sst": "2.45.1",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "5.2.2",