sst 2.23.14 → 2.24.0

package/cdk/deployments.d.ts

@@ -1,7 +1,7 @@
 import * as cxapi from "@aws-cdk/cx-api";
 import { AssetManifest, IManifestEntry } from "cdk-assets";
 import { Tag } from "sst-aws-cdk/lib/cdk-toolkit.js";
-import { BuildAssetsOptions, PublishAssetsOptions } from "./asset-publishing.js";
+import { BuildAssetsOptions, PublishAssetsOptions } from "sst-aws-cdk/lib/util/asset-publishing.js";
 import { Mode } from "sst-aws-cdk/lib/api/aws-auth/credentials.js";
 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";

package/cdk/deployments.js

@@ -3,7 +3,7 @@ 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 { buildAssets, publishAssets, PublishingAws, EVENT_TO_LOGGER, } from "./asset-publishing.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, makeBodyParameterAndUpload, } from "./deploy-stack.js";
 import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, } from "sst-aws-cdk/lib/api/nested-stack-helpers.js";

package/cli/local/server.js

@@ -20,7 +20,7 @@ export const useLocalServerConfig = Context.memo(async () => {
     });
     return {
         port,
-        url: `https://console.sst.dev/${project.config.name}/${project.config.stage}${port !== 13557 ? `?_port=${port}` : ""}`,
+        url: `https://console.sst.dev${port !== 13557 ? `?_port=${port}` : ""}`,
     };
 });
 export async function useLocalServer(opts) {

package/cli/ui/deploy.js

@@ -155,7 +155,7 @@ function getApiAccessLogPermissionsHelper(error) {
     // note: this should be handled in SST as access log group names are now
     //       hardcoded with /aws/vendedlogs/apis prefix.
     if (error.indexOf("Insufficient permissions to enable logging") > -1) {
-        return `This is a common deploy error. Check out this GitHub issue for more details - https://github.com/serverless-stack/sst/issues/125`;
+        return `This is a common deploy error. Check out this GitHub issue for more details - https://github.com/sst/sst/issues/125`;
     }
 }
 function getAppSyncMultiResolverHelper(error) {

package/constructs/App.d.ts

@@ -77,7 +77,7 @@ export declare class App extends CDKApp {
     defaultFunctionProps: (FunctionProps | ((stack: Stack) => FunctionProps))[];
     private _defaultRemovalPolicy?;
     /** @internal */
-    get defaultRemovalPolicy(): "destroy" | "retain" | "snapshot" | undefined;
+    get defaultRemovalPolicy(): "destroy" | "retain" | "snapshot" | "retain-on-update-or-delete" | undefined;
     /**
      * @internal
      */

package/constructs/Function.d.ts

@@ -268,7 +268,7 @@ export interface FunctionProps extends Omit<FunctionOptions, "functionName" | "m
      *
      * Note that, if a Layer is created in a stack (say `stackA`) and is referenced in another stack (say `stackB`), SST automatically creates an SSM parameter in `stackA` with the Layer's ARN. And in `stackB`, SST reads the ARN from the SSM parameter, and then imports the Layer.
      *
-     *  This is to get around the limitation that a Lambda Layer ARN cannot be referenced across stacks via a stack export. The Layer ARN contains a version number that is incremented everytime the Layer is modified. When you refer to a Layer's ARN across stacks, a CloudFormation export is created. However, CloudFormation does not allow an exported value to be updated. Once exported, if you try to deploy the updated layer, the CloudFormation update will fail. You can read more about this issue here - https://github.com/serverless-stack/sst/issues/549.
+     *  This is to get around the limitation that a Lambda Layer ARN cannot be referenced across stacks via a stack export. The Layer ARN contains a version number that is incremented everytime the Layer is modified. When you refer to a Layer's ARN across stacks, a CloudFormation export is created. However, CloudFormation does not allow an exported value to be updated. Once exported, if you try to deploy the updated layer, the CloudFormation update will fail. You can read more about this issue here - https://github.com/sst/sst/issues/549.
      *
      * @default no layers
      *

package/node/auth/session.js

@@ -14,7 +14,7 @@ const SessionMemo = /* @__PURE__ */ Context.memo(() => {
     if (cookie)
         token = cookie;
     // WebSocket may also set the token in the protocol header
-    // TODO: Once https://github.com/serverless-stack/sst/pull/2838 is merged,
+    // TODO: Once https://github.com/sst/sst/pull/2838 is merged,
     // then we should no longer need to check both casing for the header.
     const wsProtocol = ctxType === "ws"
         ? useHeader("sec-websocket-protocol") ||

package/node/future/auth/session.js

@@ -15,7 +15,7 @@ const SessionMemo = /* @__PURE__ */ Context.memo(() => {
     if (cookie)
         token = cookie;
     // WebSocket may also set the token in the protocol header
-    // TODO: Once https://github.com/serverless-stack/sst/pull/2838 is merged,
+    // TODO: Once https://github.com/sst/sst/pull/2838 is merged,
     // then we should no longer need to check both casing for the header.
     const wsProtocol = ctxType === "ws"
         ? useHeader("sec-websocket-protocol") ||

package/node/websocket-api/index.js

@@ -16,7 +16,7 @@ export const WebSocketApi =
 export function WebSocketApiHandler(cb) {
     return Handler("ws", async (evt, ctx) => {
         const result = await cb(evt, ctx);
-        // TODO: Once https://github.com/serverless-stack/sst/pull/2838 is merged,
+        // TODO: Once https://github.com/sst/sst/pull/2838 is merged,
         // then we should no longer need to check both casing for the header.
         const token = useHeader("Sec-WebSocket-Protocol") ||
             useHeader("sec-websocket-protocol");

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.23.14",
+  "version": "2.24.0",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -10,7 +10,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/serverless-stack/sst.git",
+    "url": "git+https://github.com/sst/sst.git",
     "directory": "packages/cli"
   },
   "exports": {
@@ -25,12 +25,12 @@
   },
   "homepage": "https://sst.dev",
   "dependencies": {
-    "@aws-cdk/aws-apigatewayv2-alpha": "^2.84.0-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.84.0-alpha.0",
-    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.84.0-alpha.0",
-    "@aws-cdk/cloud-assembly-schema": "2.84.0",
-    "@aws-cdk/cloudformation-diff": "2.84.0",
-    "@aws-cdk/cx-api": "2.84.0",
+    "@aws-cdk/aws-apigatewayv2-alpha": "^2.91.0-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-authorizers-alpha": "^2.91.0-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.91.0-alpha.0",
+    "@aws-cdk/cloud-assembly-schema": "2.91.0",
+    "@aws-cdk/cloudformation-diff": "2.91.0",
+    "@aws-cdk/cx-api": "2.91.0",
     "@aws-crypto/sha256-js": "^5.0.0",
     "@aws-sdk/client-cloudformation": "^3.279.0",
     "@aws-sdk/client-ecs": "^3.279.0",
@@ -55,17 +55,17 @@
     "@smithy/signature-v4": "^2.0.1",
     "@trpc/server": "9.16.0",
     "adm-zip": "^0.5.10",
-    "aws-cdk-lib": "2.84.0",
+    "aws-cdk-lib": "2.91.0",
     "aws-iot-device-sdk": "^2.2.12",
     "aws-sdk": "^2.1326.0",
     "builtin-modules": "3.2.0",
-    "cdk-assets": "2.84.0",
+    "cdk-assets": "2.91.0",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "ci-info": "^3.7.0",
     "colorette": "^2.0.19",
     "conf": "^10.2.0",
-    "constructs": "10.1.156",
+    "constructs": "10.2.69",
     "cross-spawn": "^7.0.3",
     "dendriform-immer-patch-optimiser": "^2.1.0",
     "dotenv": "^16.0.3",
@@ -87,7 +87,7 @@
     "ora": "^6.1.2",
     "react": "18.2.0",
     "remeda": "^1.3.0",
-    "sst-aws-cdk": "2.84.0",
+    "sst-aws-cdk": "2.91.0",
     "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
@@ -131,7 +131,7 @@
     }
   },
   "bugs": {
-    "url": "https://github.com/serverless-stack/sst/issues"
+    "url": "https://github.com/sst/sst/issues"
   },
   "main": "index.js",
   "directories": {

package/support/java-runtime/install.sh

@@ -18,8 +18,8 @@ mv build/target/dependency/aws-lambda-java-serialization-1.0.0.jar release/
 # - AWS_LAMBDA_RUNTIME_API has to be of the format "host:port", subpath is not support (ie. "host:port/path")
 # - official JAR uses NativeClient that cannot be run on user's machine
 rm -rf aws-lambda-java-libs
-git clone https://github.com/serverless-stack/aws-lambda-java-libs.git
+git clone https://github.com/sst/aws-lambda-java-libs.git
 cd aws-lambda-java-libs/aws-lambda-java-runtime-interface-client
 mvn -Dmaven.test.skip=true install
 cd ../..
-mv aws-lambda-java-libs/aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-1.1.0.jar release/
+mv aws-lambda-java-libs/aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-1.1.0.jar release/

package/cdk/asset-publishing.d.ts

@@ -1,74 +0,0 @@
-import * as cxapi from "@aws-cdk/cx-api";
-import * as AWS from "aws-sdk";
-import * as cdk_assets from "cdk-assets";
-import { SdkProvider } from "sst-aws-cdk/lib/api/aws-auth/sdk-provider.js";
-export interface PublishAssetsOptions {
-    /**
-     * Print progress at 'debug' level
-     */
-    readonly quiet?: boolean;
-    /**
-     * Whether to build assets before publishing.
-     *
-     * @default true To remain backward compatible.
-     */
-    readonly buildAssets?: boolean;
-    /**
-     * Whether to build/publish assets in parallel
-     *
-     * @default true To remain backward compatible.
-     */
-    readonly parallel?: boolean;
-}
-/**
- * Use cdk-assets to publish all assets in the given manifest.
- */
-export declare function publishAssets(manifest: cdk_assets.AssetManifest, sdk: SdkProvider, targetEnv: cxapi.Environment, options?: PublishAssetsOptions): Promise<void>;
-export interface BuildAssetsOptions {
-    /**
-     * Print progress at 'debug' level
-     */
-    readonly quiet?: boolean;
-    /**
-     * Build assets in parallel
-     *
-     * @default true
-     */
-    readonly parallel?: boolean;
-}
-/**
- * Use cdk-assets to build all assets in the given manifest.
- */
-export declare function buildAssets(manifest: cdk_assets.AssetManifest, sdk: SdkProvider, targetEnv: cxapi.Environment, options?: BuildAssetsOptions): Promise<void>;
-export declare class PublishingAws implements cdk_assets.IAws {
-    /**
-     * The base SDK to work with
-     */
-    private readonly aws;
-    /**
-     * Environment where the stack we're deploying is going
-     */
-    private readonly targetEnv;
-    private sdkCache;
-    constructor(
-    /**
-     * The base SDK to work with
-     */
-    aws: SdkProvider, 
-    /**
-     * Environment where the stack we're deploying is going
-     */
-    targetEnv: cxapi.Environment);
-    discoverPartition(): Promise<string>;
-    discoverDefaultRegion(): Promise<string>;
-    discoverCurrentAccount(): Promise<cdk_assets.Account>;
-    discoverTargetAccount(options: cdk_assets.ClientOptions): Promise<cdk_assets.Account>;
-    s3Client(options: cdk_assets.ClientOptions): Promise<AWS.S3>;
-    ecrClient(options: cdk_assets.ClientOptions): Promise<AWS.ECR>;
-    secretsManagerClient(options: cdk_assets.ClientOptions): Promise<AWS.SecretsManager>;
-    /**
-     * Get an SDK appropriate for the given client options
-     */
-    private sdk;
-}
-export declare const EVENT_TO_LOGGER: Record<cdk_assets.EventType, (x: string) => void>;

package/cdk/asset-publishing.js

@@ -1,147 +0,0 @@
-import * as cxapi from "@aws-cdk/cx-api";
-import * as cdk_assets from "cdk-assets";
-// TODO: remove after PR is merged
-import { AssetPublishing } from "../cdk-assets/publishing.js";
-import { Mode } from "sst-aws-cdk/lib/api/aws-auth/credentials.js";
-import { debug, error, print } from "sst-aws-cdk/lib/logging.js";
-/**
- * Use cdk-assets to publish all assets in the given manifest.
- */
-export async function publishAssets(manifest, sdk, targetEnv, options = {}) {
-    // This shouldn't really happen (it's a programming error), but we don't have
-    // the types here to guide us. Do an runtime validation to be super super sure.
-    if (targetEnv.account === undefined ||
-        targetEnv.account === cxapi.UNKNOWN_ACCOUNT ||
-        targetEnv.region === undefined ||
-        targetEnv.account === cxapi.UNKNOWN_REGION) {
-        throw new Error(`Asset publishing requires resolved account and region, got ${JSON.stringify(targetEnv)}`);
-    }
-    const publisher = new AssetPublishing(manifest, {
-        aws: new PublishingAws(sdk, targetEnv),
-        progressListener: new PublishingProgressListener(options.quiet ?? false),
-        throwOnError: false,
-        publishInParallel: options.parallel ?? true,
-        buildAssets: options.buildAssets ?? true,
-        publishAssets: true,
-        // TODO: remove after PR is merged
-        quiet: options.quiet,
-    });
-    await publisher.publish();
-    if (publisher.hasFailures) {
-        console.log(publisher.failures);
-        throw new Error("Failed to publish one or more assets. See the error messages above for more information.");
-    }
-}
-/**
- * Use cdk-assets to build all assets in the given manifest.
- */
-export async function buildAssets(manifest, sdk, targetEnv, options = {}) {
-    // This shouldn't really happen (it's a programming error), but we don't have
-    // the types here to guide us. Do an runtime validation to be super super sure.
-    if (targetEnv.account === undefined ||
-        targetEnv.account === cxapi.UNKNOWN_ACCOUNT ||
-        targetEnv.region === undefined ||
-        targetEnv.account === cxapi.UNKNOWN_REGION) {
-        throw new Error(`Asset building requires resolved account and region, got ${JSON.stringify(targetEnv)}`);
-    }
-    const publisher = new cdk_assets.AssetPublishing(manifest, {
-        aws: new PublishingAws(sdk, targetEnv),
-        progressListener: new PublishingProgressListener(options.quiet ?? false),
-        throwOnError: false,
-        publishInParallel: options.parallel ?? true,
-        buildAssets: true,
-        publishAssets: false,
-    });
-    await publisher.publish();
-    if (publisher.hasFailures) {
-        throw new Error("Failed to build one or more assets. See the error messages above for more information.");
-    }
-}
-export class PublishingAws {
-    aws;
-    targetEnv;
-    sdkCache = new Map();
-    constructor(
-    /**
-     * The base SDK to work with
-     */
-    aws, 
-    /**
-     * Environment where the stack we're deploying is going
-     */
-    targetEnv) {
-        this.aws = aws;
-        this.targetEnv = targetEnv;
-    }
-    async discoverPartition() {
-        return ((await this.aws.baseCredentialsPartition(this.targetEnv, Mode.ForWriting)) ?? "aws");
-    }
-    async discoverDefaultRegion() {
-        return this.targetEnv.region;
-    }
-    async discoverCurrentAccount() {
-        const account = await this.aws.defaultAccount();
-        return (account ?? {
-            accountId: "<unknown account>",
-            partition: "aws",
-        });
-    }
-    async discoverTargetAccount(options) {
-        return (await this.sdk(options)).currentAccount();
-    }
-    async s3Client(options) {
-        return (await this.sdk(options)).s3();
-    }
-    async ecrClient(options) {
-        return (await this.sdk(options)).ecr();
-    }
-    async secretsManagerClient(options) {
-        return (await this.sdk(options)).secretsManager();
-    }
-    /**
-     * Get an SDK appropriate for the given client options
-     */
-    async sdk(options) {
-        const env = {
-            ...this.targetEnv,
-            region: options.region ?? this.targetEnv.region, // Default: same region as the stack
-        };
-        const cacheKey = JSON.stringify({
-            env,
-            assumeRuleArn: options.assumeRoleArn,
-            assumeRoleExternalId: options.assumeRoleExternalId,
-            quiet: options.quiet,
-        });
-        const maybeSdk = this.sdkCache.get(cacheKey);
-        if (maybeSdk) {
-            return maybeSdk;
-        }
-        const sdk = (await this.aws.forEnvironment(env, Mode.ForWriting, {
-            assumeRoleArn: options.assumeRoleArn,
-            assumeRoleExternalId: options.assumeRoleExternalId,
-        }, options.quiet)).sdk;
-        this.sdkCache.set(cacheKey, sdk);
-        return sdk;
-    }
-}
-export const EVENT_TO_LOGGER = {
-    build: debug,
-    cached: debug,
-    check: debug,
-    debug,
-    fail: error,
-    found: debug,
-    start: print,
-    success: print,
-    upload: debug,
-};
-class PublishingProgressListener {
-    quiet;
-    constructor(quiet) {
-        this.quiet = quiet;
-    }
-    onPublishEvent(type, event) {
-        const handler = this.quiet && type !== "fail" ? debug : EVENT_TO_LOGGER[type];
-        handler(`[${event.percentComplete}%] ${type}: ${event.message}`);
-    }
-}

package/cdk-assets/private/asset-handler.d.ts

@@ -1,29 +0,0 @@
-import { DockerFactory } from "./docker.js";
-import { IAws } from "cdk-assets/lib/aws.js";
-import { EventType } from "cdk-assets/lib/progress.js";
-/**
- * Handler for asset building and publishing.
- */
-export interface IAssetHandler {
-    /**
-     * Build the asset.
-     */
-    build(): Promise<void>;
-    /**
-     * Publish the asset.
-     */
-    publish(): Promise<void>;
-    /**
-     * Return whether the asset already exists
-     */
-    isPublished(): Promise<boolean>;
-}
-export interface IHandlerHost {
-    readonly aws: IAws;
-    readonly aborted: boolean;
-    readonly dockerFactory: DockerFactory;
-    emitMessage(type: EventType, m: string): void;
-}
-export interface IHandlerOptions {
-    readonly quiet?: boolean;
-}

package/cdk-assets/private/asset-handler.js

@@ -1 +0,0 @@
-export {};

package/cdk-assets/private/docker.d.ts

@@ -1,94 +0,0 @@
-import { Logger } from "cdk-assets/lib/private/shell.js";
-interface BuildOptions {
-    readonly directory: string;
-    /**
-     * Tag the image with a given repoName:tag combination
-     */
-    readonly tag: string;
-    readonly target?: string;
-    readonly file?: string;
-    readonly buildArgs?: Record<string, string>;
-    readonly buildSecrets?: Record<string, string>;
-    readonly networkMode?: string;
-    readonly platform?: string;
-    readonly outputs?: string[];
-    readonly cacheFrom?: DockerCacheOption[];
-    readonly cacheTo?: DockerCacheOption;
-    readonly quiet?: boolean;
-}
-interface PushOptions {
-    readonly tag: string;
-    readonly quiet?: boolean;
-}
-export interface DockerCredentialsConfig {
-    readonly version: string;
-    readonly domainCredentials: Record<string, DockerDomainCredentials>;
-}
-export interface DockerDomainCredentials {
-    readonly secretsManagerSecretId?: string;
-    readonly ecrRepository?: string;
-}
-export interface DockerCacheOption {
-    readonly type: string;
-    readonly params?: {
-        [key: string]: string;
-    };
-}
-export declare class Docker {
-    private readonly logger?;
-    private configDir;
-    constructor(logger?: Logger | undefined);
-    /**
-     * Whether an image with the given tag exists
-     */
-    exists(tag: string): Promise<boolean>;
-    build(options: BuildOptions): Promise<void>;
-    /**
-     * Get credentials from ECR and run docker login
-     */
-    login(ecr: AWS.ECR): Promise<void>;
-    tag(sourceTag: string, targetTag: string): Promise<void>;
-    push(options: PushOptions): Promise<void>;
-    /**
-     * If a CDK Docker Credentials file exists, creates a new Docker config directory.
-     * Sets up `docker-credential-cdk-assets` to be the credential helper for each domain in the CDK config.
-     * All future commands (e.g., `build`, `push`) will use this config.
-     *
-     * See https://docs.docker.com/engine/reference/commandline/login/#credential-helpers for more details on cred helpers.
-     *
-     * @returns true if CDK config was found and configured, false otherwise
-     */
-    configureCdkCredentials(): boolean;
-    /**
-     * Removes any configured Docker config directory.
-     * All future commands (e.g., `build`, `push`) will use the default config.
-     *
-     * This is useful after calling `configureCdkCredentials` to reset to default credentials.
-     */
-    resetAuthPlugins(): void;
-    private execute;
-    private cacheOptionToFlag;
-}
-export interface DockerFactoryOptions {
-    readonly repoUri: string;
-    readonly ecr: AWS.ECR;
-    readonly logger: (m: string) => void;
-}
-/**
- * Helps get appropriately configured Docker instances during the container
- * image publishing process.
- */
-export declare class DockerFactory {
-    private enterLoggedInDestinationsCriticalSection;
-    private loggedInDestinations;
-    /**
-     * Gets a Docker instance for building images.
-     */
-    forBuild(options: DockerFactoryOptions): Promise<Docker>;
-    /**
-     * Gets a Docker instance for pushing images to ECR.
-     */
-    forEcrPush(options: DockerFactoryOptions): Promise<Docker>;
-    private loginOncePerDestination;
-}
-export {};