@kensio/yulin 1.21.30 → 1.21.32

package/dist/service/s3/serve/api/sim-s3-api-input.js

@@ -61,6 +61,16 @@ export function listObjectsInput(request) {
 export function optional(name, value) {
     return value === null ? {} : { [name]: value };
 }
+/**
+ * The date form of the same, dropping a value that is not a date.
+ */
+export function optionalDate(name, value) {
+    if (value === null) {
+        return {};
+    }
+    const parsed = new Date(value);
+    return Number.isNaN(parsed.getTime()) ? {} : { [name]: parsed };
+}
 /**
  * The numeric form of the same, dropping a value that is not a number.
  */

package/dist/service/s3/serve/api/sim-s3-api-multipart-input.js

@@ -1,4 +1,5 @@
 import { optional, optionalNumber } from "./sim-s3-api-input.js";
+import { writePreconditionInput } from "./sim-s3-api-object-input.js";
 import { readSimS3CompletedUpload } from "./sim-s3-api-xml-read.js";
 /**
  * Reading the multipart upload operations' inputs out of a request.
@@ -33,6 +34,7 @@ export function uploadPartInput(request) {
 export function completeMultipartUploadInput(request) {
     return {
         ...uploadInput(request),
+        ...writePreconditionInput(request),
         MultipartUpload: readSimS3CompletedUpload(request.body),
     };
 }

package/dist/service/s3/serve/api/sim-s3-api-object-input.d.ts

@@ -35,6 +35,12 @@ export declare function getObjectInput(request: SimS3ApiRequest): object;
  * them.
  */
 export declare function putObjectInput(request: SimS3ApiRequest): object;
+/**
+ * The conditions a write places on the Object already under its key, which
+ * PutObject, CopyObject and CompleteMultipartUpload all read from the same two
+ * headers.
+ */
+export declare function writePreconditionInput(request: SimS3ApiRequest): object;
 /**
  * The input of a copy, which names its source in a header and carries no bytes
  * of its own.

package/dist/service/s3/serve/api/sim-s3-api-object-input.js

@@ -1,5 +1,5 @@
 import { simS3WriteMetadataHeaders } from "../../object/s3-write-metadata.js";
-import { optional, utf8 } from "./sim-s3-api-input.js";
+import { optional, optionalDate, utf8 } from "./sim-s3-api-input.js";
 import { readSimS3Tagging } from "./sim-s3-api-tagging-read.js";
 /**
  * Reading the Object operations' inputs out of a request.
@@ -54,7 +54,22 @@ export function getObjectInput(request) {
  * them.
  */
 export function putObjectInput(request) {
-    return { ...createMultipartUploadInput(request), Body: request.body };
+    return {
+        ...createMultipartUploadInput(request),
+        ...writePreconditionInput(request),
+        Body: request.body,
+    };
+}
+/**
+ * The conditions a write places on the Object already under its key, which
+ * PutObject, CopyObject and CompleteMultipartUpload all read from the same two
+ * headers.
+ */
+export function writePreconditionInput(request) {
+    return {
+        ...optional("IfMatch", request.headers.get("if-match")),
+        ...optional("IfNoneMatch", request.headers.get("if-none-match")),
+    };
 }
 /**
  * The input of a copy, which names its source in a header and carries no bytes
@@ -67,11 +82,28 @@ export function putObjectInput(request) {
 export function copyObjectInput(request) {
     return {
         ...createMultipartUploadInput(request),
+        ...writePreconditionInput(request),
+        ...copySourcePreconditionInput(request),
         ...optional("CopySource", request.headers.get(simS3CopySourceHeader)),
         ...optional("MetadataDirective", request.headers.get("x-amz-metadata-directive")),
         ...optional("TaggingDirective", request.headers.get("x-amz-tagging-directive")),
     };
 }
+/**
+ * The conditions a copy places on its source Object.
+ *
+ * The two date headers are HTTP dates, which the SDK hands the operation as
+ * `Date` values.
+ */
+function copySourcePreconditionInput(request) {
+    const header = (name) => request.headers.get(`x-amz-copy-source-if-${name}`);
+    return {
+        ...optional("CopySourceIfMatch", header("match")),
+        ...optional("CopySourceIfNoneMatch", header("none-match")),
+        ...optionalDate("CopySourceIfModifiedSince", header("modified-since")),
+        ...optionalDate("CopySourceIfUnmodifiedSince", header("unmodified-since")),
+    };
+}
 /**
  * The input of a request that describes an Object without carrying its bytes,
  * which is what starting a multipart upload is.

package/dist/service/s3/storage/filesystem/s3-filesystem-object-keys.js

@@ -60,14 +60,15 @@ export class FilesystemS3ObjectKeys {
                 nestedKeyPromises.push(this.listInDirectory(entryPath));
                 continue;
             }
-            if (entry.isFile()) {
-                const key = path
-                    .relative(this.directoryPath, entryPath)
-                    .split(path.sep)
-                    .join("/");
-                if (this.safety.isAllowedObjectKeyExtension(key)) {
-                    keys.push(key);
-                }
+            if (!entry.isFile()) {
+                continue;
+            }
+            const key = path
+                .relative(this.directoryPath, entryPath)
+                .split(path.sep)
+                .join("/");
+            if (this.safety.isAllowedObjectKeyExtension(key)) {
+                keys.push(key);
             }
         }
         const nestedKeys = await Promise.all(nestedKeyPromises);

package/dist/service/secretsmanager/cfn/secret/sim-cfn-secrets-manager-secret-template.test-support.js

@@ -18,29 +18,21 @@ export function secretTemplate(properties = {}) {
 }
 function secretProperties(properties) {
     const { name, description, kmsKeyId, tags, secretString } = properties;
-    const declared = {};
-    if (name !== undefined) {
-        declared["Name"] = name;
-    }
-    if (description !== undefined) {
-        declared["Description"] = description;
-    }
-    if (kmsKeyId !== undefined) {
-        declared["KmsKeyId"] = kmsKeyId;
-    }
-    if (tags !== undefined) {
-        declared["Tags"] = [...tags];
-    }
-    if (secretString === undefined) {
-        declared["GenerateSecretString"] = {
-            SecretStringTemplate: "{}",
-            GenerateStringKey: "current",
-            PasswordLength: properties.passwordLength ?? 64,
-        };
-    }
-    else {
-        declared["SecretString"] = secretString;
-    }
+    const declared = {
+        ...(name !== undefined && { Name: name }),
+        ...(description !== undefined && { Description: description }),
+        ...(kmsKeyId !== undefined && { KmsKeyId: kmsKeyId }),
+        ...(tags !== undefined && { Tags: [...tags] }),
+        ...(secretString === undefined
+            ? {
+                GenerateSecretString: {
+                    SecretStringTemplate: "{}",
+                    GenerateStringKey: "current",
+                    PasswordLength: properties.passwordLength ?? 64,
+                },
+            }
+            : { SecretString: secretString }),
+    };
     return declared;
 }
 function readerResource() {

package/dist/service/sqs/message/sim-sqs-message.js

@@ -126,10 +126,10 @@ export class SimSqsMessage {
                 "ApproximateFirstReceiveTimestamp",
                 String(this.visibility.firstReceived.getTime()),
             ],
+            ...(this.deadLetterSourceArn === undefined
+                ? []
+                : [["DeadLetterQueueSourceArn", this.deadLetterSourceArn]]),
         ]);
-        if (this.deadLetterSourceArn !== undefined) {
-            values.set("DeadLetterQueueSourceArn", this.deadLetterSourceArn);
-        }
         return values;
     }
 }

package/dist/service/stepfunctions/machine/sim-state-machine.js

@@ -56,9 +56,10 @@ export class SimStateMachine {
      */
     update(changes) {
         this.#roleArn = changes.roleArn ?? this.#roleArn;
-        if (changes.definition !== undefined && changes.parsed !== undefined) {
-            this.#definition = changes.definition;
-            this.#parsed = changes.parsed;
+        if (changes.definition === undefined || changes.parsed === undefined) {
+            return;
         }
+        this.#definition = changes.definition;
+        this.#parsed = changes.parsed;
     }
 }

package/dist/util/schedule/cron/sim-cron-field-bounds.js

@@ -58,5 +58,5 @@ export function boundsOf(spec, written, stepped) {
         ];
     }
     const only = valueOf(spec, written);
-    return stepped ? [only, spec.maximum] : [only, only];
+    return [only, stepped ? spec.maximum : only];
 }

package/docs/services/s3/README.md

@@ -531,6 +531,74 @@ reports it there.
 An Object uploaded in parts gets a different form. See
 [Uploading an Object in parts](#uploading-an-object-in-parts).
 
+## Conditional writes
+
+`PutObject`, `CopyObject` and `CompleteMultipartUpload` take `IfNoneMatch` and `IfMatch`, which
+state what the key has to hold before the write goes ahead. `IfNoneMatch: "*"` writes only to a key
+that holds nothing. `IfMatch` writes only over an Object with that ETag. A write whose condition
+fails is refused with `PreconditionFailed` (status `412`), and the Object already under the key is
+left as it was.
+
+```typescript sim-s3-conditional-write
+/**
+ * Writing a simulated S3 Object only where the key is free.
+ */
+
+import {
+  CopyObjectCommand,
+  CreateBucketCommand,
+  PutObjectCommand,
+} from "@aws-sdk/client-s3";
+import { SimAws } from "@kensio/yulin";
+
+const simAws = new SimAws();
+const simS3 = simAws.s3();
+
+await simS3.createBucket(new CreateBucketCommand({ Bucket: "audio-bucket" }));
+
+await simS3.putObject(
+  new PutObjectCommand({
+    Bucket: "audio-bucket",
+    Key: "uploads/take-1.mp3",
+    Body: "first take",
+  }),
+);
+
+for (let attempt = 0; attempt < 2; attempt++) {
+  try {
+    await simS3.copyObject(
+      new CopyObjectCommand({
+        Bucket: "audio-bucket",
+        Key: "shared/take.mp3",
+        CopySource: "audio-bucket/uploads/take-1.mp3",
+        IfNoneMatch: "*",
+      }),
+    );
+    console.log("copied");
+  } catch (error) {
+    // The second attempt finds the shared key taken.
+    if (error instanceof Error && error.name === "PreconditionFailed") {
+      console.log("already there");
+    } else {
+      throw error;
+    }
+  }
+}
+```
+
+Writes to one key run one at a time. Of several conditional writes racing for an empty key, the first
+to finish succeeds and the rest are refused. `IfMatch` on a key holding nothing answers `NoSuchKey`. On a versioned Bucket both conditions look at
+the current version, and a delete marker counts as nothing. `IfNoneMatch` on a write accepts only
+`*`, and real S3 refuses anything else with `NotImplemented`.
+
+A copy also takes conditions on its source. `CopySourceIfMatch`, `CopySourceIfNoneMatch`,
+`CopySourceIfModifiedSince` and `CopySourceIfUnmodifiedSince` refuse the copy with
+`PreconditionFailed` when the source does not meet them. An ETag condition outranks the date
+condition paired with it, as RFC 7232 has it. The served endpoint reads all of these from the same
+headers real S3 does.
+
+A failed completion leaves the upload in place, and it can be completed again.
+
 ## Uploading an Object in parts
 
 Yulin supports multipart upload through the SDK and served S3 endpoint. This covers the operations
@@ -834,9 +902,6 @@ See [Serve simulated S3 on localhost](#serve-simulated-s3-on-localhost) for sett
 - Both Buckets have to belong to the same simulated S3. A copy across Accounts or Regions is left
   out.
 - A presigned copy is left out, and so is a copy reaching a Bucket through simulated CloudFront.
-- `CopySourceIfMatch`, `CopySourceIfNoneMatch`, `CopySourceIfModifiedSince` and
-  `CopySourceIfUnmodifiedSince` are ignored. A conditional copy happens whatever the condition
-  says.
 - `ACL` is ignored. Sim S3 models no Object ACL.
 - A `versionId` in `CopySource` is refused with `NotImplemented`.
 - A copy of an Object that was uploaded in parts gets a plain ETag rather than the multipart form.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kensio/yulin",
-  "version": "1.21.30",
+  "version": "1.21.32",
   "description": "AWS system behaviour simulation for isolated unit testing",
   "repository": "https://github.com/KensioSoftware/yulin",
   "homepage": "https://yulinsim.dev/",
@@ -293,7 +293,7 @@
     "eslint-plugin-jsdoc": "^64.0.1",
     "eslint-plugin-no-secrets": "^2.3.3",
     "eslint-plugin-security": "^4.0.1",
-    "eslint-plugin-unicorn": "^74.0.0",
+    "eslint-plugin-unicorn": "^75.0.0",
     "execa": "^10.0.0",
     "fta-cli": "^3.0.0",
     "hyparquet": "^1.29.2",