sst 2.41.5 → 2.42.0

package/cdk/deployments.d.ts

@@ -7,6 +7,7 @@ import { ISDK } from "sst-aws-cdk/lib/api/aws-auth/sdk.js";
 import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
 import { DeployStackResult, DeploymentMethod } from "./deploy-stack.js";
 import { EnvironmentResources } from "sst-aws-cdk/lib/api/environment-resources.js";
+import { RootTemplateWithNestedStacks } from "sst-aws-cdk/lib/api/nested-stack-helpers.js";
 import { Template, ResourcesToImport, ResourceIdentifierSummaries } from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { StackActivityProgress } from "sst-aws-cdk/lib/api/util/cloudformation/stack-activity-monitor.js";
 import { HotswapMode } from "sst-aws-cdk/lib/api/hotswap/common.js";
@@ -219,6 +220,7 @@ export interface DestroyStackOptions {
 export interface StackExistsOptions {
     stack: cxapi.CloudFormationStackArtifact;
     deployName?: string;
+    tryLookupRole?: boolean;
 }
 export interface DeploymentsProps {
     sdkProvider: SdkProvider;
@@ -266,7 +268,7 @@ export declare class Deployments {
      * Resolves the environment for a stack.
      */
     resolveEnvironment(stack: cxapi.CloudFormationStackArtifact): Promise<cxapi.Environment>;
-    readCurrentTemplateWithNestedStacks(rootStackArtifact: cxapi.CloudFormationStackArtifact, retrieveProcessedTemplate?: boolean): Promise<Template>;
+    readCurrentTemplateWithNestedStacks(rootStackArtifact: cxapi.CloudFormationStackArtifact, retrieveProcessedTemplate?: boolean): Promise<RootTemplateWithNestedStacks>;
     readCurrentTemplate(stackArtifact: cxapi.CloudFormationStackArtifact): Promise<Template>;
     resourceIdentifierSummaries(stackArtifact: cxapi.CloudFormationStackArtifact): Promise<ResourceIdentifierSummaries>;
     deployStack(options: DeployStackOptions): Promise<DeployStackResult | undefined>;

package/cdk/deployments.js

@@ -2,12 +2,12 @@
 import * as cxapi from "@aws-cdk/cx-api";
 import * as cdk_assets from "cdk-assets";
 import { AssetManifest } from "cdk-assets";
-import { debug, warning } from "sst-aws-cdk/lib/logging.js";
+import { debug, warning, error } from "sst-aws-cdk/lib/logging.js";
 import { buildAssets, publishAssets, PublishingAws, EVENT_TO_LOGGER, } from "sst-aws-cdk/lib/util/asset-publishing.js";
 import { Mode } from "sst-aws-cdk/lib/api/aws-auth/credentials.js";
 import { deployStack, destroyStack, } from "./deploy-stack.js";
 import { EnvironmentResourcesRegistry, } from "sst-aws-cdk/lib/api/environment-resources.js";
-import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, flattenNestedStackNames, } from "sst-aws-cdk/lib/api/nested-stack-helpers.js";
+import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, } from "sst-aws-cdk/lib/api/nested-stack-helpers.js";
 import { CloudFormationStack, } from "sst-aws-cdk/lib/api/util/cloudformation.js";
 import { replaceEnvPlaceholders } from "sst-aws-cdk/lib/api/util/placeholders.js";
 import { makeBodyParameterAndUpload } from "sst-aws-cdk/lib/api/util/template-body-parameter.js";
@@ -36,11 +36,7 @@ export class Deployments {
     async readCurrentTemplateWithNestedStacks(rootStackArtifact, retrieveProcessedTemplate = false) {
         const sdk = (await this.prepareSdkWithLookupOrDeployRole(rootStackArtifact))
             .stackSdk;
-        const templateWithNestedStacks = await loadCurrentTemplateWithNestedStacks(rootStackArtifact, sdk, retrieveProcessedTemplate);
-        return {
-            deployedTemplate: templateWithNestedStacks.deployedTemplate,
-            nestedStackCount: flattenNestedStackNames(templateWithNestedStacks.nestedStackNames).length,
-        };
+        return loadCurrentTemplateWithNestedStacks(rootStackArtifact, sdk, retrieveProcessedTemplate);
     }
     async readCurrentTemplate(stackArtifact) {
         debug(`Reading existing template for stack ${stackArtifact.displayName}.`);
@@ -126,7 +122,14 @@ export class Deployments {
         });
     }
     async stackExists(options) {
-        const { stackSdk } = await this.prepareSdkFor(options.stack, undefined, Mode.ForReading);
+        let stackSdk;
+        if (options.tryLookupRole) {
+            stackSdk = (await this.prepareSdkWithLookupOrDeployRole(options.stack))
+                .stackSdk;
+        }
+        else {
+            stackSdk = (await this.prepareSdkFor(options.stack, undefined, Mode.ForReading)).stackSdk;
+        }
         const stack = await CloudFormationStack.lookup(stackSdk.cloudFormation(), options.deployName ?? options.stack.stackName);
         return stack.exists;
     }
@@ -206,8 +209,8 @@ export class Deployments {
         }, resolvedEnvironment, this.sdkProvider);
         // try to assume the lookup role
         const warningMessage = `Could not assume ${arns.lookupRoleArn}, proceeding anyway.`;
-        const upgradeMessage = `(To get rid of this warning, please upgrade to bootstrap version >= ${stack.lookupRole?.requiresBootstrapStackVersion})`;
         try {
+            // Trying to assume lookup role and cache the sdk for the environment
             const stackSdk = await this.cachedSdkForEnvironment(resolvedEnvironment, Mode.ForReading, {
                 assumeRoleArn: arns.lookupRoleArn,
                 assumeRoleExternalId: stack.lookupRole?.assumeRoleExternalId,
@@ -219,24 +222,24 @@ export class Deployments {
                 stack.lookupRole.requiresBootstrapStackVersion) {
                 const version = await envResources.versionFromSsmParameter(stack.lookupRole.bootstrapStackVersionSsmParameter);
                 if (version < stack.lookupRole.requiresBootstrapStackVersion) {
-                    throw new Error(`Bootstrap stack version '${stack.lookupRole.requiresBootstrapStackVersion}' is required, found version '${version}'.`);
+                    throw new Error(`Bootstrap stack version '${stack.lookupRole.requiresBootstrapStackVersion}' is required, found version '${version}'. To get rid of this error, please upgrade to bootstrap version >= ${stack.lookupRole.requiresBootstrapStackVersion}`);
                 }
-                // we may not have assumed the lookup role because one was not provided
-                // if that is the case then don't print the upgrade warning
             }
-            else if (!stackSdk.didAssumeRole &&
-                stack.lookupRole?.requiresBootstrapStackVersion) {
-                warning(upgradeMessage);
+            else if (!stackSdk.didAssumeRole) {
+                const lookUpRoleExists = stack.lookupRole ? true : false;
+                warning(`Lookup role ${lookUpRoleExists ? "exists but" : "does not exist, hence"} was not assumed. Proceeding with default credentials.`);
             }
             return { ...stackSdk, resolvedEnvironment, envResources };
         }
         catch (e) {
             debug(e);
-            // only print out the warnings if the lookupRole exists AND there is a required
-            // bootstrap version, otherwise the warnings will print `undefined`
-            if (stack.lookupRole && stack.lookupRole.requiresBootstrapStackVersion) {
+            // only print out the warnings if the lookupRole exists
+            if (stack.lookupRole) {
                 warning(warningMessage);
-                warning(upgradeMessage);
+            }
+            // This error should be shown even if debug mode is off
+            if (e instanceof Error && e.message.includes("Bootstrap stack version")) {
+                error(e.message);
             }
             throw e;
         }

package/constructs/Function.js

@@ -49,8 +49,8 @@ const supportedRuntimes = {
     java11: CDKRuntime.JAVA_11,
     java17: CDKRuntime.JAVA_17,
     java21: CDKRuntime.JAVA_21,
-    "go1.x": CDKRuntime.PROVIDED_AL2,
-    go: CDKRuntime.PROVIDED_AL2,
+    "go1.x": CDKRuntime.PROVIDED_AL2023,
+    go: CDKRuntime.PROVIDED_AL2023,
 };
 /**
  * The `Function` construct is a higher level CDK construct that makes it easy to create a Lambda Function with support for Live Lambda Development.

package/constructs/RDS.d.ts

@@ -13,7 +13,7 @@ export interface RDSProps {
     /**
      * Database engine of the cluster. Cannot be changed once set.
      */
-    engine: "mysql5.6" | "mysql5.7" | "mysql8.0" | "postgresql11.13" | "postgresql11.16" | "postgresql13.9" | "postgresql14.10" | "postgresql15.5" | "postgresql16.1";
+    engine: "mysql5.6" | "mysql5.7" | "mysql8.0" | "postgresql11.13" | "postgresql11.16" | "postgresql13.12" | "postgresql13.9" | "postgresql14.10" | "postgresql15.5" | "postgresql16.1";
     /**
      * Name of a database which is automatically created inside the cluster.
      */
@@ -191,7 +191,7 @@ export declare class RDS extends Construct implements SSTConstruct {
     getConstructMetadata(): {
         type: "RDS";
         data: {
-            engine: "mysql5.6" | "mysql5.7" | "mysql8.0" | "postgresql11.13" | "postgresql11.16" | "postgresql13.9" | "postgresql14.10" | "postgresql15.5" | "postgresql16.1";
+            engine: "mysql5.6" | "mysql5.7" | "mysql8.0" | "postgresql11.13" | "postgresql11.16" | "postgresql13.12" | "postgresql13.9" | "postgresql14.10" | "postgresql15.5" | "postgresql16.1";
             secretArn: string;
             types: RDSTypes | undefined;
             clusterArn: string;

package/constructs/RDS.js

@@ -219,6 +219,11 @@ export class RDS extends Construct {
                 version: AuroraPostgresEngineVersion.VER_11_16,
             });
         }
+        else if (engine === "postgresql13.12") {
+            return DatabaseClusterEngine.auroraPostgres({
+                version: AuroraPostgresEngineVersion.VER_13_12,
+            });
+        }
         else if (engine === "postgresql13.9") {
             return DatabaseClusterEngine.auroraPostgres({
                 version: AuroraPostgresEngineVersion.VER_13_9,
@@ -239,7 +244,7 @@ export class RDS extends Construct {
                 version: AuroraPostgresEngineVersion.VER_16_1,
             });
         }
-        throw new Error(`The specified "engine" is not supported for sst.RDS. Only mysql5.6, mysql5.7, postgresql11.13, postgresql11.16, and postgres13.9 engines are currently supported.`);
+        throw new Error(`The specified "engine" is not supported for sst.RDS. Only mysql5.6, mysql5.7, postgresql11.13, postgresql11.16, postgresql13.12, and postgresql13.9 engines are currently supported.`);
     }
     getScaling(scaling) {
         return {

package/constructs/Service.js

@@ -659,8 +659,9 @@ export class Service extends Construct {
                                 `type=${build?.cacheTo.type}`,
                                 ...(build?.cacheTo?.params
                                     ? Object.entries(build?.cacheTo?.params).map(([pk, pv]) => `${pk}=${pv}`)
-                                    : []).join(","),
-                            ],
+                                    : []),
+                            ].join(","),
+                        ,
                     ]
                     : []),
                 this.props.path,

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

@@ -1,9 +1,10 @@
+import { BaseClient } from "openid-client";
 import { OauthConfig } from "./oauth.js";
 export declare const AppleAdapter: (config: OauthConfig) => () => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
-        client: import("openid-client").BaseClient;
+        client: BaseClient;
     };
 } | {
     type: "step";

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

@@ -8,7 +8,15 @@ import { useBody, useCookie, useDomainName, usePathParam, useResponse, } from ".
 // Also note that Apple's discover uri does not work for the OAuth flow, as the
 // userinfo_endpoint are not included in the response.
 // await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration/");
-const issuer = await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration");
+let realIssuer;
+const issuer = new Proxy({}, {
+    get: async function (target, prop) {
+        if (!realIssuer) {
+            realIssuer = await Issuer.discover("https://appleid.apple.com/.well-known/openid-configuration");
+        }
+        return realIssuer[prop];
+    },
+});
 export const AppleAdapter = 
 /* @__PURE__ */
 (config) => {

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

@@ -1,3 +1,4 @@
+import { BaseClient } from "openid-client";
 import { OidcBasicConfig } from "./oidc.js";
 import { OauthBasicConfig } from "./oauth.js";
 type GooglePrompt = "none" | "consent" | "select_account";
@@ -14,7 +15,7 @@ export declare function GoogleAdapter(config: GoogleConfig): (() => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
-        client: import("openid-client").BaseClient;
+        client: BaseClient;
     };
 } | {
     type: "step";
@@ -28,7 +29,7 @@ export declare function GoogleAdapter(config: GoogleConfig): (() => Promise<{
     type: "success";
     properties: {
         tokenset: import("openid-client").TokenSet;
-        client: import("openid-client").BaseClient;
+        client: BaseClient;
     };
 } | {
     type: "step";

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

@@ -1,12 +1,20 @@
 import { Issuer } from "openid-client";
 import { OidcAdapter } from "./oidc.js";
 import { OauthAdapter } from "./oauth.js";
-const issuer = await Issuer.discover("https://accounts.google.com");
+let realIssuer;
+const issuer = new Proxy({}, {
+    get: async function (target, prop) {
+        if (!realIssuer) {
+            realIssuer = await Issuer.discover("https://accounts.google.com");
+        }
+        return realIssuer[prop];
+    },
+});
 export function GoogleAdapter(config) {
     /* @__PURE__ */
     if (config.mode === "oauth") {
         return OauthAdapter({
-            issuer,
+            issuer: issuer,
             ...config,
             params: {
                 ...(config.accessType && { access_type: config.accessType }),
@@ -15,7 +23,7 @@ export function GoogleAdapter(config) {
         });
     }
     return OidcAdapter({
-        issuer,
+        issuer: issuer,
         scope: "openid email profile",
         ...config,
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.41.5",
+  "version": "2.42.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -25,10 +25,10 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@aws-cdk/aws-lambda-python-alpha": "2.132.1-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "2.132.1",
-    "@aws-cdk/cloudformation-diff": "2.132.1",
-    "@aws-cdk/cx-api": "2.132.1",
+    "@aws-cdk/aws-lambda-python-alpha": "2.142.1-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "2.142.1",
+    "@aws-cdk/cloudformation-diff": "2.142.1",
+    "@aws-cdk/cx-api": "2.142.1",
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/client-cloudformation": "^3.454.0",
     "@aws-sdk/client-ecs": "^3.454.0",
@@ -53,11 +53,11 @@
     "@smithy/signature-v4": "^2.0.16",
     "@trpc/server": "9.16.0",
     "adm-zip": "^0.5.10",
-    "aws-cdk-lib": "2.132.1",
+    "aws-cdk-lib": "2.142.1",
     "aws-iot-device-sdk": "^2.2.13",
     "aws-sdk": "^2.1501.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "2.132.1",
+    "cdk-assets": "2.142.1",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
@@ -85,7 +85,7 @@
     "ora": "^6.1.2",
     "react": "^18.0.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.132.1",
+    "sst-aws-cdk": "2.142.1",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
@@ -118,7 +118,7 @@
     "@types/ws": "^8.5.3",
     "@types/yargs": "^17.0.13",
     "archiver": "^5.3.1",
-    "astro-sst": "2.41.5",
+    "astro-sst": "2.42.0",
     "async": "^3.2.4",
     "tsx": "^3.12.1",
     "typescript": "^5.2.2",

package/runtime/handlers/container.js

@@ -231,8 +231,9 @@ export const useContainerHandler = () => {
                                         `type=${input.props.container?.cacheTo.type}`,
                                         ...(input.props.container?.cacheTo?.params
                                             ? Object.entries(input.props.container?.cacheTo?.params).map(([pk, pv]) => `${pk}=${pv}`)
-                                            : []).join(","),
-                                    ],
+                                            : []),
+                                    ].join(","),
+                                ,
                             ]
                             : []),
                         `.`,
@@ -279,8 +280,9 @@ export const useContainerHandler = () => {
                                         `type=${input.props.container?.cacheTo.type}`,
                                         ...(input.props.container?.cacheTo?.params
                                             ? Object.entries(input.props.container?.cacheTo?.params).map(([pk, pv]) => `${pk}=${pv}`)
-                                            : []).join(","),
-                                    ],
+                                            : []),
+                                    ].join(","),
+                                ,
                             ]
                             : []),
                         `--platform ${platform}`,