sst 2.5.2 → 2.5.4

package/bootstrap.js

@@ -146,7 +146,7 @@ export async function bootstrapSST() {
     const fn = new Function(stack, "MetadataHandler", {
         code: Code.fromAsset(path.resolve(__dirname, "support/bootstrap-metadata-function")),
         handler: "index.handler",
-        runtime: region?.startsWith("us-gov-") || region?.startsWith("cn-")
+        runtime: region?.startsWith("us-gov-")
             ? Runtime.NODEJS_16_X
             : Runtime.NODEJS_18_X,
         environment: {

package/cli/commands/dev.js

@@ -69,7 +69,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         bus.subscribe("function.build.success", async (evt) => {
             const info = useFunctions().fromID(evt.properties.functionID);
-            if (!info.enableLiveDev)
+            if (info.enableLiveDev === false)
                 return;
             Colors.line(Colors.dim(Colors.prefix, "Built", info.handler));
         });

package/cli/telemetry/post-payload.js

@@ -16,8 +16,8 @@ export function postPayload(endpoint, body) {
             req.write(JSON.stringify(body));
             req.end();
         }
-        catch {
-            resolve();
+        catch (ex) {
+            reject(ex);
         }
     });
 }

package/cli/telemetry/telemetry.js

@@ -56,7 +56,7 @@ function notify() {
 function willNotRecord() {
     return !isEnabled() || !!process.env.SST_TELEMETRY_DISABLED;
 }
-function record(name, properties) {
+async function record(name, properties) {
     if (willNotRecord()) {
         return Promise.resolve();
     }
@@ -65,16 +65,19 @@ function record(name, properties) {
         projectId,
         sessionId,
     };
-    return postPayload(TELEMETRY_API, {
-        context,
-        environment: getEnvironmentData(),
-        events: [
-            {
-                name,
-                properties,
-            },
-        ],
-    });
+    try {
+        await postPayload(TELEMETRY_API, {
+            context,
+            environment: getEnvironmentData(),
+            events: [
+                {
+                    name,
+                    properties,
+                },
+            ],
+        });
+    }
+    catch { }
 }
 function getAnonymousId() {
     const val = conf && conf.get(TELEMETRY_KEY_ID);

package/constructs/ApiGatewayV1Api.js

@@ -68,7 +68,9 @@ export class ApiGatewayV1Api extends Construct {
      * The AWS generated URL of the Api.
      */
     get url() {
-        return this.cdk.restApi.url;
+        const app = this.node.root;
+        return (this.cdk.restApi.url ??
+            `https://${this.cdk.restApi.restApiId}.execute-api.${app.region}.amazonaws.com/${app.stage}/`);
     }
     /**
      * If custom domain is enabled, this is the custom domain URL of the Api.

package/constructs/App.d.ts

@@ -130,7 +130,7 @@ export declare class App extends CDKApp {
      *
      * @example
      * ```js
-     * app.addDefaultFunctionPermissions({
+     * app.addDefaultFunctionEnv({
      *   "MY_ENV_VAR": "my-value"
      * })
      * ```

package/constructs/App.js

@@ -145,7 +145,7 @@ export class App extends CDKApp {
      *
      * @example
      * ```js
-     * app.addDefaultFunctionPermissions({
+     * app.addDefaultFunctionEnv({
      *   "MY_ENV_VAR": "my-value"
      * })
      * ```

package/constructs/Function.js

@@ -20,6 +20,7 @@ import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { Token, Size as CDKSize, Duration as CDKDuration } from "aws-cdk-lib";
 import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
+import { useBootstrap } from "../bootstrap.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const supportedRuntimes = {
     rust: CDKRuntime.PROVIDED_AL2,
@@ -159,13 +160,21 @@ export class Function extends CDKFunction {
                 ...(debugOverrideProps || {}),
             });
             this.addEnvironment("SST_FUNCTION_ID", this.node.addr);
-            this.attachPermissions([
-                new PolicyStatement({
-                    actions: ["iot:*", "s3:*"],
-                    effect: Effect.ALLOW,
-                    resources: ["*"],
-                }),
-            ]);
+            useDeferredTasks().add(async () => {
+                const bootstrap = await useBootstrap();
+                this.attachPermissions([
+                    new PolicyStatement({
+                        actions: ["iot:*"],
+                        effect: Effect.ALLOW,
+                        resources: ["*"],
+                    }),
+                    new PolicyStatement({
+                        actions: ["s3:*"],
+                        effect: Effect.ALLOW,
+                        resources: [`arn:aws:s3:::${bootstrap.bucket}`],
+                    }),
+                ]);
+            });
         }
         // Handle build
         else {

package/constructs/StaticSite.d.ts

@@ -226,7 +226,7 @@ export interface StaticSiteProps {
          */
         id?: string;
         /**
-         * Allows you to override default settings this construct uses internally to ceate the bucket
+         * Allows you to override default settings this construct uses internally to create the bucket
          *
          * @example
          * ```js

package/iot.js

@@ -52,7 +52,7 @@ export const useIOT = Context.memo(async () => {
                 },
             ];
         }
-        const parts = json.match(/.{1,100000}/g);
+        const parts = json.match(/.{1,50000}/g);
         if (!parts)
             return [];
         Logger.debug("Encoded iot message into", parts?.length, "parts");

package/node/future/auth/adapter/github.d.ts

@@ -1,5 +1,11 @@
 import { OauthBasicConfig } from "./oauth.js";
-export declare const GithubAdapter: (config: OauthBasicConfig) => () => Promise<{
+import { OidcBasicConfig } from "./oidc.js";
+type Config = ({
+    mode: "oauth";
+} & OauthBasicConfig) | ({
+    mode: "oidc";
+} & OidcBasicConfig);
+export declare const GithubAdapter: (config: Config) => () => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
@@ -14,3 +20,4 @@ export declare const GithubAdapter: (config: OauthBasicConfig) => () => Promise<
         };
     };
 }>;
+export {};

package/node/future/auth/adapter/github.js

@@ -9,7 +9,7 @@ const issuer = new Issuer({
 export const GithubAdapter = 
 /* @__PURE__ */
 (config) => {
-    if (config.clientSecret) {
+    if (config.mode === "oauth") {
         return OauthAdapter({
             issuer,
             ...config,
@@ -17,6 +17,7 @@ export const GithubAdapter =
     }
     return OidcAdapter({
         issuer,
+        scope: "openid email profile",
         ...config,
     });
 };

package/node/graphql/index.d.ts

@@ -23,6 +23,10 @@ interface GraphQLHandlerConfig<C> {
      * Override the GraphQL execute function, sometimes used by plugins
      */
     execute?: ProcessRequestOptions<any, any>["execute"];
+    /**
+     * Disable introspection for production
+     */
+    disableIntrospection?: boolean;
 }
 export declare function GraphQLHandler<C>(config: GraphQLHandlerConfig<C>): (event: APIGatewayProxyEventV2, context: Context) => Promise<{
     statusCode: any;

package/node/graphql/index.js

@@ -1,3 +1,4 @@
+import { specifiedRules, NoSchemaIntrospectionCustomRule, } from "graphql";
 import { getGraphQLParameters, processRequest,
 // @ts-expect-error
  } from "graphql-helix";
@@ -12,11 +13,15 @@ export function GraphQLHandler(config) {
             headers: useHeaders(),
         };
         const { operationName, query, variables } = getGraphQLParameters(request);
+        const validationRules = config.disableIntrospection
+            ? [...specifiedRules, NoSchemaIntrospectionCustomRule]
+            : [...specifiedRules];
         const result = await processRequest({
             operationName,
             query,
             variables,
             request,
+            validationRules,
             execute: config.execute,
             schema: config.schema,
             formatPayload: config.formatPayload,

package/package.json

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

package/project.js

@@ -82,6 +82,16 @@ export async function initProject(globals) {
             artifacts: path.join(out, "artifacts"),
         },
     };
+    // Cleanup old config files
+    (async function () {
+        const files = await fs.readdir(project.paths.root);
+        for (const file of files) {
+            if (file.startsWith(".sst.config")) {
+                await fs.unlink(path.join(project.paths.root, file));
+                Logger.debug(`Removed old config file ${file}`);
+            }
+        }
+    })();
     ProjectContext.provide(project);
     dotenv.config({
         path: path.join(project.paths.root, `.env.${project.config.stage}`),

package/runtime/handlers/go.js

@@ -67,7 +67,10 @@ export const useGoHandler = Context.memo(async () => {
                     });
                 }
                 catch (ex) {
-                    throw new VisibleError(`Failed to build ${ex}`);
+                    return {
+                        type: "error",
+                        errors: [String(ex)],
+                    };
                 }
             }
             if (input.mode === "deploy") {
@@ -85,7 +88,10 @@ export const useGoHandler = Context.memo(async () => {
                     });
                 }
                 catch (ex) {
-                    throw new VisibleError(`Failed to build ${ex}`);
+                    return {
+                        type: "error",
+                        errors: [String(ex)],
+                    };
                 }
             }
             return {

package/runtime/handlers/node.js

@@ -125,8 +125,8 @@ export const useNodeHandler = Context.memo(async () => {
                             js: [
                                 `import { createRequire as topLevelCreateRequire } from 'module';`,
                                 `const require = topLevelCreateRequire(import.meta.url);`,
-                                `import { fileURLToPath as topLevelFileUrlToPath } from "url"`,
-                                `const __dirname = topLevelFileUrlToPath(new URL(".", import.meta.url))`,
+                                `import { fileURLToPath as topLevelFileUrlToPath, URL as topLevelURL } from "url"`,
+                                `const __dirname = topLevelFileUrlToPath(new topLevelURL(".", import.meta.url))`,
                                 nodejs.banner || "",
                             ].join("\n"),
                         },

package/runtime/handlers.js

@@ -56,9 +56,14 @@ export const useRuntimeHandlers = Context.memo(() => {
                                 recursive: true,
                             });
                         if (mode === "start") {
-                            const dir = path.dirname(toPath);
-                            await fs.mkdir(dir, { recursive: true });
-                            await fs.symlink(fromPath, toPath);
+                            try {
+                                const dir = path.dirname(toPath);
+                                await fs.mkdir(dir, { recursive: true });
+                                await fs.symlink(fromPath, toPath);
+                            }
+                            catch (ex) {
+                                Logger.debug("Failed to symlink", fromPath, toPath, ex);
+                            }
                         }
                     }));
                 }

package/sst.mjs

@@ -387,6 +387,15 @@ async function initProject(globals) {
       artifacts: path4.join(out, "artifacts")
     }
   };
+  (async function() {
+    const files = await fs4.readdir(project.paths.root);
+    for (const file2 of files) {
+      if (file2.startsWith(".sst.config")) {
+        await fs4.unlink(path4.join(project.paths.root, file2));
+        Logger.debug(`Removed old config file ${file2}`);
+      }
+    }
+  })();
   ProjectContext.provide(project);
   dotenv.config({
     path: path4.join(project.paths.root, `.env.${project.config.stage}`),
@@ -488,8 +497,8 @@ function postPayload(endpoint, body) {
       );
       req.write(JSON.stringify(body));
       req.end();
-    } catch {
-      resolve();
+    } catch (ex) {
+      reject(ex);
     }
   });
 }
@@ -636,7 +645,7 @@ function notify() {
 function willNotRecord() {
   return !isEnabled() || !!process.env.SST_TELEMETRY_DISABLED;
 }
-function record(name, properties) {
+async function record(name, properties) {
   if (willNotRecord()) {
     return Promise.resolve();
   }
@@ -645,16 +654,19 @@ function record(name, properties) {
     projectId,
     sessionId
   };
-  return postPayload(TELEMETRY_API, {
-    context,
-    environment: getEnvironmentData(),
-    events: [
-      {
-        name,
-        properties
-      }
-    ]
-  });
+  try {
+    await postPayload(TELEMETRY_API, {
+      context,
+      environment: getEnvironmentData(),
+      events: [
+        {
+          name,
+          properties
+        }
+      ]
+    });
+  } catch {
+  }
 }
 function getAnonymousId() {
   const val = conf && conf.get(TELEMETRY_KEY_ID);
@@ -3571,9 +3583,13 @@ var init_handlers = __esm({
                       recursive: true
                     });
                   if (mode === "start") {
-                    const dir = path7.dirname(toPath);
-                    await fs7.mkdir(dir, { recursive: true });
-                    await fs7.symlink(fromPath, toPath);
+                    try {
+                      const dir = path7.dirname(toPath);
+                      await fs7.mkdir(dir, { recursive: true });
+                      await fs7.symlink(fromPath, toPath);
+                    } catch (ex) {
+                      Logger.debug("Failed to symlink", fromPath, toPath, ex);
+                    }
                   }
                 })
               );
@@ -4209,8 +4225,8 @@ var init_node = __esm({
                 js: [
                   `import { createRequire as topLevelCreateRequire } from 'module';`,
                   `const require = topLevelCreateRequire(import.meta.url);`,
-                  `import { fileURLToPath as topLevelFileUrlToPath } from "url"`,
-                  `const __dirname = topLevelFileUrlToPath(new URL(".", import.meta.url))`,
+                  `import { fileURLToPath as topLevelFileUrlToPath, URL as topLevelURL } from "url"`,
+                  `const __dirname = topLevelFileUrlToPath(new topLevelURL(".", import.meta.url))`,
                   nodejs.banner || ""
                 ].join("\n")
               }
@@ -4407,7 +4423,10 @@ var init_go = __esm({
                 }
               );
             } catch (ex) {
-              throw new VisibleError(`Failed to build ${ex}`);
+              return {
+                type: "error",
+                errors: [String(ex)]
+              };
             }
           }
           if (input.mode === "deploy") {
@@ -4427,7 +4446,10 @@ var init_go = __esm({
                 }
               );
             } catch (ex) {
-              throw new VisibleError(`Failed to build ${ex}`);
+              return {
+                type: "error",
+                errors: [String(ex)]
+              };
             }
           }
           return {
@@ -5211,7 +5233,7 @@ async function bootstrapSST() {
       path15.resolve(__dirname2, "support/bootstrap-metadata-function")
     ),
     handler: "index.handler",
-    runtime: region?.startsWith("us-gov-") || region?.startsWith("cn-") ? Runtime2.NODEJS_16_X : Runtime2.NODEJS_18_X,
+    runtime: region?.startsWith("us-gov-") ? Runtime2.NODEJS_16_X : Runtime2.NODEJS_18_X,
     environment: {
       BUCKET_NAME: bucket.bucketName
     },
@@ -5777,7 +5799,7 @@ var init_iot = __esm({
             }
           ];
         }
-        const parts = json.match(/.{1,100000}/g);
+        const parts = json.match(/.{1,50000}/g);
         if (!parts)
           return [];
         Logger.debug("Encoded iot message into", parts?.length, "parts");
@@ -6851,7 +6873,7 @@ var dev = (program2) => program2.command(
       });
       bus.subscribe("function.build.success", async (evt) => {
         const info = useFunctions3().fromID(evt.properties.functionID);
-        if (!info.enableLiveDev)
+        if (info.enableLiveDev === false)
           return;
         Colors2.line(Colors2.dim(Colors2.prefix, "Built", info.handler));
       });