sst 2.33.1 → 2.33.3

package/bootstrap.js

@@ -182,6 +182,7 @@ export async function bootstrapSST(cdkBucket) {
             bucketArn: `arn:${stack.partition}:s3:::${cdkBucket}`,
         }
         : new Bucket(stack, region, {
+            bucketName: bootstrap?.bucketName,
             encryption: BucketEncryption.S3_MANAGED,
             removalPolicy: RemovalPolicy.DESTROY,
             autoDeleteObjects: true,

package/cli/sst.js

@@ -25,7 +25,6 @@ import { diff } from "./commands/diff.js";
 import { version } from "./commands/version.js";
 import { telemetry } from "./commands/telemetry.js";
 import { types } from "./commands/types.js";
-import { connect } from "./commands/connect.js";
 bootstrap(program);
 dev(program);
 deploy(program);
@@ -40,7 +39,6 @@ diff(program);
 version(program);
 telemetry(program);
 types(program);
-connect(program);
 if ("setSourceMapsEnabled" in process) {
     // @ts-expect-error
     process.setSourceMapsEnabled(true);

package/cli/ui/header.js

@@ -9,7 +9,7 @@ export async function printHeader(input) {
     Colors.line(`${Colors.primary(` `)}  ${Colors.bold("Stage:")}   ${project.config.stage}`);
     if (input.console) {
         const local = await useLocalServerConfig();
-        Colors.line(`${Colors.primary(` `)}  ${Colors.bold("Console:")} ${Colors.link(local.url)}`);
+        Colors.line(`${Colors.primary(` `)}  ${Colors.bold("Console:")} ${Colors.link(local.url + `/local/${project.config.name}/${project.config.stage}`)}`);
     }
     Colors.gap();
 }

package/constructs/EdgeFunction.js

@@ -326,7 +326,7 @@ export class EdgeFunction extends Construct {
                 FunctionBucket: lambdaBucket.getAttString("BucketName"),
                 FunctionParams: {
                     Description: `${this.node.id} handler`,
-                    Handler: handler,
+                    Handler: path.posix.join(...handler.split(path.sep)),
                     Code: {
                         S3Bucket: assetBucket,
                         S3Key: assetKey,

package/constructs/Service.d.ts

@@ -7,7 +7,7 @@ import { FunctionBindingProps } from "./util/functionBinding.js";
 import { IVpc } from "aws-cdk-lib/aws-ec2";
 import { Cluster, ContainerDefinitionOptions, CpuArchitecture, FargateService, FargateTaskDefinition, FargateServiceProps } from "aws-cdk-lib/aws-ecs";
 import { RetentionDays } from "aws-cdk-lib/aws-logs";
-import { ApplicationTargetGroupProps } from "aws-cdk-lib/aws-elasticloadbalancingv2";
+import { ApplicationLoadBalancer, ApplicationLoadBalancerProps, ApplicationTargetGroupProps } from "aws-cdk-lib/aws-elasticloadbalancingv2";
 declare const supportedCpus: {
     "0.25 vCPU": number;
     "0.5 vCPU": number;
@@ -299,7 +299,7 @@ export interface ServiceProps {
          * }
          * ```
          */
-        applicationLoadBalancer?: boolean;
+        applicationLoadBalancer?: boolean | Omit<ApplicationLoadBalancerProps, "vpc">;
         /**
          * Customize the Application Load Balancer's target group.
          * @default true
@@ -392,12 +392,13 @@ export declare class Service extends Construct implements SSTConstruct {
     private props;
     private doNotDeploy;
     private devFunction?;
-    private vpc;
-    private cluster;
-    private container;
-    private taskDefinition;
-    private service;
+    private vpc?;
+    private cluster?;
+    private container?;
+    private taskDefinition?;
+    private service?;
     private distribution?;
+    private alb?;
     constructor(scope: Construct, id: string, props?: ServiceProps);
     /**
      * The CloudFront URL of the website.
@@ -412,11 +413,12 @@ export declare class Service extends Construct implements SSTConstruct {
      * The internally created CDK resources.
      */
     get cdk(): {
-        vpc: IVpc;
-        cluster: Cluster;
-        fargateService: FargateService;
-        taskDefinition: FargateTaskDefinition;
+        vpc: IVpc | undefined;
+        cluster: Cluster | undefined;
+        fargateService: FargateService | undefined;
+        taskDefinition: FargateTaskDefinition | undefined;
         distribution: import("aws-cdk-lib/aws-cloudfront").IDistribution | undefined;
+        applicationLoadBalancer: ApplicationLoadBalancer | undefined;
         hostedZone: import("aws-cdk-lib/aws-route53").IHostedZone | undefined;
         certificate: import("aws-cdk-lib/aws-certificatemanager").ICertificate | undefined;
     } | undefined;
@@ -428,8 +430,8 @@ export declare class Service extends Construct implements SSTConstruct {
             customDomainUrl: string | undefined;
             url: string | undefined;
             devFunction: string | undefined;
-            task: string;
-            container: string;
+            task: string | undefined;
+            container: string | undefined;
             secrets: string[];
         };
     };

package/constructs/Service.js

@@ -147,6 +147,7 @@ export class Service extends Construct {
     taskDefinition;
     service;
     distribution;
+    alb;
     constructor(scope, id, props) {
         super(scope, id);
         const app = scope.node.root;
@@ -167,12 +168,6 @@ export class Service extends Construct {
         this.validateMemoryAndCpu();
         useServices().add(stack.stackName, id, this.props);
         if (this.doNotDeploy) {
-            // @ts-expect-error
-            this.vpc = this.cluster = null;
-            // @ts-expect-error
-            this.service = this.container = this.taskDefinition = null;
-            // @ts-expect-error
-            this.distribution = null;
             this.devFunction = this.createDevFunction();
             app.registerTypes(this);
             return;
@@ -182,6 +177,7 @@ export class Service extends Construct {
         const { cluster, container, taskDefinition, service } = this.createService(vpc);
         const { alb, target } = this.createLoadBalancer(vpc, service);
         this.createAutoScaling(service, target);
+        this.alb = alb;
         // Create Distribution
         this.distribution = this.createDistribution(alb);
         this.vpc = vpc;
@@ -250,6 +246,7 @@ export class Service extends Construct {
             fargateService: this.service,
             taskDefinition: this.taskDefinition,
             distribution: this.distribution?.cdk.distribution,
+            applicationLoadBalancer: this.alb,
             hostedZone: this.distribution?.cdk.hostedZone,
             certificate: this.distribution?.cdk.certificate,
         };
@@ -453,6 +450,9 @@ export class Service extends Construct {
         const alb = new ApplicationLoadBalancer(this, "LoadBalancer", {
             vpc,
             internetFacing: true,
+            ...(cdk?.applicationLoadBalancer === true
+                ? {}
+                : cdk?.applicationLoadBalancer),
         });
         const listener = alb.addListener("Listener", { port: 80 });
         const target = listener.addTargets("TargetGroup", {
@@ -563,9 +563,11 @@ export class Service extends Construct {
         });
     }
     addEnvironmentForService(name, value) {
-        this.container.addEnvironment(name, value);
+        this.container?.addEnvironment(name, value);
     }
     attachPermissionsForService(permissions) {
+        if (!this.taskDefinition)
+            return;
         attachPermissionsToRole(this.taskDefinition.taskRole, permissions);
     }
     /////////////////////

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.33.1",
+  "version": "2.33.3",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -124,7 +124,7 @@
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",
     "vitest": "^0.33.0",
-    "astro-sst": "2.33.1"
+    "astro-sst": "2.33.3"
   },
   "peerDependencies": {
     "@sls-next/lambda-at-edge": "^3.7.0"

package/project.d.ts

@@ -19,6 +19,7 @@ export interface ConfigOptions {
     bootstrap?: {
         useCdkBucket?: boolean;
         stackName?: string;
+        bucketName?: string;
         tags?: Record<string, string>;
     };
     cdk?: {

package/cli/commands/connect.d.ts

@@ -1,17 +0,0 @@
-/// <reference types="yargs" />
-import type { Program } from "../program.js";
-export declare const connect: (program: Program) => import("yargs").Argv<{
-    stage: string | undefined;
-} & {
-    profile: string | undefined;
-} & {
-    region: string | undefined;
-} & {
-    verbose: boolean | undefined;
-} & {
-    role: string | undefined;
-} & {
-    future: boolean | undefined;
-} & {
-    dev: boolean;
-}>;

package/cli/commands/connect.js

@@ -1,55 +0,0 @@
-import { Colors } from "../colors.js";
-export const connect = (program) => program.command("connect", "Connect a stage to SST Console", (yargs) => yargs.option("dev", {
-    type: "boolean",
-    default: false,
-    describe: "Connect to SST dev account (probably don't want to do this)",
-}), async (args) => {
-    if (!args.future)
-        throw new Error("This command is not yet available.");
-    const { exit, exitWithError } = await import("../program.js");
-    const { useAWSClient } = await import("../../credentials.js");
-    const { useProject } = await import("../../project.js");
-    const { useSTSIdentity } = await import("../../credentials.js");
-    const { IAMClient, CreateRoleCommand, AttachRolePolicyCommand } = await import("@aws-sdk/client-iam");
-    try {
-        const client = useAWSClient(IAMClient);
-        if (args.dev) {
-            Colors.line(Colors.warning("⚠"), Colors.bold(" Connecting to dev stage"));
-        }
-        await client
-            .send(new CreateRoleCommand({
-            RoleName: "sst",
-            AssumeRolePolicyDocument: JSON.stringify({
-                Version: "2012-10-17",
-                Statement: [
-                    {
-                        Effect: "Allow",
-                        Principal: {
-                            AWS: `arn:aws:iam::${args.dev ? "917397401067" : "226609089145"}:root`,
-                        },
-                        Action: "sts:AssumeRole",
-                    },
-                ],
-            }),
-        }))
-            .catch((e) => {
-            if (e.Error.Code === "EntityAlreadyExists")
-                return;
-            throw e;
-        });
-        await client.send(new AttachRolePolicyCommand({
-            RoleName: "sst",
-            PolicyArn: "arn:aws:iam::aws:policy/AdministratorAccess",
-        }));
-        const project = useProject();
-        const identity = await useSTSIdentity();
-        const host = args.dev
-            ? "http://localhost:3000"
-            : "https://console.production.sst.dev";
-        console.log(`${host}/connect?app=${project.config.name}&stage=${project.config.stage}&aws_account_id=${identity.Account}&region=${project.config.region}`);
-        await exit();
-    }
-    catch (e) {
-        await exitWithError(e);
-    }
-});