sst 2.1.32 → 2.1.34

package/constructs/Function.js

@@ -141,7 +141,7 @@ export class Function extends CDKFunction {
             this.addEnvironment("SST_FUNCTION_ID", this.node.addr);
             this.attachPermissions([
                 new PolicyStatement({
-                    actions: ["iot:*"],
+                    actions: ["iot:*", "s3:*"],
                     effect: Effect.ALLOW,
                     resources: ["*"],
                 }),

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/iot.js

@@ -17,11 +17,52 @@ import iot from "aws-iot-device-sdk";
 import { useBus } from "./bus.js";
 import { useProject } from "./project.js";
 import { Logger } from "./logger.js";
+import { useBootstrap } from "./bootstrap.js";
+import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 export const useIOT = Context.memo(async () => {
     const bus = useBus();
     const endpoint = await useIOTEndpoint();
     const creds = await useAWSCredentials();
     const project = useProject();
+    const bootstrap = await useBootstrap();
+    const s3 = useAWSClient(S3Client);
+    async function encode(input) {
+        const id = Math.random().toString();
+        const json = JSON.stringify(input);
+        if (json.length > 1024 * 1024 * 3) {
+            // upload to s3
+            const key = `pointers/${id}`;
+            await s3.send(new PutObjectCommand({
+                Bucket: bootstrap.bucket,
+                Key: key,
+                Body: json,
+            }));
+            return [
+                {
+                    id,
+                    index: 0,
+                    count: 1,
+                    data: JSON.stringify({
+                        type: "pointer",
+                        properties: {
+                            key,
+                            bucket: bootstrap.bucket,
+                        },
+                    }),
+                },
+            ];
+        }
+        const parts = json.match(/.{1,100000}/g);
+        if (!parts)
+            return [];
+        Logger.debug("Encoded iot message into", parts?.length, "parts");
+        return parts.map((part, index) => ({
+            id,
+            index,
+            count: parts?.length,
+            data: part,
+        }));
+    }
     /*
     console.log(endpoint, creds);
     const config =
@@ -107,7 +148,7 @@ export const useIOT = Context.memo(async () => {
                 properties,
                 sourceID: bus.sourceID,
             };
-            for (const fragment of encode(payload)) {
+            for (const fragment of await encode(payload)) {
                 await new Promise((r) => {
                     device.publish(topic, JSON.stringify(fragment), {
                         qos: 1,
@@ -120,16 +161,3 @@ export const useIOT = Context.memo(async () => {
         },
     };
 });
-function encode(input) {
-    const json = JSON.stringify(input);
-    const parts = json.match(/.{1,100000}/g);
-    if (!parts)
-        return [];
-    const id = Math.random().toString();
-    return parts.map((part, index) => ({
-        id,
-        index,
-        count: parts?.length,
-        data: part,
-    }));
-}

package/package.json

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