sst 2.0.0-rc.50 → 2.0.0-rc.51

package/cli/commands/deploy.js

@@ -1,5 +1,7 @@
 import { useSTSIdentity } from "../../credentials.js";
 import { Colors } from "../colors.js";
+import fs from "fs/promises";
+import path from "path";
 export const deploy = (program) => program.command("deploy [filter]", "Deploy your app to AWS", (yargs) => yargs
     .option("from", {
     type: "string",
@@ -17,6 +19,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     const { loadAssembly, Stacks } = await import("../../stacks/index.js");
     const { render } = await import("ink");
     const { DeploymentUI } = await import("../ui/deploy.js");
+    const { mapValues } = await import("remeda");
     const project = useProject();
     const identity = await useSTSIdentity();
     Colors.line(`${Colors.primary.bold(`SST v${project.version}`)}`);
@@ -57,5 +60,6 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     printDeploymentResults(assembly, results);
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
         process.exit(1);
+    fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
     process.exit(0);
 });

package/cli/commands/dev.js

@@ -1,6 +1,7 @@
 import chalk from "chalk";
 import { Colors } from "../colors.js";
 import { printHeader } from "../ui/header.js";
+import { mapValues } from "remeda";
 export const dev = (program) => program.command(["dev", "start"], "Work on your app locally", (yargs) => yargs.option("increase-timeout", {
     type: "boolean",
     description: "Increase function timeout",
@@ -81,9 +82,10 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         bus.subscribe("function.success", async (evt) => {
             // stdout logs sometimes come in after
+            const p = prefix(evt.properties.requestID);
             const req = pending.get(evt.properties.requestID);
             setTimeout(() => {
-                Colors.line(prefix(evt.properties.requestID), Colors.dim(`Done in ${Date.now() - req.started - 100}ms`));
+                Colors.line(p, Colors.dim(`Done in ${Date.now() - req.started - 100}ms`));
                 end(evt.properties.requestID);
             }, 100);
         });
@@ -181,6 +183,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
                 }
                 await SiteEnv.writeValues(result);
             }
+            fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
             isDeploying = false;
             deploy();
         }

package/cli/ui/deploy.js

@@ -70,15 +70,7 @@ export function printDeploymentResults(assembly, results, remove) {
         Colors.gap();
         Colors.line(Colors.success(`✔`), Colors.bold(remove ? `  Removed:` : ` Deployed:`));
         for (const [stack, result] of success) {
-            const outputs = Object.entries(result.outputs).filter(([key, _]) => {
-                if (key.startsWith("Export"))
-                    return false;
-                if (key.includes("SstSiteEnv"))
-                    return false;
-                if (key === "SSTMetadata")
-                    return false;
-                return true;
-            });
+            const outputs = Object.entries(result.outputs);
             Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
             if (outputs.length > 0) {
                 for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
@@ -87,6 +79,7 @@ export function printDeploymentResults(assembly, results, remove) {
                 }
             }
         }
+        Colors.gap();
     }
     // Print failed stacks
     const failed = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length > 0);
@@ -121,9 +114,9 @@ function logicalIdToCdkPath(assembly, stack, logicalId) {
 }
 function getHelper(error) {
     return `This is a common deploy error. Check out this GitHub issue for more details - https://github.com/serverless-stack/sst/issues/125`;
-    return getApiAccessLogPermissionsHelper(error)
-        || getAppSyncMultiResolverHelper(error)
-        || getApiLogRoleHelper(error);
+    return (getApiAccessLogPermissionsHelper(error) ||
+        getAppSyncMultiResolverHelper(error) ||
+        getApiLogRoleHelper(error));
 }
 function getApiAccessLogPermissionsHelper(error) {
     // Can run into this issue when enabling access logs for API Gateway

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.50",
+  "version": "2.0.0-rc.51",
   "bin": {
     "sst": "cli/sst.js"
   },

package/project.js

@@ -64,7 +64,9 @@ export async function initProject(globals) {
         config: {
             ...config,
             stage,
-            profile: globals.profile || config.profile,
+            profile: process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY
+                ? undefined
+                : (globals.profile || config.profile),
             region: globals.region || config.region,
             role: globals.role || config.role,
             ssmPrefix: config.ssmPrefix || `/sst/${config.name}/${stage}/`,

package/sst.mjs

@@ -1191,6 +1191,7 @@ import {
   DescribeStacksCommand,
   DescribeStackEventsCommand
 } from "@aws-sdk/client-cloudformation";
+import { map, omitBy, pipe } from "remeda";
 function isFinal(input) {
   return STATUSES_SUCCESS.includes(input) || STATUSES_FAILED.includes(input);
 }
@@ -1271,8 +1272,11 @@ async function monitor(stack) {
           if (isFinal(first.StackStatus)) {
             return {
               status: first.StackStatus,
-              outputs: Object.fromEntries(
-                first.Outputs?.map((o) => [o.OutputKey, o.OutputValue]) || []
+              outputs: pipe(
+                first.Outputs || [],
+                map((o) => [o.OutputKey, o.OutputValue]),
+                Object.fromEntries,
+                filterOutputs
               ),
               errors: isFailed(first.StackStatus) ? errors : {}
             };
@@ -1295,6 +1299,14 @@ async function monitor(stack) {
     await new Promise((resolve) => setTimeout(resolve, 1e3));
   }
 }
+function filterOutputs(input) {
+  return pipe(
+    input,
+    omitBy((_, key) => {
+      return key.startsWith("Export") || key.includes("SstSiteEnv") || key === "SSTMetadata";
+    })
+  );
+}
 var STATUSES_PENDING, STATUSES_SUCCESS, STATUSES_FAILED, STATUSES;
 var init_monitor = __esm({
   "src/stacks/monitor.ts"() {
@@ -2339,16 +2351,13 @@ async function publishAssets4(stacks) {
   const { publishDeployAssets: publishDeployAssets2 } = await Promise.resolve().then(() => (init_cloudformation_deployments_wrapper(), cloudformation_deployments_wrapper_exports));
   const results = {};
   for (const stack of stacks) {
-    const result = await publishDeployAssets2(
-      provider,
-      {
-        stack,
-        quiet: false,
-        deploymentMethod: {
-          method: "direct"
-        }
+    const result = await publishDeployAssets2(provider, {
+      stack,
+      quiet: false,
+      deploymentMethod: {
+        method: "direct"
       }
-    );
+    });
     results[stack.stackName] = result;
   }
   return results;
@@ -2426,7 +2435,7 @@ async function deploy(stack) {
       });
       return {
         errors: {},
-        outputs: result.outputs,
+        outputs: filterOutputs(result.outputs),
         status: "SKIPPED"
       };
     }
@@ -2502,13 +2511,13 @@ async function diff(stack, oldTemplate) {
 }
 async function buildLogicalToPathMap(stack) {
   const { ArtifactMetadataEntryType } = await import("@aws-cdk/cloud-assembly-schema");
-  const map2 = {};
+  const map3 = {};
   for (const md of stack.findMetadataByType(
     ArtifactMetadataEntryType.LOGICAL_ID
   )) {
-    map2[md.data] = md.path;
+    map3[md.data] = md.path;
   }
-  return map2;
+  return map3;
 }
 var init_diff = __esm({
   "src/stacks/diff.ts"() {
@@ -4017,6 +4026,7 @@ __export(stacks_exports, {
   deploy: () => deploy,
   deployMany: () => deployMany,
   diff: () => diff,
+  filterOutputs: () => filterOutputs,
   isFailed: () => isFailed,
   isFinal: () => isFinal,
   isPending: () => isPending,
@@ -4352,7 +4362,7 @@ async function initProject(globals) {
     config: {
       ...config,
       stage,
-      profile: globals.profile || config.profile,
+      profile: process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY ? void 0 : globals.profile || config.profile,
       region: globals.region || config.region,
       role: globals.role || config.role,
       ssmPrefix: config.ssmPrefix || `/sst/${config.name}/${stage}/`
@@ -5203,15 +5213,7 @@ function printDeploymentResults(assembly, results, remove4) {
       Colors.bold(remove4 ? `  Removed:` : ` Deployed:`)
     );
     for (const [stack, result] of success) {
-      const outputs = Object.entries(result.outputs).filter(([key, _]) => {
-        if (key.startsWith("Export"))
-          return false;
-        if (key.includes("SstSiteEnv"))
-          return false;
-        if (key === "SSTMetadata")
-          return false;
-        return true;
-      });
+      const outputs = Object.entries(result.outputs);
       Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
       if (outputs.length > 0) {
         for (const key of Object.keys(Object.fromEntries(outputs)).sort()) {
@@ -5220,6 +5222,7 @@ function printDeploymentResults(assembly, results, remove4) {
         }
       }
     }
+    Colors.gap();
   }
   const failed = Object.entries(results).filter(
     ([_stack, result]) => Object.keys(result.errors).length > 0
@@ -5400,15 +5403,15 @@ async function extractSchema(opts) {
       {
         name: "pothos-extractor",
         visitor: {
-          Program(path17) {
-            const dummyResolverId = path17.scope.generateUidIdentifier("DUMMY_RESOLVER");
+          Program(path18) {
+            const dummyResolverId = path18.scope.generateUidIdentifier("DUMMY_RESOLVER");
             const resolverNode = dummyResolver({
               dummy_resolver: dummyResolverId
             });
-            path17.unshiftContainer("body", resolverNode);
-            path17.scope.crawl();
+            path18.unshiftContainer("body", resolverNode);
+            path18.scope.crawl();
             let schemaBuilder = null;
-            path17.traverse({
+            path18.traverse({
               ImportDeclaration(declarator) {
                 if (!declarator)
                   return;
@@ -5466,17 +5469,17 @@ async function extractSchema(opts) {
   );
   return contents.code;
 }
-function getBindings(path17, globalPaths) {
+function getBindings(path18, globalPaths) {
   const bindings = [];
-  path17.traverse({
+  path18.traverse({
     Expression(expressionPath) {
       if (!expressionPath.isIdentifier())
         return;
-      const binding = path17.scope.getBinding(expressionPath);
+      const binding = path18.scope.getBinding(expressionPath);
       if (!binding || globalPaths.has(binding.path) || bindings.includes(binding.path))
         return;
       const rootBinding = findRootBinding(binding.path);
-      if (path17 === rootBinding) {
+      if (path18 === rootBinding) {
         bindings.push(binding.path);
         return;
       }
@@ -5489,8 +5492,8 @@ function getBindings(path17, globalPaths) {
   }
   return bindings;
 }
-function findRootBinding(path17) {
-  let rootPath = path17;
+function findRootBinding(path18) {
+  let rootPath = path18;
   while (rootPath.parentPath?.node !== void 0 && !rootPath.parentPath?.isProgram()) {
     rootPath = rootPath.parentPath;
   }
@@ -5760,7 +5763,7 @@ import {
   LambdaClient,
   UpdateFunctionConfigurationCommand
 } from "@aws-sdk/client-lambda";
-import { pipe, map } from "remeda";
+import { pipe as pipe2, map as map2 } from "remeda";
 async function* scan(prefix) {
   const ssm = useAWSClient(SSMClient);
   let token;
@@ -5853,9 +5856,9 @@ var init_config = __esm({
         const env3 = {
           SST_APP: project.config.name,
           SST_STAGE: project.config.stage,
-          ...pipe(
+          ...pipe2(
             parameters2,
-            map((p) => [envFor(p), p.value]),
+            map2((p) => [envFor(p), p.value]),
             Object.fromEntries
           )
         };
@@ -6014,12 +6017,12 @@ var env = (program2) => program2.command(
   ),
   async (args) => {
     const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
-    const fs17 = await import("fs/promises");
+    const fs18 = await import("fs/promises");
     const { SiteEnv } = await Promise.resolve().then(() => (init_site_env(), site_env_exports));
     const { spawnSync } = await import("child_process");
     let spinner;
     while (true) {
-      const exists = await fs17.access(SiteEnv.valuesFile()).then(() => true).catch(() => false);
+      const exists = await fs18.access(SiteEnv.valuesFile()).then(() => true).catch(() => false);
       if (!exists) {
         spinner = createSpinner2("Cannot find SST environment variables. Waiting for SST to start...").start();
         await new Promise((resolve) => setTimeout(resolve, 1e3));
@@ -6046,6 +6049,7 @@ var env = (program2) => program2.command(
 init_colors();
 init_header();
 import chalk2 from "chalk";
+import { mapValues } from "remeda";
 var dev = (program2) => program2.command(
   ["dev", "start"],
   "Work on your app locally",
@@ -6068,8 +6072,8 @@ var dev = (program2) => program2.command(
     const { Context: Context2 } = await Promise.resolve().then(() => (init_context(), context_exports));
     const { DeploymentUI: DeploymentUI2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
     const { useLocalServer: useLocalServer2 } = await Promise.resolve().then(() => (init_server2(), server_exports2));
-    const path17 = await import("path");
-    const fs17 = await import("fs/promises");
+    const path18 = await import("path");
+    const fs18 = await import("fs/promises");
     const crypto2 = await import("crypto");
     const { printDeploymentResults: printDeploymentResults2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
     const { useFunctions: useFunctions3 } = await import("../src/constructs/Function.js");
@@ -6153,10 +6157,11 @@ var dev = (program2) => program2.command(
         Colors.gap();
       });
       bus.subscribe("function.success", async (evt) => {
+        const p = prefix(evt.properties.requestID);
         const req = pending.get(evt.properties.requestID);
         setTimeout(() => {
           Colors.line(
-            prefix(evt.properties.requestID),
+            p,
             Colors.dim(`Done in ${Date.now() - req.started - 100}ms`)
           );
           end(evt.properties.requestID);
@@ -6259,21 +6264,29 @@ var dev = (program2) => program2.command(
           }
           await SiteEnv.writeValues(result);
         }
+        fs18.writeFile(
+          path18.join(project2.paths.out, "outputs.json"),
+          JSON.stringify(
+            mapValues(results, (val) => val.outputs),
+            null,
+            2
+          )
+        );
         isDeploying = false;
         deploy3();
       }
       async function checksum(cdkOutPath) {
-        const manifestPath = path17.join(cdkOutPath, "manifest.json");
+        const manifestPath = path18.join(cdkOutPath, "manifest.json");
         const cdkManifest = JSON.parse(
-          await fs17.readFile(manifestPath).then((x) => x.toString())
+          await fs18.readFile(manifestPath).then((x) => x.toString())
         );
         const checksumData = await Promise.all(
           Object.keys(cdkManifest.artifacts).filter(
             (key) => cdkManifest.artifacts[key].type === "aws:cloudformation:stack"
           ).map(async (key) => {
             const { templateFile } = cdkManifest.artifacts[key].properties;
-            const templatePath = path17.join(cdkOutPath, templateFile);
-            const templateContent = await fs17.readFile(templatePath);
+            const templatePath = path18.join(cdkOutPath, templateFile);
+            const templateContent = await fs18.readFile(templatePath);
             return templateContent;
           })
         ).then((x) => x.join("\n"));
@@ -6362,7 +6375,7 @@ var build = (program2) => program2.command(
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     const { Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
-    const path17 = await import("path");
+    const path18 = await import("path");
     const result = await Stacks.synth({
       fn: useProject2().stacks,
       buildDir: args.to,
@@ -6372,7 +6385,7 @@ var build = (program2) => program2.command(
     Colors2.line(
       Colors2.success(`\u2714`),
       Colors2.bold(" Built:"),
-      `${result.stacks.length} stack${result.stacks.length > 1 ? "s" : ""} to ${path17.relative(process.cwd(), result.directory)}`
+      `${result.stacks.length} stack${result.stacks.length > 1 ? "s" : ""} to ${path18.relative(process.cwd(), result.directory)}`
     );
     process.exit(0);
   }
@@ -6381,6 +6394,8 @@ var build = (program2) => program2.command(
 // src/cli/commands/deploy.tsx
 init_credentials();
 init_colors();
+import fs17 from "fs/promises";
+import path17 from "path";
 var deploy2 = (program2) => program2.command(
   "deploy [filter]",
   "Deploy your app to AWS",
@@ -6400,6 +6415,7 @@ var deploy2 = (program2) => program2.command(
     const { loadAssembly: loadAssembly2, Stacks } = await Promise.resolve().then(() => (init_stacks(), stacks_exports));
     const { render } = await import("ink");
     const { DeploymentUI: DeploymentUI2 } = await Promise.resolve().then(() => (init_deploy2(), deploy_exports));
+    const { mapValues: mapValues2 } = await import("remeda");
     const project = useProject2();
     const identity = await useSTSIdentity();
     Colors.line(`${Colors.primary.bold(`SST v${project.version}`)}`);
@@ -6440,6 +6456,14 @@ var deploy2 = (program2) => program2.command(
     printDeploymentResults2(assembly, results);
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
       process.exit(1);
+    fs17.writeFile(
+      path17.join(project.paths.out, "outputs.json"),
+      JSON.stringify(
+        mapValues2(results, (val) => val.outputs),
+        null,
+        2
+      )
+    );
     process.exit(0);
   }
 );
@@ -6696,22 +6720,22 @@ var update = (program2) => program2.command(
   }),
   async (args) => {
     const { green, yellow } = await import("colorette");
-    const fs17 = await import("fs/promises");
-    const path17 = await import("path");
+    const fs18 = await import("fs/promises");
+    const path18 = await import("path");
     const { fetch } = await import("undici");
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
     async function find2(dir) {
-      const children = await fs17.readdir(dir);
+      const children = await fs18.readdir(dir);
       const tasks2 = children.map(async (item) => {
         if (item === "node_modules")
           return [];
         if (/(^|\/)\.[^\/\.]/g.test(item))
           return [];
-        const full = path17.join(dir, item);
+        const full = path18.join(dir, item);
         if (item === "package.json")
           return [full];
-        const stat = await fs17.stat(full);
+        const stat = await fs18.stat(full);
         if (stat.isDirectory())
           return find2(full);
         return [];
@@ -6725,7 +6749,7 @@ var update = (program2) => program2.command(
     ).then((resp) => resp.json());
     const results = /* @__PURE__ */ new Map();
     const tasks = files.map(async (file) => {
-      const data2 = await fs17.readFile(file).then((x) => x.toString()).then(JSON.parse);
+      const data2 = await fs18.readFile(file).then((x) => x.toString()).then(JSON.parse);
       for (const field of FIELDS) {
         const deps = data2[field];
         if (!deps)
@@ -6753,7 +6777,7 @@ var update = (program2) => program2.command(
           deps[pkg] = desired;
         }
       }
-      await fs17.writeFile(file, JSON.stringify(data2, null, 2));
+      await fs18.writeFile(file, JSON.stringify(data2, null, 2));
     });
     await Promise.all(tasks);
     if (results.size === 0) {
@@ -6763,7 +6787,7 @@ var update = (program2) => program2.command(
     for (const [file, pkgs] of results.entries()) {
       Colors2.line(
         Colors2.success(`\u2714 `),
-        Colors2.bold.dim(path17.relative(project.paths.root, file))
+        Colors2.bold.dim(path18.relative(project.paths.root, file))
       );
       for (const [pkg, version2] of pkgs) {
         Colors2.line(Colors2.dim(`   ${pkg}@${version2}`));

package/stacks/deploy.js

@@ -1,7 +1,7 @@
 import { useBus } from "../bus.js";
 import { useAWSProvider } from "../credentials.js";
 import { Logger } from "../logger.js";
-import { isFailed, monitor } from "./monitor.js";
+import { filterOutputs, isFailed, monitor, } from "./monitor.js";
 export async function publishAssets(stacks) {
     Logger.debug("Publishing assets");
     const provider = await useAWSProvider();
@@ -89,7 +89,7 @@ export async function deploy(stack) {
             });
             return {
                 errors: {},
-                outputs: result.outputs,
+                outputs: filterOutputs(result.outputs),
                 status: "SKIPPED",
             };
         }

package/stacks/monitor.d.ts

@@ -28,4 +28,5 @@ export declare function monitor(stack: string): Promise<{
     outputs: Record<string, string>;
     errors: Record<string, string>;
 }>;
+export declare function filterOutputs(input: Record<string, string>): Record<string, string>;
 export type StackDeploymentResult = Awaited<ReturnType<typeof monitor>>;

package/stacks/monitor.js

@@ -106,7 +106,7 @@ export async function monitor(stack) {
                     if (isFinal(first.StackStatus)) {
                         return {
                             status: first.StackStatus,
-                            outputs: Object.fromEntries(first.Outputs?.map((o) => [o.OutputKey, o.OutputValue]) || []),
+                            outputs: pipe(first.Outputs || [], map((o) => [o.OutputKey, o.OutputValue]), Object.fromEntries, filterOutputs),
                             errors: isFailed(first.StackStatus) ? errors : {},
                         };
                     }
@@ -129,3 +129,11 @@ export async function monitor(stack) {
         await new Promise((resolve) => setTimeout(resolve, 1000));
     }
 }
+import { map, omitBy, pipe } from "remeda";
+export function filterOutputs(input) {
+    return pipe(input, omitBy((_, key) => {
+        return (key.startsWith("Export") ||
+            key.includes("SstSiteEnv") ||
+            key === "SSTMetadata");
+    }));
+}