sst 2.1.33 → 2.1.35

package/constructs/Job.d.ts

@@ -1,4 +1,5 @@
 import { Construct } from "constructs";
+import { RetentionDays } from "aws-cdk-lib/aws-logs";
 import { SSTConstruct } from "./Construct.js";
 import { Function, NodeJSProps } from "./Function.js";
 import { Duration } from "./util/duration.js";
@@ -105,6 +106,18 @@ export interface JobProps {
      * ```
      */
     permissions?: Permissions;
+    /**
+     * The duration logs are kept in CloudWatch Logs.
+     * @default Logs retained indefinitely
+     * @example
+     * ```js
+     * new Job(stack, "MyJob", {
+     *   handler: "src/job.handler",
+     *   logRetention: "one_week"
+     * })
+     * ```
+     */
+    logRetention?: Lowercase<keyof typeof RetentionDays>;
     cdk?: {
         /**
          * Allows you to override default id for this construct.
@@ -185,6 +198,7 @@ export declare class Job extends Construct implements SSTConstruct {
      */
     addEnvironment(name: string, value: string): void;
     private createCodeBuildProject;
+    private createLogRetention;
     private buildCodeBuildProjectCode;
     private updateCodeBuildProjectCode;
     private createLocalInvoker;

package/constructs/Job.js

@@ -1,4 +1,3 @@
-// import path from "path";
 import url from "url";
 import path from "path";
 import fs from "fs/promises";
@@ -6,6 +5,7 @@ import { Construct } from "constructs";
 import { PolicyStatement, Effect } from "aws-cdk-lib/aws-iam";
 import { AssetCode } from "aws-cdk-lib/aws-lambda";
 import { Project, LinuxBuildImage, BuildSpec, ComputeType, } from "aws-cdk-lib/aws-codebuild";
+import { RetentionDays, LogRetention } from "aws-cdk-lib/aws-logs";
 import { Stack } from "./Stack.js";
 import { Function, useFunctions } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
@@ -54,6 +54,7 @@ export class Job extends Construct {
             .replace(/\./g, "-");
         const isLiveDevEnabled = app.local && (this.props.enableLiveDev === false ? false : true);
         this.job = this.createCodeBuildProject();
+        this.createLogRetention();
         if (isLiveDevEnabled) {
             this._jobInvoker = this.createLocalInvoker();
         }
@@ -127,9 +128,10 @@ export class Job extends Construct {
         this.addEnvironmentForCodeBuild(name, value);
     }
     createCodeBuildProject() {
+        const { cdk, memorySize, timeout } = this.props;
         const app = this.node.root;
         return new Project(this, "JobProject", {
-            vpc: this.props.cdk?.vpc,
+            vpc: cdk?.vpc,
             projectName: app.logicalPrefixedName(this.node.id),
             environment: {
                 // CodeBuild offers different build images. The newer ones have much quicker
@@ -139,14 +141,14 @@ export class Job extends Construct {
                 //buildImage: codebuild.LinuxBuildImage.STANDARD_6_0,
                 //buildImage: codebuild.LinuxBuildImage.STANDARD_5_0,
                 buildImage: LinuxBuildImage.fromDockerRegistry("amazon/aws-lambda-nodejs:16"),
-                computeType: this.normalizeMemorySize(this.props.memorySize || "3 GB"),
+                computeType: this.normalizeMemorySize(memorySize || "3 GB"),
             },
             environmentVariables: {
                 SST_APP: { value: app.name },
                 SST_STAGE: { value: app.stage },
                 SST_SSM_PREFIX: { value: useProject().config.ssmPrefix },
             },
-            timeout: this.normalizeTimeout(this.props.timeout || "8 hours"),
+            timeout: this.normalizeTimeout(timeout || "8 hours"),
             buildSpec: BuildSpec.fromObject({
                 version: "0.2",
                 phases: {
@@ -159,6 +161,18 @@ export class Job extends Construct {
             }),
         });
     }
+    createLogRetention() {
+        const { logRetention } = this.props;
+        if (!logRetention)
+            return;
+        new LogRetention(this, "LogRetention", {
+            logGroupName: `/aws/codebuild/${this.job.projectName}`,
+            retention: RetentionDays[logRetention.toUpperCase()],
+            logRetentionRetryOptions: {
+                maxRetries: 100,
+            },
+        });
+    }
     buildCodeBuildProjectCode() {
         const app = this.node.root;
         // Handle remove (ie. sst remove)

package/credentials.js

@@ -66,17 +66,24 @@ export function useAWSClient(client, force = false) {
         region: project.config.region,
         credentials: credentials,
         retryStrategy: new StandardRetryStrategy(async () => 10000, {
-            retryDecider: (err) => {
-                // Handle credential errors => no retry
-                if (err.name === "CredentialsProviderError")
-                    return false;
-                if (err.message === "Could not load credentials from any providers")
-                    return false;
-                // Handle no internet connection
-                if (err.code === "ENOTFOUND") {
+            retryDecider: (e) => {
+                // Handle no internet connection => retry
+                if (e.code === "ENOTFOUND") {
                     printNoInternet();
                 }
-                return true;
+                // Handle throttling errors => retry
+                if ([
+                    "ThrottlingException",
+                    "Throttling",
+                    "TooManyRequestsException",
+                    "OperationAbortedException",
+                    "TimeoutError",
+                    "NetworkingError",
+                ].includes(e.name)) {
+                    Logger.debug("Retry AWS call", e.name, e.message);
+                    return true;
+                }
+                return false;
             },
             delayDecider: (_, attempts) => {
                 return Math.min(1.5 ** attempts * 100, 5000);

package/package.json

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

package/sst.mjs

@@ -1619,15 +1619,22 @@ function useAWSClient(client, force = false) {
     region: project.config.region,
     credentials,
     retryStrategy: new StandardRetryStrategy(async () => 1e4, {
-      retryDecider: (err) => {
-        if (err.name === "CredentialsProviderError")
-          return false;
-        if (err.message === "Could not load credentials from any providers")
-          return false;
-        if (err.code === "ENOTFOUND") {
+      retryDecider: (e) => {
+        if (e.code === "ENOTFOUND") {
           printNoInternet();
         }
-        return true;
+        if ([
+          "ThrottlingException",
+          "Throttling",
+          "TooManyRequestsException",
+          "OperationAbortedException",
+          "TimeoutError",
+          "NetworkingError"
+        ].includes(e.name)) {
+          Logger.debug("Retry AWS call", e.name, e.message);
+          return true;
+        }
+        return false;
       },
       delayDecider: (_, attempts) => {
         return Math.min(1.5 ** attempts * 100, 5e3);