sst 2.22.8 → 2.22.10

package/constructs/EdgeFunction.d.ts

@@ -1,6 +1,6 @@
 import { Construct, IConstruct } from "constructs";
 import { Role } from "aws-cdk-lib/aws-iam";
-import { IVersion } from "aws-cdk-lib/aws-lambda";
+import { IVersion, IFunction as CdkIFunction } from "aws-cdk-lib/aws-lambda";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps } from "./Function.js";
 import { Size } from "./util/size.js";
@@ -21,7 +21,8 @@ export interface EdgeFunctionProps {
 export declare class EdgeFunction extends Construct {
     role: Role;
     functionArn: string;
-    private function;
+    function: CdkIFunction;
+    private functionCR;
     private assetReplacer;
     private assetReplacerPolicy;
     private scope;

package/constructs/EdgeFunction.js

@@ -24,6 +24,7 @@ export class EdgeFunction extends Construct {
     role;
     functionArn;
     function;
+    functionCR;
     assetReplacer;
     assetReplacerPolicy;
     scope;
@@ -57,7 +58,11 @@ export class EdgeFunction extends Construct {
         const { fn, fnArn } = this.createFunctionInUsEast1(assetBucket, assetKey, lambdaBucket);
         const { versionId } = this.createVersionInUsEast1(fn, fnArn);
         fn.node.addDependency(assetReplacer);
-        this.function = fn;
+        this.function = CdkFunction.fromFunctionAttributes(this.scope, "ICdkFunction", {
+            functionArn: fnArn,
+            role: this.role,
+        });
+        this.functionCR = fn;
         this.functionArn = fnArn;
         this.versionId = versionId;
         this.assetReplacer = assetReplacer;
@@ -343,7 +348,7 @@ export class EdgeFunction extends Construct {
         return { fn, fnArn: fn.getAttString("FunctionArn") };
     }
     updateFunctionInUsEast1(assetBucket, assetKey) {
-        const cfnLambda = this.function.node.defaultChild;
+        const cfnLambda = this.functionCR.node.defaultChild;
         cfnLambda.addPropertyOverride("FunctionParams.Code", {
             S3Bucket: assetBucket,
             S3Key: assetKey,

package/constructs/SsrSite.d.ts

@@ -273,7 +273,6 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
     protected doNotDeploy: boolean;
     protected buildConfig: SsrBuildConfig;
     protected deferredTaskCallbacks: (() => void)[];
-    private serverLambdaCdkFunctionForEdge?;
     protected serverLambdaForEdge?: EdgeFunction;
     protected serverLambdaForRegional?: SsrFunction;
     private serverLambdaForDev?;
@@ -297,7 +296,7 @@ export declare abstract class SsrSite extends Construct implements SSTConstruct
      * The internally created CDK resources.
      */
     get cdk(): {
-        function: ICdkFunction | SsrFunction | undefined;
+        function: ICdkFunction | undefined;
         bucket: Bucket;
         distribution: Distribution;
         hostedZone: IHostedZone | undefined;

package/constructs/SsrSite.js

@@ -48,7 +48,6 @@ export class SsrSite extends Construct {
     doNotDeploy;
     buildConfig;
     deferredTaskCallbacks = [];
-    serverLambdaCdkFunctionForEdge;
     serverLambdaForEdge;
     serverLambdaForRegional;
     serverLambdaForDev;
@@ -89,10 +88,6 @@ export class SsrSite extends Construct {
         // Create Server functions
         if (this.props.edge) {
             this.serverLambdaForEdge = this.createFunctionForEdge();
-            this.serverLambdaCdkFunctionForEdge = CdkFunction.fromFunctionAttributes(this, "IEdgeFunction", {
-                functionArn: this.serverLambdaForEdge.functionArn,
-                role: this.serverLambdaForEdge.role,
-            });
         }
         else {
             this.serverLambdaForRegional = this.createFunctionForRegional();
@@ -168,7 +163,8 @@ export class SsrSite extends Construct {
         if (this.doNotDeploy)
             return;
         return {
-            function: this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional,
+            function: this.serverLambdaForEdge?.function ||
+                this.serverLambdaForRegional?.function,
             bucket: this.bucket,
             distribution: this.distribution,
             hostedZone: this.hostedZone,
@@ -188,7 +184,7 @@ export class SsrSite extends Construct {
      * ```
      */
     attachPermissions(permissions) {
-        const server = this.serverLambdaCdkFunctionForEdge ||
+        const server = this.serverLambdaForEdge ||
             this.serverLambdaForRegional ||
             this.serverLambdaForDev;
         attachPermissionsToRole(server?.role, permissions);
@@ -206,7 +202,7 @@ export class SsrSite extends Construct {
                 edge: this.props.edge,
                 server: (this.serverLambdaForDev ||
                     this.serverLambdaForRegional ||
-                    this.serverLambdaCdkFunctionForEdge)?.functionArn,
+                    this.serverLambdaForEdge)?.functionArn,
                 secrets: (this.props.bind || [])
                     .filter((c) => c instanceof Secret)
                     .map((c) => c.name),
@@ -480,12 +476,12 @@ export class SsrSite extends Construct {
         return ssrFn;
     }
     grantServerS3Permissions() {
-        const server = this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional;
+        const server = this.serverLambdaForEdge || this.serverLambdaForRegional;
         this.bucket.grantReadWrite(server.role);
     }
     grantServerCloudFrontPermissions() {
         const stack = Stack.of(this);
-        const server = this.serverLambdaCdkFunctionForEdge || this.serverLambdaForRegional;
+        const server = this.serverLambdaForEdge || this.serverLambdaForRegional;
         const policy = new Policy(this, "ServerFunctionInvalidatorPolicy", {
             statements: [
                 new PolicyStatement({

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.22.8",
+  "version": "2.22.10",
   "bin": {
     "sst": "cli/sst.js"
   },

package/project.js

@@ -47,10 +47,17 @@ export async function initProject(globals) {
         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 = globals.stage ||
+    const stage = process.env.SST_STAGE ||
+        globals.stage ||
         config.stage ||
         (await usePersonalStage(out)) ||
         (await promptPersonalStage(out));
+    // Set stage to SST_STAGE so that if SST spawned processes are aware
+    // of the stage. ie.
+    // `sst deploy --stage prod`: `prod` stage passed in via CLI
+    // -> spawns `open-next build`
+    // -> spawns `sst bind`: `prod` stage read from SST_STAGE
+    process.env.SST_STAGE = stage;
     const [version, cdkVersion, constructsVersion] = await (async () => {
         try {
             const packageJson = JSON.parse(await fs

package/sst.mjs

@@ -381,7 +381,8 @@ async function initProject(globals) {
     );
   }();
   const config = await Promise.resolve(sstConfig.config(globals));
-  const stage = globals.stage || config.stage || await usePersonalStage(out) || await promptPersonalStage(out);
+  const stage = process.env.SST_STAGE || globals.stage || config.stage || await usePersonalStage(out) || await promptPersonalStage(out);
+  process.env.SST_STAGE = stage;
   const [version2, cdkVersion, constructsVersion] = await (async () => {
     try {
       const packageJson = JSON.parse(