sst 2.1.31 → 2.1.32

package/constructs/Function.js

@@ -1,11 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-types */
 // Note: disabling ban-type rule so we don't get an error referencing the class Function
 import path from "path";
-import * as cdk from "aws-cdk-lib";
-import * as iam from "aws-cdk-lib/aws-iam";
-import * as lambda from "aws-cdk-lib/aws-lambda";
-import * as logs from "aws-cdk-lib/aws-logs";
-import * as ssm from "aws-cdk-lib/aws-ssm";
 import { Stack } from "./Stack.js";
 import { Job } from "./Job.js";
 import { Secret } from "./Config.js";
@@ -20,32 +15,37 @@ import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
 import { createAppContext } from "./context.js";
 import { useWarning } from "./util/warning.js";
+import { Architecture, AssetCode, Code, Function as CDKFunction, FunctionUrlAuthType, LayerVersion, Runtime as CDKRuntime, Tracing, } from "aws-cdk-lib/aws-lambda";
+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";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const supportedRuntimes = {
-    rust: lambda.Runtime.PROVIDED_AL2,
-    nodejs: lambda.Runtime.NODEJS,
-    "nodejs4.3": lambda.Runtime.NODEJS_4_3,
-    "nodejs6.10": lambda.Runtime.NODEJS_6_10,
-    "nodejs8.10": lambda.Runtime.NODEJS_8_10,
-    "nodejs10.x": lambda.Runtime.NODEJS_10_X,
-    "nodejs12.x": lambda.Runtime.NODEJS_12_X,
-    "nodejs14.x": lambda.Runtime.NODEJS_14_X,
-    "nodejs16.x": lambda.Runtime.NODEJS_16_X,
-    "nodejs18.x": lambda.Runtime.NODEJS_18_X,
-    "python2.7": lambda.Runtime.PYTHON_2_7,
-    "python3.6": lambda.Runtime.PYTHON_3_6,
-    "python3.7": lambda.Runtime.PYTHON_3_7,
-    "python3.8": lambda.Runtime.PYTHON_3_8,
-    "python3.9": lambda.Runtime.PYTHON_3_9,
-    "dotnetcore1.0": lambda.Runtime.DOTNET_CORE_1,
-    "dotnetcore2.0": lambda.Runtime.DOTNET_CORE_2,
-    "dotnetcore2.1": lambda.Runtime.DOTNET_CORE_2_1,
-    "dotnetcore3.1": lambda.Runtime.DOTNET_CORE_3_1,
-    dotnet6: lambda.Runtime.DOTNET_6,
-    java8: lambda.Runtime.JAVA_8,
-    java11: lambda.Runtime.JAVA_11,
-    "go1.x": lambda.Runtime.PROVIDED_AL2,
-    go: lambda.Runtime.PROVIDED_AL2,
+    rust: CDKRuntime.PROVIDED_AL2,
+    nodejs: CDKRuntime.NODEJS,
+    "nodejs4.3": CDKRuntime.NODEJS_4_3,
+    "nodejs6.10": CDKRuntime.NODEJS_6_10,
+    "nodejs8.10": CDKRuntime.NODEJS_8_10,
+    "nodejs10.x": CDKRuntime.NODEJS_10_X,
+    "nodejs12.x": CDKRuntime.NODEJS_12_X,
+    "nodejs14.x": CDKRuntime.NODEJS_14_X,
+    "nodejs16.x": CDKRuntime.NODEJS_16_X,
+    "nodejs18.x": CDKRuntime.NODEJS_18_X,
+    "python2.7": CDKRuntime.PYTHON_2_7,
+    "python3.6": CDKRuntime.PYTHON_3_6,
+    "python3.7": CDKRuntime.PYTHON_3_7,
+    "python3.8": CDKRuntime.PYTHON_3_8,
+    "python3.9": CDKRuntime.PYTHON_3_9,
+    "dotnetcore1.0": CDKRuntime.DOTNET_CORE_1,
+    "dotnetcore2.0": CDKRuntime.DOTNET_CORE_2,
+    "dotnetcore2.1": CDKRuntime.DOTNET_CORE_2_1,
+    "dotnetcore3.1": CDKRuntime.DOTNET_CORE_3_1,
+    dotnet6: CDKRuntime.DOTNET_6,
+    java8: CDKRuntime.JAVA_8,
+    java11: CDKRuntime.JAVA_11,
+    "go1.x": CDKRuntime.PROVIDED_AL2,
+    go: CDKRuntime.PROVIDED_AL2,
 };
 /**
  * The `Function` construct is a higher level CDK construct that makes it easy to create a Lambda Function with support for Live Lambda Development.
@@ -60,7 +60,7 @@ const supportedRuntimes = {
  * });
  * ```
  */
-export class Function extends lambda.Function {
+export class Function extends CDKFunction {
     id;
     _isLiveDevEnabled;
     /** @internal */
@@ -87,20 +87,19 @@ export class Function extends lambda.Function {
             (typeof props.functionName === "string"
                 ? props.functionName
                 : props.functionName({ stack, functionProps: props }));
-        const handler = props.handler;
         const timeout = Function.normalizeTimeout(props.timeout);
         const architecture = (() => {
             if (props.architecture === "arm_64")
-                return lambda.Architecture.ARM_64;
+                return Architecture.ARM_64;
             if (props.architecture === "x86_64")
-                return lambda.Architecture.X86_64;
+                return Architecture.X86_64;
             return undefined;
         })();
         const memorySize = Function.normalizeMemorySize(props.memorySize);
         const diskSize = Function.normalizeDiskSize(props.diskSize);
-        const tracing = lambda.Tracing[(props.tracing || "active").toUpperCase()];
+        const tracing = Tracing[(props.tracing || "active").toUpperCase()];
         const logRetention = props.logRetention &&
-            logs.RetentionDays[props.logRetention.toUpperCase()];
+            RetentionDays[props.logRetention.toUpperCase()];
         const isLiveDevEnabled = props.enableLiveDev === false ? false : true;
         Function.validateHandlerSet(id, props);
         Function.validateVpcSettings(id, props);
@@ -119,16 +118,16 @@ export class Function extends lambda.Function {
             let debugOverrideProps;
             if (app.debugIncreaseTimeout) {
                 debugOverrideProps = {
-                    timeout: cdk.Duration.seconds(900),
+                    timeout: toCdkDuration("900 second"),
                 };
             }
             super(scope, id, {
                 ...props,
                 architecture,
-                code: lambda.Code.fromAsset(path.resolve(__dirname, "../support/bridge")),
+                code: Code.fromAsset(path.resolve(__dirname, "../support/bridge")),
                 handler: "bridge.handler",
                 functionName,
-                runtime: lambda.Runtime.NODEJS_16_X,
+                runtime: CDKRuntime.NODEJS_16_X,
                 memorySize,
                 ephemeralStorageSize: diskSize,
                 timeout,
@@ -141,9 +140,9 @@ export class Function extends lambda.Function {
             });
             this.addEnvironment("SST_FUNCTION_ID", this.node.addr);
             this.attachPermissions([
-                new iam.PolicyStatement({
+                new PolicyStatement({
                     actions: ["iot:*"],
-                    effect: iam.Effect.ALLOW,
+                    effect: Effect.ALLOW,
                     resources: ["*"],
                 }),
             ]);
@@ -155,10 +154,10 @@ export class Function extends lambda.Function {
             super(scope, id, {
                 ...props,
                 architecture,
-                code: lambda.Code.fromInline("export function placeholder() {}"),
+                code: Code.fromInline("export function placeholder() {}"),
                 handler: "index.placeholder",
                 functionName,
-                runtime: lambda.Runtime.NODEJS_16_X,
+                runtime: CDKRuntime.NODEJS_16_X,
                 memorySize,
                 ephemeralStorageSize: diskSize,
                 timeout,
@@ -173,10 +172,10 @@ export class Function extends lambda.Function {
             super(scope, id, {
                 ...props,
                 architecture,
-                code: lambda.Code.fromInline("export function placeholder() {}"),
+                code: Code.fromInline("export function placeholder() {}"),
                 handler: "index.placeholder",
                 functionName,
-                runtime: lambda.Runtime.NODEJS_16_X,
+                runtime: CDKRuntime.NODEJS_16_X,
                 memorySize,
                 ephemeralStorageSize: diskSize,
                 timeout,
@@ -194,7 +193,7 @@ export class Function extends lambda.Function {
                         ...result.errors,
                     ].join("\n"));
                 }
-                const code = lambda.AssetCode.fromAsset(result.out);
+                const code = AssetCode.fromAsset(result.out);
                 // Update function's code
                 const codeConfig = code.bind(this);
                 const cfnFunction = this.node.defaultChild;
@@ -265,9 +264,9 @@ export class Function extends lambda.Function {
             // Bind permissions
             const permissions = bindPermissions(c);
             Object.entries(permissions).forEach(([action, resources]) => this.attachPermissions([
-                new iam.PolicyStatement({
+                new PolicyStatement({
                     actions: [action],
-                    effect: iam.Effect.ALLOW,
+                    effect: Effect.ALLOW,
                     resources,
                 }),
             ]));
@@ -330,14 +329,14 @@ export class Function extends lambda.Function {
         let authType;
         let cors;
         if (url === true) {
-            authType = lambda.FunctionUrlAuthType.NONE;
+            authType = FunctionUrlAuthType.NONE;
             cors = true;
         }
         else {
             authType =
                 url.authorizer === "iam"
-                    ? lambda.FunctionUrlAuthType.AWS_IAM
-                    : lambda.FunctionUrlAuthType.NONE;
+                    ? FunctionUrlAuthType.AWS_IAM
+                    : FunctionUrlAuthType.NONE;
             cors = url.cors === undefined ? true : url.cors;
         }
         this.functionUrl = this.addFunctionUrl({
@@ -362,7 +361,7 @@ export class Function extends lambda.Function {
     static buildLayers(scope, id, props) {
         return (props.layers || []).map((layer) => {
             if (typeof layer === "string") {
-                return lambda.LayerVersion.fromLayerVersionArn(scope, `${id}${layer}`, layer);
+                return LayerVersion.fromLayerVersionArn(scope, `${id}${layer}`, layer);
             }
             return Function.handleImportedLayer(scope, layer);
         });
@@ -377,13 +376,13 @@ export class Function extends lambda.Function {
         if (typeof diskSize === "string") {
             return toCdkSize(diskSize);
         }
-        return cdk.Size.mebibytes(diskSize || 512);
+        return CDKSize.mebibytes(diskSize || 512);
     }
     static normalizeTimeout(timeout) {
         if (typeof timeout === "string") {
             return toCdkDuration(timeout);
         }
-        return cdk.Duration.seconds(timeout || 10);
+        return CDKDuration.seconds(timeout || 10);
     }
     static handleImportedLayer(scope, layer) {
         const layerStack = Stack.of(layer);
@@ -392,7 +391,7 @@ export class Function extends lambda.Function {
         // - layer is created in the current stack; OR
         // - layer is imported (ie. layerArn is a string)
         if (layerStack === currentStack ||
-            !cdk.Token.isUnresolved(layer.layerVersionArn)) {
+            !Token.isUnresolved(layer.layerVersionArn)) {
             return layer;
         }
         // layer is created from another stack
@@ -404,7 +403,7 @@ export class Function extends lambda.Function {
             const parameterName = `/layers/${layerStack.node.id}/${parameterId}`;
             const existingSsmParam = layerStack.node.tryFindChild(parameterId);
             if (!existingSsmParam) {
-                new ssm.StringParameter(layerStack, parameterId, {
+                new StringParameter(layerStack, parameterId, {
                     parameterName,
                     stringValue: layer.layerVersionArn,
                 });
@@ -416,7 +415,7 @@ export class Function extends lambda.Function {
                 return existingLayer;
             }
             else {
-                return lambda.LayerVersion.fromLayerVersionArn(scope, layerId, ssm.StringParameter.valueForStringParameter(scope, parameterName));
+                return LayerVersion.fromLayerVersionArn(scope, layerId, StringParameter.valueForStringParameter(scope, parameterName));
             }
         }
     }
@@ -439,7 +438,7 @@ export class Function extends lambda.Function {
             }
             return definition;
         }
-        else if (definition instanceof lambda.Function) {
+        else if (definition instanceof CDKFunction) {
             throw new Error(`Please use sst.Function instead of lambda.Function for the "${id}" Function.`);
         }
         else if (definition.handler !== undefined) {

package/constructs/Topic.d.ts

@@ -1,6 +1,6 @@
+import { ITopic, Subscription, TopicProps as AWSTopicProps } from "aws-cdk-lib/aws-sns";
+import { LambdaSubscriptionProps, SqsSubscriptionProps } from "aws-cdk-lib/aws-sns-subscriptions";
 import { Construct } from "constructs";
-import * as sns from "aws-cdk-lib/aws-sns";
-import * as snsSubscriptions from "aws-cdk-lib/aws-sns-subscriptions";
 import { SSTConstruct } from "./Construct.js";
 import { Function as Fn, FunctionProps, FunctionInlineDefinition, FunctionDefinition } from "./Function.js";
 import { Queue } from "./Queue.js";
@@ -36,7 +36,7 @@ export interface TopicQueueSubscriberProps {
         /**
          * This allows you to override the default settings this construct uses internally to create the subscriber.
          */
-        subscription?: snsSubscriptions.SqsSubscriptionProps;
+        subscription?: SqsSubscriptionProps;
     };
 }
 /**
@@ -64,7 +64,7 @@ export interface TopicFunctionSubscriberProps {
         /**
          * This allows you to override the default settings this construct uses internally to create the subscriber.
          */
-        subscription?: snsSubscriptions.LambdaSubscriptionProps;
+        subscription?: LambdaSubscriptionProps;
     };
 }
 export interface TopicProps {
@@ -108,7 +108,7 @@ export interface TopicProps {
         /**
          * Override the default settings this construct uses internally to create the topic.
          */
-        topic?: sns.ITopic | sns.TopicProps;
+        topic?: ITopic | AWSTopicProps;
     };
 }
 /**
@@ -133,7 +133,7 @@ export declare class Topic extends Construct implements SSTConstruct {
         /**
          * The internally created CDK `Topic` instance.
          */
-        topic: sns.ITopic;
+        topic: ITopic;
     };
     private subscribers;
     private bindingForAllSubscribers;
@@ -151,7 +151,7 @@ export declare class Topic extends Construct implements SSTConstruct {
     /**
      * Get a list of subscriptions for this topic
      */
-    get subscriptions(): sns.Subscription[];
+    get subscriptions(): Subscription[];
     /**
      * A list of the internally created function instances for the subscribers.
      */

package/constructs/Topic.js

@@ -1,6 +1,6 @@
+import { Topic as AWSTopic, } from "aws-cdk-lib/aws-sns";
+import { LambdaSubscription, SqsSubscription, } from "aws-cdk-lib/aws-sns-subscriptions";
 import { Construct } from "constructs";
-import * as sns from "aws-cdk-lib/aws-sns";
-import * as snsSubscriptions from "aws-cdk-lib/aws-sns-subscriptions";
 import { getFunctionRef, isCDKConstruct, isCDKConstructOf, } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { Queue } from "./Queue.js";
@@ -215,7 +215,7 @@ export class Topic extends Construct {
         }
         else {
             const snsTopicProps = (cdk?.topic || {});
-            this.cdk.topic = new sns.Topic(this, "Topic", {
+            this.cdk.topic = new AWSTopic(this, "Topic", {
                 topicName: app.logicalPrefixedName(this.node.id),
                 ...snsTopicProps,
             });
@@ -232,7 +232,7 @@ export class Topic extends Construct {
             this.addFunctionSubscriber(scope, subscriberName, subscriber);
         }
     }
-    addQueueSubscriber(scope, subscriberName, subscriber) {
+    addQueueSubscriber(_scope, subscriberName, subscriber) {
         // Parse subscriber props
         let subscriptionProps;
         let queue;
@@ -247,7 +247,7 @@ export class Topic extends Construct {
         }
         this.subscribers[subscriberName] = queue;
         // Create Subscription
-        this.cdk.topic.addSubscription(new snsSubscriptions.SqsSubscription(queue.cdk.queue, subscriptionProps));
+        this.cdk.topic.addSubscription(new SqsSubscription(queue.cdk.queue, subscriptionProps));
     }
     addFunctionSubscriber(scope, subscriberName, subscriber) {
         // Parse subscriber props
@@ -265,7 +265,7 @@ export class Topic extends Construct {
         const fn = Fn.fromDefinition(scope, `Subscriber_${this.node.id}_${subscriberName}`, functionDefinition, this.props.defaults?.function, `The "defaults.function" cannot be applied if an instance of a Function construct is passed in. Make sure to define all the subscribers using FunctionProps, so the Topic construct can apply the "defaults.function" to them.`);
         this.subscribers[subscriberName] = fn;
         // Create Subscription
-        this.cdk.topic.addSubscription(new snsSubscriptions.LambdaSubscription(fn, subscriptionProps));
+        this.cdk.topic.addSubscription(new LambdaSubscription(fn, subscriptionProps));
         // Attach existing permissions
         this.permissionsAttachedForAllSubscribers.forEach((permissions) => fn.attachPermissions(permissions));
         fn.bind(this.bindingForAllSubscribers);

package/credentials.js

@@ -67,8 +67,7 @@ export function useAWSClient(client, force = false) {
         credentials: credentials,
         retryStrategy: new StandardRetryStrategy(async () => 10000, {
             retryDecider: (err) => {
-                if (err.$fault === "client")
-                    return false;
+                // Handle credential errors => no retry
                 if (err.name === "CredentialsProviderError")
                     return false;
                 if (err.message === "Could not load credentials from any providers")

package/node/future/auth/handler.js

@@ -5,6 +5,7 @@ export function AuthHandler(input) {
     return ApiHandler(async (evt) => {
         const step = usePathParam("step");
         if (!step) {
+            const clients = await input.clients();
             return {
                 statusCode: 200,
                 headers: {
@@ -13,9 +14,17 @@ export function AuthHandler(input) {
                 body: `
           <html>
             <body>
+            <table>
+              <tr>${Object.keys(clients).map((client) => `<td>${client}</td>`)}</tr>
             ${Object.keys(input.providers).map((name) => {
-                    return `<a href="/authorize?provider=${name}&response_type=code&client_id=local&redirect_uri=http://localhost:300">${name}</a>`;
+                    return `<tr>
+                ${Object.keys(clients).map((client_id) => {
+                        const redirect_uri = clients[client_id];
+                        return `<td><a href="/authorize?provider=${name}&response_type=token&client_id=${client_id}&redirect_uri=${redirect_uri}">${name} - ${client_id}</a></td>`;
+                    })}
+              </tr>`;
                 })}
+            </table>
             </body>
           </html>
         `,

package/package.json

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

package/sst.mjs

@@ -1620,8 +1620,6 @@ function useAWSClient(client, force = false) {
     credentials,
     retryStrategy: new StandardRetryStrategy(async () => 1e4, {
       retryDecider: (err) => {
-        if (err.$fault === "client")
-          return false;
         if (err.name === "CredentialsProviderError")
           return false;
         if (err.message === "Could not load credentials from any providers")