sst 2.8.9 → 2.8.11

package/constructs/Bucket.d.ts

@@ -170,16 +170,17 @@ export interface BucketProps {
      */
     cors?: boolean | BucketCorsRule[];
     /**
-     * Block public access to this bucket.
+     * Block public access to this bucket. Setting this to `true` alllows uploading objects with public ACLs.
+     * Note that setting to `true` does not necessarily mean that the bucket is completely accessible to the public. Rather, it enables the granting of public permissions through public ACLs.
      * @default false
      * @example
      * ```js
      * new Bucket(stack, "Bucket", {
-     *   blockPublicAccess: true,
+     *   blockPublicACLs: true,
      * });
      * ```
      */
-    blockPublicAccess?: boolean;
+    blockPublicACLs?: boolean;
     /**
      * The default function props to be applied to all the Lambda functions in the API. The `environment`, `permissions` and `layers` properties will be merged with per route definitions if they are defined.
      *
@@ -358,5 +359,6 @@ export declare class Bucket extends Construct implements SSTConstruct {
     private addFunctionNotification;
     private buildCorsConfig;
     private buildBlockPublicAccessConfig;
+    private buildObjectOwnershipConfig;
 }
 export {};

package/constructs/Bucket.js

@@ -4,7 +4,7 @@ import { Topic } from "./Topic.js";
 import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { toCdkDuration } from "./util/duration.js";
-import { Bucket as CDKBucket, BlockPublicAccess, EventType, HttpMethods, } from "aws-cdk-lib/aws-s3";
+import { Bucket as CDKBucket, BlockPublicAccess, EventType, HttpMethods, ObjectOwnership, } from "aws-cdk-lib/aws-s3";
 import { LambdaDestination, SnsDestination, SqsDestination, } from "aws-cdk-lib/aws-s3-notifications";
 /////////////////////
 // Construct
@@ -171,7 +171,7 @@ export class Bucket extends Construct {
         };
     }
     createBucket() {
-        const { name, cors, blockPublicAccess, cdk } = this.props;
+        const { name, cors, blockPublicACLs, cdk } = this.props;
         if (isCDKConstruct(cdk?.bucket)) {
             if (cors !== undefined) {
                 throw new Error(`Cannot configure the "cors" when "cdk.bucket" is a construct`);
@@ -182,7 +182,8 @@ export class Bucket extends Construct {
             this.cdk.bucket = new CDKBucket(this, "Bucket", {
                 bucketName: name,
                 cors: this.buildCorsConfig(cors),
-                blockPublicAccess: this.buildBlockPublicAccessConfig(blockPublicAccess),
+                blockPublicAccess: this.buildBlockPublicAccessConfig(blockPublicACLs),
+                objectOwnership: this.buildObjectOwnershipConfig(blockPublicACLs),
                 ...cdk?.bucket,
             });
         }
@@ -314,9 +315,12 @@ export class Bucket extends Construct {
             ? BlockPublicAccess.BLOCK_ALL
             : new BlockPublicAccess({
                 blockPublicAcls: false,
-                blockPublicPolicy: false,
                 ignorePublicAcls: false,
-                restrictPublicBuckets: false,
             });
     }
+    buildObjectOwnershipConfig(config) {
+        return config === true
+            ? ObjectOwnership.BUCKET_OWNER_ENFORCED
+            : ObjectOwnership.BUCKET_OWNER_PREFERRED;
+    }
 }

package/constructs/Job.js

@@ -183,14 +183,18 @@ export class Job extends Construct {
         const app = this.node.root;
         useDeferredTasks().add(async () => {
             // Build function
-            const bundle = await useRuntimeHandlers().build(this.node.addr, "deploy");
+            const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
             // create wrapper that calls the handler
-            if (bundle.type === "error")
-                throw new Error(`Failed to build job "${this.props.handler}"`);
-            const parsed = path.parse(bundle.handler);
+            if (result.type === "error") {
+                throw new Error([
+                    `Failed to build job "${this.props.handler}"`,
+                    ...result.errors,
+                ].join("\n"));
+            }
+            const parsed = path.parse(result.handler);
             const importName = parsed.ext.substring(1);
             const importPath = `./${path.join(parsed.dir, parsed.name)}.mjs`;
-            await fs.writeFile(path.join(bundle.out, "handler-wrapper.mjs"), [
+            await fs.writeFile(path.join(result.out, "handler-wrapper.mjs"), [
                 `console.log("")`,
                 `console.log("//////////////////////")`,
                 `console.log("// Start of the job //")`,
@@ -209,7 +213,7 @@ export class Job extends Construct {
                 `console.log("//////////////////////")`,
                 `console.log("")`,
             ].join("\n"));
-            const code = AssetCode.fromAsset(bundle.out);
+            const code = AssetCode.fromAsset(result.out);
             this.updateCodeBuildProjectCode(code, "handler-wrapper.mjs");
             // This should always be true b/c runtime is always Node.js
         });

package/constructs/SsrSite.js

@@ -267,6 +267,7 @@ export class SsrSite extends Construct {
                 cwd: sitePath,
                 stdio: "inherit",
                 env: {
+                    SST: "1",
                     ...process.env,
                     ...getBuildCmdEnvironment(environment),
                 },

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.8.9",
+  "version": "2.8.11",
   "bin": {
     "sst": "cli/sst.js"
   },