sst 2.0.0-rc.20 → 2.0.0-rc.21

package/constructs/Function.d.ts

@@ -642,7 +642,6 @@ export declare class Function extends lambda.Function implements SSTConstruct {
     static normalizeMemorySize(memorySize?: number | Size): number;
     static normalizeDiskSize(diskSize?: number | Size): cdk.Size;
     static normalizeTimeout(timeout?: number | Duration): cdk.Duration;
-    static normalizeRuntime(runtime?: Runtime): Runtime;
     static normalizeSrcPath(srcPath: string): string;
     static handleImportedLayer(scope: Construct, layer: lambda.ILayerVersion): lambda.ILayerVersion;
     static isInlineDefinition(definition: any): definition is FunctionInlineDefinition;

package/constructs/Function.js

@@ -77,6 +77,7 @@ export class Function extends lambda.Function {
             .forEach((per) => {
             props = Function.mergeProps(per, props);
         });
+        props.runtime = props.runtime || "nodejs16.x";
         // Set defaults
         const functionName = props.functionName &&
             (typeof props.functionName === "string"
@@ -84,7 +85,6 @@ export class Function extends lambda.Function {
                 : props.functionName({ stack, functionProps: props }));
         const handler = props.handler;
         const timeout = Function.normalizeTimeout(props.timeout);
-        const runtime = Function.normalizeRuntime(props.runtime);
         const architecture = (() => {
             if (props.architecture === "arm_64")
                 return lambda.Architecture.ARM_64;
@@ -103,9 +103,7 @@ export class Function extends lambda.Function {
             throw new Error(`No handler defined for the "${id}" Lambda function`);
         }
         // Validate input
-        const isNodeRuntime = runtime.startsWith("nodejs");
-        const isPythonRuntime = runtime.startsWith("python");
-        const isJavaRuntime = runtime.startsWith("java");
+        const isNodeRuntime = props.runtime.startsWith("nodejs");
         // Handle local development (ie. sst start)
         // - set runtime to nodejs12.x for non-Node runtimes (b/c the stub is in Node)
         // - set retry to 0. When the debugger is disconnected, the Cron construct
@@ -196,7 +194,8 @@ export class Function extends lambda.Function {
                 // Update function's code
                 const codeConfig = code.bind(this);
                 const cfnFunction = this.node.defaultChild;
-                cfnFunction.runtime = supportedRuntimes[runtime].toString();
+                cfnFunction.runtime =
+                    supportedRuntimes[props.runtime].toString();
                 /*
                 if (isJavaRuntime) {
                   const providedRuntime = (bundle as FunctionBundleJavaProps)
@@ -391,13 +390,6 @@ export class Function extends lambda.Function {
         }
         return cdk.Duration.seconds(timeout || 10);
     }
-    static normalizeRuntime(runtime) {
-        runtime = runtime || "nodejs18.x";
-        if (!supportedRuntimes[runtime]) {
-            throw new Error(`The specified runtime is not supported for sst.Function. Only NodeJS, Python, Go, and .NET runtimes are currently supported.`);
-        }
-        return runtime;
-    }
     static normalizeSrcPath(srcPath) {
         return srcPath.replace(/\/+$/, "");
     }

package/credentials.js

@@ -37,6 +37,8 @@ export function useAWSClient(client, force = false) {
             retryDecider: (err) => {
                 if (err.$fault === "client")
                     return false;
+                if (err.name === "CredentialsProviderError")
+                    return false;
                 if (err.message === "Could not load credentials from any providers")
                     return false;
                 return true;

package/package.json

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

package/project.js

@@ -24,7 +24,6 @@ const CONFIG_EXTENSIONS = [
     ".config.cjs",
     ".config.mjs",
     ".config.js",
-    ".json",
 ];
 export async function initProject(globals) {
     const root = globals.root || (await findRoot());
@@ -42,12 +41,10 @@ export async function initProject(globals) {
             catch {
                 continue;
             }
-            if (file.endsWith("js") || file.endsWith("ts")) {
-                const [metafile, config] = await Stacks.load(file);
-                return [metafile, config];
-            }
+            const [metafile, config] = await Stacks.load(file);
+            return [metafile, config];
         }
-        throw new VisibleError("Could not found a configuration file", "Make sure one of the following exists", "  - sst.config.cjs", "  - sst.config.mjs", "  - sst.config.js", "  - sst.config.ts", "  - sst.json");
+        throw new VisibleError("Could not found a configuration file", "Make sure one of the following exists", ...CONFIG_EXTENSIONS.map((x) => `  - sst${x}`));
     })();
     const config = await Promise.resolve(sstConfig.config(globals));
     const stage = config.stage ||

package/sst.mjs

@@ -269,6 +269,21 @@ async function load(input) {
     await fs3.rm(outfile, {
       force: true
     });
+    if (!mod.default?.config)
+      throw new VisibleError(
+        `The config file is improperly formatted.`,
+        `Example:`,
+        `export default {`,
+        `  config() {`,
+        `    return {`,
+        `      name: "my-app",`,
+        `      region: "us-east-1"`,
+        `    }`,
+        `  },`,
+        `  stacks(app) {`,
+        `  }`,
+        `}`
+      );
     return [result.metafile, mod.default];
   } catch (e) {
     await fs3.rm(outfile, {
@@ -282,6 +297,7 @@ var init_build = __esm({
     "use strict";
     init_module();
     init_fs();
+    init_error();
   }
 });
 
@@ -989,6 +1005,8 @@ function useAWSClient(client, force = false) {
       retryDecider: (err) => {
         if (err.$fault === "client")
           return false;
+        if (err.name === "CredentialsProviderError")
+          return false;
         if (err.message === "Could not load credentials from any providers")
           return false;
         return true;
@@ -3796,19 +3814,13 @@ async function initProject(globals) {
       } catch {
         continue;
       }
-      if (file.endsWith("js") || file.endsWith("ts")) {
-        const [metafile2, config2] = await stacks_exports.load(file);
-        return [metafile2, config2];
-      }
+      const [metafile2, config2] = await stacks_exports.load(file);
+      return [metafile2, config2];
     }
     throw new VisibleError(
       "Could not found a configuration file",
       "Make sure one of the following exists",
-      "  - sst.config.cjs",
-      "  - sst.config.mjs",
-      "  - sst.config.js",
-      "  - sst.config.ts",
-      "  - sst.json"
+      ...CONFIG_EXTENSIONS.map((x) => `  - sst${x}`)
     );
   }();
   const config = await Promise.resolve(sstConfig.config(globals));
@@ -3911,8 +3923,7 @@ var init_project = __esm({
       ".config.cts",
       ".config.cjs",
       ".config.mjs",
-      ".config.js",
-      ".json"
+      ".config.js"
     ];
   }
 });

package/stacks/build.js

@@ -3,6 +3,7 @@ import fs from "fs/promises";
 import path from "path";
 import { dynamicImport } from "../util/module.js";
 import { findAbove } from "../util/fs.js";
+import { VisibleError } from "../error.js";
 export async function load(input) {
     const parsed = path.parse(input);
     const root = await findAbove(input, "package.json");
@@ -43,6 +44,8 @@ export async function load(input) {
         await fs.rm(outfile, {
             force: true,
         });
+        if (!mod.default?.config)
+            throw new VisibleError(`The config file is improperly formatted.`, `Example:`, `export default {`, `  config() {`, `    return {`, `      name: "my-app",`, `      region: "us-east-1"`, `    }`, `  },`, `  stacks(app) {`, `  }`, `}`);
         return [result.metafile, mod.default];
     }
     catch (e) {