sst 2.0.11 → 2.0.13

package/cli/commands/deploy.js

@@ -57,7 +57,11 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
         return result;
     })();
     const target = assembly.stacks.filter((s) => !args.filter ||
-        s.stackName.toLowerCase().includes(args.filter.toLowerCase()));
+        s.id
+            .toLowerCase()
+            .replace(project.config.name.toLowerCase(), "")
+            .replace(project.config.stage.toLowerCase(), "")
+            .includes(args.filter.toLowerCase()));
     if (!target.length) {
         Colors.line(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);

package/cli/commands/remove.js

@@ -30,7 +30,11 @@ export const remove = (program) => program.command("remove [filter]", "Remove yo
         });
     })();
     const target = assembly.stacks.filter((s) => !args.filter ||
-        s.stackName.toLowerCase().includes(args.filter.toLowerCase()));
+        s.id
+            .toLowerCase()
+            .replace(project.config.name.toLowerCase(), "")
+            .replace(project.config.stage.toLowerCase(), "")
+            .includes(args.filter.toLowerCase()));
     if (!target.length) {
         console.log(`No stacks found matching ${blue(args.filter)}`);
         process.exit(1);

package/cli/ui/deploy.js

@@ -71,7 +71,7 @@ export function printDeploymentResults(assembly, results, remove) {
     const success = Object.entries(results).filter(([_stack, result]) => Stacks.isSuccess(result.status));
     if (success.length) {
         Colors.gap();
-        Colors.line(Colors.success(`✔`), Colors.bold(remove ? `  Removed:` : ` Deployed:`));
+        Colors.line(Colors.success(`✔`), Colors.bold(remove ? ` Removed:` : ` Deployed:`));
         for (const [stack, result] of success) {
             const outputs = Object.entries(result.outputs).filter(([key, _]) => !key.includes("SstSiteEnv"));
             Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);

package/constructs/Job.d.ts

@@ -140,7 +140,6 @@ export declare class Job extends Construct implements SSTConstruct {
     private readonly localId;
     private readonly props;
     private readonly job;
-    private readonly isLiveDevEnabled;
     readonly _jobInvoker: Function;
     constructor(scope: Construct, id: string, props: JobProps);
     getConstructMetadata(): {

package/constructs/Job.js

@@ -3,9 +3,9 @@ import url from "url";
 import path from "path";
 import fs from "fs/promises";
 import { Construct } from "constructs";
-import * as iam from "aws-cdk-lib/aws-iam";
-import * as lambda from "aws-cdk-lib/aws-lambda";
-import * as codebuild from "aws-cdk-lib/aws-codebuild";
+import { PolicyStatement, Effect } from "aws-cdk-lib/aws-iam";
+import { AssetCode } from "aws-cdk-lib/aws-lambda";
+import { Project, LinuxBuildImage, BuildSpec, ComputeType, } from "aws-cdk-lib/aws-codebuild";
 import { Stack } from "./Stack.js";
 import { Function, useFunctions } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
@@ -37,7 +37,6 @@ export class Job extends Construct {
     localId;
     props;
     job;
-    isLiveDevEnabled;
     _jobInvoker;
     constructor(scope, id, props) {
         super(scope, props.cdk?.id || id);
@@ -53,9 +52,9 @@ export class Job extends Construct {
             .replace(/\$/g, "-")
             .replace(/\//g, "-")
             .replace(/\./g, "-");
-        this.isLiveDevEnabled = this.props.enableLiveDev === false ? false : true;
+        const isLiveDevEnabled = app.local && (this.props.enableLiveDev === false ? false : true);
         this.job = this.createCodeBuildProject();
-        if (app.local && this.isLiveDevEnabled) {
+        if (isLiveDevEnabled) {
             this._jobInvoker = this.createLocalInvoker();
         }
         else {
@@ -129,7 +128,7 @@ export class Job extends Construct {
     }
     createCodeBuildProject() {
         const app = this.node.root;
-        return new codebuild.Project(this, "JobProject", {
+        return new Project(this, "JobProject", {
             vpc: this.props.cdk?.vpc,
             projectName: app.logicalPrefixedName(this.node.id),
             environment: {
@@ -139,7 +138,7 @@ export class Job extends Construct {
                 // purpose of this demo, I use STANDARD_5_0. It takes 30s to boot.
                 //buildImage: codebuild.LinuxBuildImage.STANDARD_6_0,
                 //buildImage: codebuild.LinuxBuildImage.STANDARD_5_0,
-                buildImage: codebuild.LinuxBuildImage.fromDockerRegistry("amazon/aws-lambda-nodejs:16"),
+                buildImage: LinuxBuildImage.fromDockerRegistry("amazon/aws-lambda-nodejs:16"),
                 computeType: this.normalizeMemorySize(this.props.memorySize || "3 GB"),
             },
             environmentVariables: {
@@ -148,7 +147,7 @@ export class Job extends Construct {
                 SST_SSM_PREFIX: { value: useProject().config.ssmPrefix },
             },
             timeout: this.normalizeTimeout(this.props.timeout || "8 hours"),
-            buildSpec: codebuild.BuildSpec.fromObject({
+            buildSpec: BuildSpec.fromObject({
                 version: "0.2",
                 phases: {
                     build: {
@@ -163,54 +162,40 @@ export class Job extends Construct {
     buildCodeBuildProjectCode() {
         const app = this.node.root;
         // Handle remove (ie. sst remove)
-        if (app.mode !== "deploy") {
-            // do nothing
-        }
-        // Handle build
-        else {
-            useDeferredTasks().add(async () => {
-                // Build function
-                /*
-                const bundled = await Runtime.Handler.bundle({
-                  id: this.localId,
-                  root: app.appPath,
-                  handler,
-                  runtime: "nodejs16.x",
-                  srcPath,
-                  bundle
-                })!;
-                */
-                // TODO: Fix
-                const bundle = await useRuntimeHandlers().build(this.node.addr, "deploy");
-                // handle copy files
-                // create wrapper that calls the handler
-                if (bundle.type === "error")
-                    throw new Error(`Failed to build job "${this.props.handler}"`);
-                const parsed = path.parse(bundle.handler);
-                await fs.writeFile(path.join(bundle.out, "handler-wrapper.js"), [
-                    `console.log("")`,
-                    `console.log("//////////////////////")`,
-                    `console.log("// Start of the job //")`,
-                    `console.log("//////////////////////")`,
-                    `console.log("")`,
-                    `import { ${parsed.ext.substring(1)} } from "./${path.join(parsed.dir, parsed.name)}.mjs";`,
-                    `const event = JSON.parse(process.env.SST_PAYLOAD);`,
-                    `const result = await ${parsed.name}(event);`,
-                    `console.log("")`,
-                    `console.log("----------------------")`,
-                    `console.log("")`,
-                    `console.log("Result:", result);`,
-                    `console.log("")`,
-                    `console.log("//////////////////////")`,
-                    `console.log("//  End of the job  //")`,
-                    `console.log("//////////////////////")`,
-                    `console.log("")`,
-                ].join("\n"));
-                const code = lambda.AssetCode.fromAsset(bundle.out);
-                this.updateCodeBuildProjectCode(code, "handler-wrapper.js");
-                // This should always be true b/c runtime is always Node.js
-            });
-        }
+        if (app.mode === "remove")
+            return;
+        useDeferredTasks().add(async () => {
+            // Build function
+            const bundle = await useRuntimeHandlers().build(this.node.addr, "deploy");
+            // create wrapper that calls the handler
+            if (bundle.type === "error")
+                throw new Error(`Failed to build job "${this.props.handler}"`);
+            const parsed = path.parse(bundle.handler);
+            const importName = parsed.ext.substring(1);
+            const importPath = `./${path.join(parsed.dir, parsed.name)}.mjs`;
+            await fs.writeFile(path.join(bundle.out, "handler-wrapper.mjs"), [
+                `console.log("")`,
+                `console.log("//////////////////////")`,
+                `console.log("// Start of the job //")`,
+                `console.log("//////////////////////")`,
+                `console.log("")`,
+                `import { ${importName} } from "${importPath}";`,
+                `const event = JSON.parse(process.env.SST_PAYLOAD);`,
+                `const result = await ${importName}(event);`,
+                `console.log("")`,
+                `console.log("----------------------")`,
+                `console.log("")`,
+                `console.log("Result:", result);`,
+                `console.log("")`,
+                `console.log("//////////////////////")`,
+                `console.log("//  End of the job  //")`,
+                `console.log("//////////////////////")`,
+                `console.log("")`,
+            ].join("\n"));
+            const code = AssetCode.fromAsset(bundle.out);
+            this.updateCodeBuildProjectCode(code, "handler-wrapper.mjs");
+            // This should always be true b/c runtime is always Node.js
+        });
     }
     updateCodeBuildProjectCode(code, script) {
         // Update job's commands
@@ -228,9 +213,9 @@ export class Job extends Construct {
             ].join("\n"),
         };
         this.attachPermissions([
-            new iam.PolicyStatement({
+            new PolicyStatement({
                 actions: ["s3:*"],
-                effect: iam.Effect.ALLOW,
+                effect: Effect.ALLOW,
                 resources: [
                     `arn:${Stack.of(this).partition}:s3:::${codeConfig.s3Location?.bucketName}/${codeConfig.s3Location?.objectKey}`,
                 ],
@@ -259,15 +244,15 @@ export class Job extends Construct {
     createCodeBuildInvoker() {
         const fn = new Function(this, this.node.id, {
             handler: path.join(__dirname, "../support/job-invoker/index.main"),
-            runtime: "nodejs16.x",
+            runtime: "nodejs18.x",
             timeout: 10,
             memorySize: 1024,
             environment: {
                 PROJECT_NAME: this.job.projectName,
             },
             permissions: [
-                new iam.PolicyStatement({
-                    effect: iam.Effect.ALLOW,
+                new PolicyStatement({
+                    effect: Effect.ALLOW,
                     actions: ["codebuild:StartBuild"],
                     resources: [this.job.projectArn],
                 }),
@@ -289,9 +274,9 @@ export class Job extends Construct {
             // Bind permissions
             const permissions = bindPermissions(c);
             Object.entries(permissions).forEach(([action, resources]) => this.attachPermissionsForCodeBuild([
-                new iam.PolicyStatement({
+                new PolicyStatement({
                     actions: [action],
-                    effect: iam.Effect.ALLOW,
+                    effect: Effect.ALLOW,
                     resources,
                 }),
             ]));
@@ -308,16 +293,16 @@ export class Job extends Construct {
     }
     normalizeMemorySize(memorySize) {
         if (memorySize === "3 GB") {
-            return codebuild.ComputeType.SMALL;
+            return ComputeType.SMALL;
         }
         else if (memorySize === "7 GB") {
-            return codebuild.ComputeType.MEDIUM;
+            return ComputeType.MEDIUM;
         }
         else if (memorySize === "15 GB") {
-            return codebuild.ComputeType.LARGE;
+            return ComputeType.LARGE;
         }
         else if (memorySize === "145 GB") {
-            return codebuild.ComputeType.X2_LARGE;
+            return ComputeType.X2_LARGE;
         }
         throw new Error(`Invalid memory size value for the ${this.node.id} Job.`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -793,7 +793,7 @@ var init_site_env = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/tslib@2.4.1/node_modules/tslib/tslib.es6.js
+// ../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.es6.js
 var tslib_es6_exports = {};
 __export(tslib_es6_exports, {
   __assign: () => __assign,
@@ -807,6 +807,7 @@ __export(tslib_es6_exports, {
   __classPrivateFieldSet: () => __classPrivateFieldSet,
   __createBinding: () => __createBinding,
   __decorate: () => __decorate,
+  __esDecorate: () => __esDecorate,
   __exportStar: () => __exportStar,
   __extends: () => __extends,
   __generator: () => __generator,
@@ -815,8 +816,11 @@ __export(tslib_es6_exports, {
   __makeTemplateObject: () => __makeTemplateObject,
   __metadata: () => __metadata,
   __param: () => __param,
+  __propKey: () => __propKey,
   __read: () => __read,
   __rest: () => __rest,
+  __runInitializers: () => __runInitializers,
+  __setFunctionName: () => __setFunctionName,
   __spread: () => __spread,
   __spreadArray: () => __spreadArray,
   __spreadArrays: () => __spreadArrays,
@@ -858,6 +862,65 @@ function __param(paramIndex, decorator) {
     decorator(target, key, paramIndex);
   };
 }
+function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+  function accept(f) {
+    if (f !== void 0 && typeof f !== "function")
+      throw new TypeError("Function expected");
+    return f;
+  }
+  var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+  var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+  var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+  var _, done = false;
+  for (var i = decorators.length - 1; i >= 0; i--) {
+    var context = {};
+    for (var p in contextIn)
+      context[p] = p === "access" ? {} : contextIn[p];
+    for (var p in contextIn.access)
+      context.access[p] = contextIn.access[p];
+    context.addInitializer = function(f) {
+      if (done)
+        throw new TypeError("Cannot add initializers after decoration has completed");
+      extraInitializers.push(accept(f || null));
+    };
+    var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+    if (kind === "accessor") {
+      if (result === void 0)
+        continue;
+      if (result === null || typeof result !== "object")
+        throw new TypeError("Object expected");
+      if (_ = accept(result.get))
+        descriptor.get = _;
+      if (_ = accept(result.set))
+        descriptor.set = _;
+      if (_ = accept(result.init))
+        initializers.push(_);
+    } else if (_ = accept(result)) {
+      if (kind === "field")
+        initializers.push(_);
+      else
+        descriptor[key] = _;
+    }
+  }
+  if (target)
+    Object.defineProperty(target, contextIn.name, descriptor);
+  done = true;
+}
+function __runInitializers(thisArg, initializers, value) {
+  var useValue = arguments.length > 2;
+  for (var i = 0; i < initializers.length; i++) {
+    value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+  }
+  return useValue ? value : void 0;
+}
+function __propKey(x) {
+  return typeof x === "symbol" ? x : "".concat(x);
+}
+function __setFunctionName(f, name, prefix) {
+  if (typeof name === "symbol")
+    name = name.description ? "[".concat(name.description, "]") : "";
+  return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+}
 function __metadata(metadataKey, metadataValue) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
     return Reflect.metadata(metadataKey, metadataValue);
@@ -1077,7 +1140,7 @@ function __asyncDelegator(o) {
   }, i;
   function verb(n, f) {
     i[n] = o[n] ? function(v) {
-      return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v;
+      return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v;
     } : f;
   }
 }
@@ -1147,7 +1210,7 @@ function __classPrivateFieldIn(state2, receiver) {
 }
 var extendStatics, __assign, __createBinding, __setModuleDefault;
 var init_tslib_es6 = __esm({
-  "../../node_modules/.pnpm/tslib@2.4.1/node_modules/tslib/tslib.es6.js"() {
+  "../../node_modules/.pnpm/tslib@2.5.0/node_modules/tslib/tslib.es6.js"() {
     extendStatics = function(d, b) {
       extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
         d2.__proto__ = b2;
@@ -4165,11 +4228,16 @@ async function deploy(stack) {
   const deployment = new CloudFormationDeployments2({
     sdkProvider: provider
   });
+  const stackTags = Object.entries(stack.tags ?? {}).map(([Key, Value]) => ({
+    Key,
+    Value
+  }));
   try {
     await addInUseExports(stack);
     const result = await deployment.deployStack({
       stack,
       quiet: true,
+      tags: stackTags,
       deploymentMethod: {
         method: "direct"
       }
@@ -5442,7 +5510,7 @@ function printDeploymentResults(assembly, results, remove4) {
     Colors.gap();
     Colors.line(
       Colors.success(`\u2714`),
-      Colors.bold(remove4 ? `  Removed:` : ` Deployed:`)
+      Colors.bold(remove4 ? ` Removed:` : ` Deployed:`)
     );
     for (const [stack, result] of success) {
       const outputs = Object.entries(result.outputs).filter(
@@ -6722,7 +6790,7 @@ var deploy2 = (program2) => program2.command(
       return result;
     }();
     const target = assembly.stacks.filter(
-      (s) => !args.filter || s.stackName.toLowerCase().includes(args.filter.toLowerCase())
+      (s) => !args.filter || s.id.toLowerCase().replace(project.config.name.toLowerCase(), "").replace(project.config.stage.toLowerCase(), "").includes(args.filter.toLowerCase())
     );
     if (!target.length) {
       Colors.line(`No stacks found matching ${blue4(args.filter)}`);
@@ -6804,7 +6872,7 @@ var remove2 = (program2) => program2.command(
       });
     }();
     const target = assembly.stacks.filter(
-      (s) => !args.filter || s.stackName.toLowerCase().includes(args.filter.toLowerCase())
+      (s) => !args.filter || s.id.toLowerCase().replace(project.config.name.toLowerCase(), "").replace(project.config.stage.toLowerCase(), "").includes(args.filter.toLowerCase())
     );
     if (!target.length) {
       console.log(`No stacks found matching ${blue4(args.filter)}`);

package/stacks/deploy.js

@@ -74,11 +74,16 @@ export async function deploy(stack) {
     const deployment = new CloudFormationDeployments({
         sdkProvider: provider,
     });
+    const stackTags = Object.entries(stack.tags ?? {}).map(([Key, Value]) => ({
+        Key,
+        Value,
+    }));
     try {
         await addInUseExports(stack);
         const result = await deployment.deployStack({
             stack: stack,
             quiet: true,
+            tags: stackTags,
             deploymentMethod: {
                 method: "direct",
             },