@reventlessdev/reventless-aws 3.0.0-alpha.400 → 3.0.0-alpha.402

package/src/adapter/Upload/Upload_Presign_S3_Ops.res

@@ -11,7 +11,7 @@
 // surface — the earlier `decodeJwtSub` path is gone.
 //
 // Two operations dispatch on the `operation` field the resolver bakes in:
-//   presign → derive `{servedPrefix}/{sub}/{uuid}/{fileName}`, presign a PUT to the
+//   presign → derive `{servedPrefix}/{sub}/{uuid}.{ext}`, presign a PUT to the
 //             store's bucket (expires 300s), return `{uploadUrl, storageRef}`.
 //   release → apply the release rule (scope + age) to a `storageRef` and, if it
 //             passes, `DeleteObject`; return `{released, reason}`.
@@ -211,6 +211,10 @@ let headLastModifiedMs = async (~client: s3Client, ~bucket: string, ~key: string
 
 // ── Operations ──────────────────────────────────────────────────────────────
 
+// The object key a presign mints, pure so a test can pin its shape.
+let presignKey = (~servedPrefix, ~sub, ~uuid, ~contentType) =>
+  `${servedPrefix}/${sub}/${Reventless.StorageRef.objectName(~uuid, ~contentType)}`
+
 let handlePresign = async (
   ~client: s3Client,
   ~bucket: string,
@@ -221,11 +225,17 @@ let handlePresign = async (
   if sub == "" {
     JsError.throwWithMessage("unauthenticated")
   }
-  let fileName = args.fileName->Option.getOr("upload")
   // The object key doubles as the served path segment: rooted at the store's
   // served prefix so the CloudFront `{prefix}/*` behavior fronts it, and namespaced
   // by the verified `sub` so the release rule can tell one caller's objects apart.
-  let key = `${servedPrefix}/${sub}/${NodeCrypto.randomUUID()}/${fileName}`
+  // The `fileName` argument is not used: the key ends in an opaque name, because a
+  // ref is stored in an event and a file name is often personal data.
+  let key = presignKey(
+    ~servedPrefix,
+    ~sub,
+    ~uuid=NodeCrypto.randomUUID(),
+    ~contentType=args.contentType,
+  )
   // The object is provisional from the moment the bytes land: it carries the
   // pending tag until a committed event referencing it strips it (see
   // `Upload_Claim_S3_Ops`). Written into the signature here, not asked of the

package/src/adapter/Upload/Upload_Presign_S3_Ops.res.mjs

@@ -9,6 +9,7 @@ import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as ClientS3 from "@aws-sdk/client-s3";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
+import * as StorageRef$Reventless from "@reventlessdev/reventless-spec/src/semantic/StorageRef.res.mjs";
 import * as S3RequestPresigner from "@aws-sdk/s3-request-presigner";
 import * as Upload_PendingTag$ReventlessAws from "./Upload_PendingTag.res.mjs";
 
@@ -167,12 +168,15 @@ async function headLastModifiedMs(client, bucket, key) {
   }
 }
 
+function presignKey(servedPrefix, sub, uuid, contentType) {
+  return servedPrefix + `/` + sub + `/` + StorageRef$Reventless.objectName(uuid, contentType);
+}
+
 async function handlePresign(client, bucket, servedPrefix, sub, args) {
   if (sub === "") {
     Stdlib_JsError.throwWithMessage("unauthenticated");
   }
-  let fileName = Stdlib_Option.getOr(args.fileName, "upload");
-  let key = servedPrefix + `/` + sub + `/` + Nodecrypto.randomUUID() + `/` + fileName;
+  let key = presignKey(servedPrefix, sub, Nodecrypto.randomUUID(), args.contentType);
   let command = new ClientS3.PutObjectCommand({
     Bucket: bucket,
     Key: key,
@@ -235,6 +239,7 @@ export {
   releaseResult,
   keyOfRef,
   headLastModifiedMs,
+  presignKey,
   handlePresign,
   handleRelease,
   handler,

package/src/plugin/cloner/ClonerRunner_Fargate.res

@@ -114,7 +114,7 @@ export const handler = async (event) => {
     ["REVENTLESS_CORE_STACK", process.env.STACK_ORG + "/" + process.env.STACK_PROJECT + "/" + process.env.STACK_STACK],
     ["RESTORE_DATE_TIME", event.restoreDateTime],
   ]);
-  console.log("clone: requested by user " + event.meta.user + " from ip " + event.meta.ip);
+  console.log("clone: requested by user " + event.meta.user);
   await client.send(new RunTaskCommand({
     taskDefinition: process.env.TASK_DEFINITION_ARN,
     cluster: process.env.CLUSTER_ARN,
@@ -358,7 +358,6 @@ export function request(ctx) {
     payload: {
       restoreDateTime: ctx.args.restoreDateTime,
       meta: {
-        ip: ctx.identity.sourceIp,
         user: ctx.identity.username
       }
     }

package/src/plugin/cloner/ClonerRunner_Fargate.res.mjs

@@ -67,7 +67,7 @@ export const handler = async (event) => {
     ["REVENTLESS_CORE_STACK", process.env.STACK_ORG + "/" + process.env.STACK_PROJECT + "/" + process.env.STACK_STACK],
     ["RESTORE_DATE_TIME", event.restoreDateTime],
   ]);
-  console.log("clone: requested by user " + event.meta.user + " from ip " + event.meta.ip);
+  console.log("clone: requested by user " + event.meta.user);
   await client.send(new RunTaskCommand({
     taskDefinition: process.env.TASK_DEFINITION_ARN,
     cluster: process.env.CLUSTER_ARN,
@@ -235,7 +235,6 @@ export function request(ctx) {
     payload: {
       restoreDateTime: ctx.args.restoreDateTime,
       meta: {
-        ip: ctx.identity.sourceIp,
         user: ctx.identity.username
       }
     }

package/src/plugin/runtime/PluginRuntime_Builder.res

@@ -346,8 +346,6 @@ module Make = (
       extensions: [],
       pluginExtensionPointCmdTopicUrl: Pulumi.Output.make(""),
       publishToAggregates: Dict.make(),
-      readModelQueueUrls: Dict.make(),
-      readModelNamesForSourceName: Dict.make(),
     }
   }
 
@@ -427,18 +425,6 @@ module Make = (
       envVars->Dict.set(envVarName, queueUrlOutput->Pulumi.Output.asInput)
     })
 
-    // Same indirection for ReadModel EventCollector SQS URLs — only populated
-    // when user extensions enqueue directly into RMs (Extension_Operations
-    // publishToReadModels path). Empty for the admin Lambda and for the
-    // current Orders_Extension fixture (its RM is fed via the slice EventLog →
-    // RM EventColl subscription chain instead).
-    context.readModelQueueUrls
-    ->Dict.toArray
-    ->Array.forEach(((_rmName, queueUrlOutput)) => {
-      let envVarName = `PRM_${_rmName}_QUEUE_URL`
-      envVars->Dict.set(envVarName, queueUrlOutput->Pulumi.Output.asInput)
-    })
-
     // Outgoing arrays first — resolve EP eventTopicArns, then bundle everything
     // into one Output.apply that builds the JSON.
     let epEventTopicArnsOutput =
@@ -523,8 +509,7 @@ module Make = (
       // User-declared extensions — one entry per merged extension group.
       // Each entry carries enough metadata for the bundled handler to
       // dynamic-import the spec / mapping modules and filter the top-level
-      // publishToAggregates + readModelQueueUrls maps down to the subset
-      // this extension actually uses.
+      // publishToAggregates map down to the subset this extension actually uses.
       // Sort by extension name so the serialized JSON is stable across deploys.
       let extensionsArr =
         context.extensions
@@ -540,43 +525,26 @@ module Make = (
             "aggregateNames",
             ext.aggregateNames->Array.map(JSON.Encode.string)->JSON.Encode.array,
           )
-          entryDict->Dict.set(
-            "readModelNames",
-            ext.readModelNames->Array.map(JSON.Encode.string)->JSON.Encode.array,
-          )
           JSON.Encode.object(entryDict)
         })
       dict->Dict.set("extensions", JSON.Encode.array(extensionsArr))
 
-      // publishToAggregates / readModelQueueUrls live in queueUrls.json (see the
-      // asset bundle below). Both are one entry per target, so they grow with the
-      // plugin, and together with the PTA_/PRM_ vars they name they carried the
-      // catalog EventCollector past Lambda's 4KB environment ceiling. Only the
-      // maps move: they are built from Dict.keysToArray, so they hold no Pulumi
-      // Output and can be serialized here. The URLs themselves cannot follow —
-      // see the note on the aggregate walk further down.
-
-      let rmNamesForSourceDict = Dict.make()
-      context.readModelNamesForSourceName
-      ->Dict.toArray
-      ->Array.forEach(((sourceName, rmNames)) =>
-        rmNamesForSourceDict->Dict.set(
-          sourceName,
-          rmNames->Array.map(JSON.Encode.string)->JSON.Encode.array,
-        )
-      )
-      dict->Dict.set("readModelNamesForSourceName", JSON.Encode.object(rmNamesForSourceDict))
+      // publishToAggregates lives in queueUrls.json (see the asset bundle below).
+      // It is one entry per target, so it grows with the plugin, and together with
+      // the PTA_ vars it names it carried the catalog EventCollector past Lambda's
+      // 4KB environment ceiling. Only the map moves: it is built from
+      // Dict.keysToArray, so it holds no Pulumi Output and can be serialized here.
+      // The URLs themselves cannot follow — see the note on the aggregate walk
+      // further down.
 
       let json = JSON.Encode.object(dict)->JSON.stringify
-      // The PTA_/PRM_ vars are the rest of this Lambda's environment and the
-      // half that grows with the plugin. Their names are known here; their
-      // values are still Outputs, so the budget check estimates those.
-      let queueUrlKeys = Array.concat(
+      // The PTA_ vars are the rest of this Lambda's environment and the half
+      // that grows with the plugin. Their names are known here; their values
+      // are still Outputs, so the budget check estimates those.
+      let queueUrlKeys =
         context.publishToAggregates
         ->Dict.keysToArray
-        ->Array.map(n => `PTA_${n}_QUEUE_URL`),
-        context.readModelQueueUrls->Dict.keysToArray->Array.map(n => `PRM_${n}_QUEUE_URL`),
-      )
+        ->Array.map(n => `PTA_${n}_QUEUE_URL`)
       Util_LambdaEnvBudget.check(
         ~lambdaName=name,
         ~handlerConfigJson=json,
@@ -660,10 +628,6 @@ module Make = (
           "publishToAggregates",
           nameMap(context.publishToAggregates->Dict.keysToArray, "PTA"),
         )
-        queueUrlsDict->Dict.set(
-          "readModelQueueUrls",
-          nameMap(context.readModelQueueUrls->Dict.keysToArray, "PRM"),
-        )
         extraStringAssets->Dict.set(
           "queueUrls.json",
           JSON.Encode.object(queueUrlsDict)->JSON.stringify,

package/src/plugin/runtime/PluginRuntime_Builder.res.mjs

@@ -268,9 +268,7 @@ function Make(EventCollectorChannel) {
         }],
       extensions: [],
       pluginExtensionPointCmdTopicUrl: Pulumi.output(""),
-      publishToAggregates: {},
-      readModelQueueUrls: {},
-      readModelNamesForSourceName: {}
+      publishToAggregates: {}
     };
   };
   let forPluginEventCollector = (param, eventTopics, resources, memorySizeOpt, timeoutOpt, eventCollector) => {
@@ -303,10 +301,6 @@ function Make(EventCollectorChannel) {
       let envVarName = `PTA_` + param[0] + `_QUEUE_URL`;
       envVars[envVarName] = param[1];
     });
-    Object.entries(context.readModelQueueUrls).forEach(param => {
-      let envVarName = `PRM_` + param[0] + `_QUEUE_URL`;
-      envVars[envVarName] = param[1];
-    });
     let epEventTopicArnsOutput = Pulumi.all(context.extensionPoints.map(ep => ep.eventTopicArn));
     let handlerConfigJson = Pulumi.all([
       queue.id,
@@ -371,17 +365,11 @@ function Make(EventCollectorChannel) {
         entryDict["delegateModule"] = ext.delegateModule;
         entryDict["extensionPointName"] = ext.extensionPointName;
         entryDict["aggregateNames"] = ext.aggregateNames.map(prim => prim);
-        entryDict["readModelNames"] = ext.readModelNames.map(prim => prim);
         return entryDict;
       });
       dict["extensions"] = extensionsArr;
-      let rmNamesForSourceDict = {};
-      Object.entries(context.readModelNamesForSourceName).forEach(param => {
-        rmNamesForSourceDict[param[0]] = param[1].map(prim => prim);
-      });
-      dict["readModelNamesForSourceName"] = rmNamesForSourceDict;
       let json = JSON.stringify(dict);
-      let queueUrlKeys = Object.keys(context.publishToAggregates).map(n => `PTA_` + n + `_QUEUE_URL`).concat(Object.keys(context.readModelQueueUrls).map(n => `PRM_` + n + `_QUEUE_URL`));
+      let queueUrlKeys = Object.keys(context.publishToAggregates).map(n => `PTA_` + n + `_QUEUE_URL`);
       Util_LambdaEnvBudget$ReventlessAws.check(name, json, queueUrlKeys);
       return json;
     });
@@ -428,7 +416,6 @@ function Make(EventCollectorChannel) {
       };
       let queueUrlsDict = {};
       queueUrlsDict["publishToAggregates"] = nameMap(Object.keys(context.publishToAggregates), "PTA");
-      queueUrlsDict["readModelQueueUrls"] = nameMap(Object.keys(context.readModelQueueUrls), "PRM");
       extraStringAssets["queueUrls.json"] = JSON.stringify(queueUrlsDict);
       extraStringAssets["uiFragments.json"] = param[1];
       return Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Runtime/EventCollectorEntryPoint.mjs", packageDirs, extraStringAssets, undefined);

package/tests/DcbEventLogStorage_DynamoDb_RuntimeTest.res.mjs

@@ -17,7 +17,7 @@ function tag(key, value) {
 }
 
 function testMeta() {
-  return Message$ReventlessCore.generateMeta("test", undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+  return Message$ReventlessCore.generateMeta("test", undefined, undefined, undefined, undefined, undefined, undefined);
 }
 
 let table = {

package/tests/EventCollectorEntryPoint_OpsTest.res

@@ -32,9 +32,10 @@ describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
     expect(p.eventCollector)->toBe("") // defaulted when absent
     expect(p.extensions->Array.length)->toBe(0)
     expect(p.extensionPoints->Array.length)->toBe(0)
-    expect(p.dcbEventLog->Option.isNone)->toBe(true)
   })
 
+  // A row written before `dcbSources` left the extension definition still
+  // carries the key; the projection reads past it.
   testSync("decodes extensions, dropping entries without extensionPointName", () => {
     let row = obj([
       ("id", str("Ordering@2")),
@@ -46,7 +47,7 @@ describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
           obj([
             ("name", str("OrdersExt")),
             ("extensionPointName", str("Catalog.Products")),
-            ("dcbSources", JSON.Encode.array([str("prod"), JSON.Encode.int(7)])),
+            ("dcbSources", JSON.Encode.array([])),
           ]),
           obj([("name", str("Malformed"))]), // no extensionPointName -> dropped
         ]),
@@ -58,11 +59,9 @@ describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
     let e = p.extensions->Array.getUnsafe(0)
     expect(e.name)->toBe("OrdersExt")
     expect(e.extensionPointName)->toBe("Catalog.Products")
-    // Non-string dcbSources elements are filtered out.
-    expect(e.dcbSources)->toEqual(["prod"])
   })
 
-  testSync("decodes extensionPoints and dcbEventLog; drops EPs without name/eventTopic", () => {
+  testSync("decodes extensionPoints; drops EPs without name/eventTopic", () => {
     let row = obj([
       ("id", str("Catalog@1")),
       ("status", str("Connected")),
@@ -73,6 +72,7 @@ describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
           obj([("name", str("NoTopic"))]), // no eventTopic -> dropped
         ]),
       ),
+      // Still on older rows; the subscription manager no longer reads it.
       ("dcbEventLog", obj([("name", str("catalog-dcb")), ("eventTopicArn", str("dcb-arn"))])),
     ])
     let p = project(row)->Option.getOrThrow
@@ -81,18 +81,6 @@ describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
     expect(ep.name)->toBe("Catalog.Products")
     expect(ep.commandTopic)->toBe("") // defaulted
     expect(ep.eventTopic)->toBe("t-arn")
-    let dcb = p.dcbEventLog->Option.getOrThrow
-    expect(dcb.name)->toBe("catalog-dcb")
-    expect(dcb.eventTopicArn)->toBe("dcb-arn")
-  })
-
-  testSync("drops a dcbEventLog missing eventTopicArn", () => {
-    let row = obj([
-      ("id", str("Catalog@1")),
-      ("status", str("Connected")),
-      ("dcbEventLog", obj([("name", str("catalog-dcb"))])),
-    ])
-    expect((project(row)->Option.getOrThrow).dcbEventLog->Option.isNone)->toBe(true)
   })
 })
 
@@ -146,7 +134,7 @@ describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
     let c = EventCollectorEntryPoint_Ops.parseHandlerConfig(minimalConfig([]))
     expect(c.queueUrl)->toBe("q-url")
     expect(c.connectExtension->Option.isNone)->toBe(true) // absent → None
-    expect(c.readModelNamesForSourceName->Dict.keysToArray->Array.length)->toBe(0)
+    expect(c.extensions->Array.length)->toBe(0)
   })
 
   testSync("connectExtension: JSON null (admin) maps to None; a record decodes", () => {
@@ -177,7 +165,7 @@ describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
         (
           "extensions",
           JSON.Encode.array([
-            // no name, no module specifiers, no aggregate/readModel lists
+            // no name, no module specifiers, no aggregate list
             obj([("extensionPointName", str("Ordering.Orders"))]),
           ]),
         ),
@@ -187,10 +175,9 @@ describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
     expect(ext.name)->toBe("Ordering.Orders") // name falls back to the EP name
     expect(ext.specModule)->toBe("")
     expect(ext.aggregateNames)->toEqual([])
-    expect(ext.readModelNames)->toEqual([])
   })
 
-  testSync("decodes extensionPoints entries and the env-var maps", () => {
+  testSync("decodes extensionPoints entries", () => {
     let c = EventCollectorEntryPoint_Ops.parseHandlerConfig(
       minimalConfig([
         (
@@ -204,30 +191,38 @@ describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
             ]),
           ]),
         ),
-        (
-          "readModelNamesForSourceName",
-          obj([("Ordering.Orders", JSON.Encode.array([str("ProductDemands")]))]),
-        ),
       ]),
     )
     let ep = c.extensionPoints->Array.getUnsafe(0)
     expect(ep.eventTopicArn)->toBe("arn:ep")
     expect(ep.aggregateNames)->toEqual(["Plugin"])
-    expect(c.readModelNamesForSourceName->Dict.get("Ordering.Orders"))->toEqual(
-      Some(["ProductDemands"]),
-    )
   })
 
-  // The target→env-var maps left HANDLER_CONFIG for queueUrls.json, so a config
-  // still carrying them must parse rather than trip the required-field check —
-  // that is what a Lambda running an older archive sends.
-  testSync("ignores publishToAggregates left over in HANDLER_CONFIG", () => {
+  // Keys HANDLER_CONFIG no longer carries — the target→env-var maps that left for
+  // queueUrls.json, and the read-model forwarding index with the per-extension
+  // `readModelNames` — must parse rather than trip the required-field check: that
+  // is what a Lambda running an older archive sends.
+  testSync("ignores keys an older HANDLER_CONFIG still carries", () => {
     let c = EventCollectorEntryPoint_Ops.parseHandlerConfig(
       minimalConfig([
         ("publishToAggregates", obj([("Plugin", str("PTA_Plugin_QUEUE_URL"))])),
         ("readModelQueueUrls", obj([("ProductDemands", str("PRM_ProductDemands_QUEUE_URL"))])),
+        (
+          "readModelNamesForSourceName",
+          obj([("Ordering.Orders", JSON.Encode.array([str("ProductDemands")]))]),
+        ),
+        (
+          "extensions",
+          JSON.Encode.array([
+            obj([
+              ("extensionPointName", str("Ordering.Orders")),
+              ("readModelNames", JSON.Encode.array([str("ProductDemands")])),
+            ]),
+          ]),
+        ),
       ]),
     )
     expect(c.queueUrl)->toBe("q-url")
+    expect((c.extensions->Array.getUnsafe(0)).extensionPointName)->toBe("Ordering.Orders")
   })
 })

package/tests/EventCollectorEntryPoint_OpsTest.res.mjs

@@ -43,7 +43,6 @@ globalThis.describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
     globalThis.expect(p.eventCollector).toBe("");
     globalThis.expect(p.extensions.length).toBe(0);
     globalThis.expect(p.extensionPoints.length).toBe(0);
-    globalThis.expect(Stdlib_Option.isNone(p.dcbEventLog)).toBe(true);
   });
   globalThis.test("decodes extensions, dropping entries without extensionPointName", () => {
     let row = Object.fromEntries([
@@ -73,10 +72,7 @@ globalThis.describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
             ],
             [
               "dcbSources",
-              [
-                "prod",
-                7
-              ]
+              []
             ]
           ]),
           Object.fromEntries([[
@@ -92,9 +88,8 @@ globalThis.describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
     let e = p.extensions[0];
     globalThis.expect(e.name).toBe("OrdersExt");
     globalThis.expect(e.extensionPointName).toBe("Catalog.Products");
-    globalThis.expect(e.dcbSources).toEqual(["prod"]);
   });
-  globalThis.test("decodes extensionPoints and dcbEventLog; drops EPs without name/eventTopic", () => {
+  globalThis.test("decodes extensionPoints; drops EPs without name/eventTopic", () => {
     let row = Object.fromEntries([
       [
         "id",
@@ -143,29 +138,6 @@ globalThis.describe("EventCollectorEntryPoint_Ops.projectPluginRow", () => {
     globalThis.expect(ep.name).toBe("Catalog.Products");
     globalThis.expect(ep.commandTopic).toBe("");
     globalThis.expect(ep.eventTopic).toBe("t-arn");
-    let dcb = Stdlib_Option.getOrThrow(p.dcbEventLog, undefined);
-    globalThis.expect(dcb.name).toBe("catalog-dcb");
-    globalThis.expect(dcb.eventTopicArn).toBe("dcb-arn");
-  });
-  globalThis.test("drops a dcbEventLog missing eventTopicArn", () => {
-    let row = Object.fromEntries([
-      [
-        "id",
-        "Catalog@1"
-      ],
-      [
-        "status",
-        "Connected"
-      ],
-      [
-        "dcbEventLog",
-        Object.fromEntries([[
-            "name",
-            "catalog-dcb"
-          ]])
-      ]
-    ]);
-    globalThis.expect(Stdlib_Option.isNone(Stdlib_Option.getOrThrow(EventCollectorEntryPoint_Ops$ReventlessAws.projectPluginRow(row), undefined).dcbEventLog)).toBe(true);
   });
 });
 
@@ -234,7 +206,7 @@ globalThis.describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
     let c = EventCollectorEntryPoint_Ops$ReventlessAws.parseHandlerConfig(minimalConfig([]));
     globalThis.expect(c.queueUrl).toBe("q-url");
     globalThis.expect(Stdlib_Option.isNone(c.connectExtension)).toBe(true);
-    globalThis.expect(Object.keys(c.readModelNamesForSourceName).length).toBe(0);
+    globalThis.expect(c.extensions.length).toBe(0);
   });
   globalThis.test("connectExtension: JSON null (admin) maps to None; a record decodes", () => {
     let asNull = EventCollectorEntryPoint_Ops$ReventlessAws.parseHandlerConfig(minimalConfig([[
@@ -274,11 +246,9 @@ globalThis.describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
     globalThis.expect(ext.name).toBe("Ordering.Orders");
     globalThis.expect(ext.specModule).toBe("");
     globalThis.expect(ext.aggregateNames).toEqual([]);
-    globalThis.expect(ext.readModelNames).toEqual([]);
   });
-  globalThis.test("decodes extensionPoints entries and the env-var maps", () => {
-    let c = EventCollectorEntryPoint_Ops$ReventlessAws.parseHandlerConfig(minimalConfig([
-      [
+  globalThis.test("decodes extensionPoints entries", () => {
+    let c = EventCollectorEntryPoint_Ops$ReventlessAws.parseHandlerConfig(minimalConfig([[
         "extensionPoints",
         [Object.fromEntries([
             [
@@ -298,21 +268,12 @@ globalThis.describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
               ["Plugin"]
             ]
           ])]
-      ],
-      [
-        "readModelNamesForSourceName",
-        Object.fromEntries([[
-            "Ordering.Orders",
-            ["ProductDemands"]
-          ]])
-      ]
-    ]));
+      ]]));
     let ep = c.extensionPoints[0];
     globalThis.expect(ep.eventTopicArn).toBe("arn:ep");
     globalThis.expect(ep.aggregateNames).toEqual(["Plugin"]);
-    globalThis.expect(c.readModelNamesForSourceName["Ordering.Orders"]).toEqual(["ProductDemands"]);
   });
-  globalThis.test("ignores publishToAggregates left over in HANDLER_CONFIG", () => {
+  globalThis.test("ignores keys an older HANDLER_CONFIG still carries", () => {
     let c = EventCollectorEntryPoint_Ops$ReventlessAws.parseHandlerConfig(minimalConfig([
       [
         "publishToAggregates",
@@ -327,9 +288,30 @@ globalThis.describe("EventCollectorEntryPoint_Ops.parseHandlerConfig", () => {
             "ProductDemands",
             "PRM_ProductDemands_QUEUE_URL"
           ]])
+      ],
+      [
+        "readModelNamesForSourceName",
+        Object.fromEntries([[
+            "Ordering.Orders",
+            ["ProductDemands"]
+          ]])
+      ],
+      [
+        "extensions",
+        [Object.fromEntries([
+            [
+              "extensionPointName",
+              "Ordering.Orders"
+            ],
+            [
+              "readModelNames",
+              ["ProductDemands"]
+            ]
+          ])]
       ]
     ]));
     globalThis.expect(c.queueUrl).toBe("q-url");
+    globalThis.expect(c.extensions[0].extensionPointName).toBe("Ordering.Orders");
   });
 });
 

package/tests/EventMapperEntryPoint_OpsTest.res

@@ -78,7 +78,7 @@ describe("EventMapperEntryPoint_Ops.makeStreamHandler", () => {
     }
     let command: ReventlessCore.Message.commandJson = {
       id: "prd-1",
-      meta: ReventlessCore.Message.generateMeta(~service="Product", ~ip="", ~user="test"),
+      meta: ReventlessCore.Message.generateMeta(~service="Product", ~user="test"),
       commandJson: JSON.Encode.string("Add"),
     }
     let commonEventsHandler: EventMapperEntryPoint_Ops.commonEventsHandler = async jsons => {

package/tests/EventMapperEntryPoint_OpsTest.res.mjs

@@ -70,7 +70,7 @@ globalThis.describe("EventMapperEntryPoint_Ops.makeStreamHandler", () => {
       publishJsons: ops_publishJsons,
       queryEngine: ops_queryEngine
     };
-    let command_meta = Message$ReventlessCore.generateMeta("Product", "", "test", undefined, undefined, undefined, undefined, undefined);
+    let command_meta = Message$ReventlessCore.generateMeta("Product", "test", undefined, undefined, undefined, undefined, undefined);
     let command = {
       id: "prd-1",
       meta: command_meta,

package/tests/PgChangeFeedRelay_IntegrationTest.res.mjs

@@ -22,7 +22,7 @@ function stored(eventType, tags, data) {
     eventType: eventType,
     data: data,
     tags: tags,
-    meta: Message$ReventlessCore.generateMeta("relay-it", undefined, undefined, undefined, undefined, undefined, undefined, undefined)
+    meta: Message$ReventlessCore.generateMeta("relay-it", undefined, undefined, undefined, undefined, undefined, undefined)
   };
 }
 
@@ -124,7 +124,7 @@ if (url !== undefined) {
           "data",
           data
         ]
-      ].concat(Message$ReventlessCore.decomposeMeta(Message$ReventlessCore.generateMeta("relay-it", undefined, undefined, undefined, undefined, undefined, undefined, undefined))));
+      ].concat(Message$ReventlessCore.decomposeMeta(Message$ReventlessCore.generateMeta("relay-it", undefined, undefined, undefined, undefined, undefined, undefined))));
       await match[1].append(0, "agg-1", [
         flatItem("agg-1", 0, "NameUpdated", Object.fromEntries([[
             "n",
@@ -155,7 +155,7 @@ if (url !== undefined) {
       let mkOps = name => EventLogStorage_Postgres$ReventlessPostgres.makeStorage(pool, name, undefined, undefined)[1];
       let opsB = mkOps("ClassicRelayIsoBEventLog");
       let opsA = mkOps("ClassicRelayIsoAEventLog");
-      let meta = () => Message$ReventlessCore.decomposeMeta(Message$ReventlessCore.generateMeta("relay-it", undefined, undefined, undefined, undefined, undefined, undefined, undefined));
+      let meta = () => Message$ReventlessCore.decomposeMeta(Message$ReventlessCore.generateMeta("relay-it", undefined, undefined, undefined, undefined, undefined, undefined));
       let item = (id, eventType) => Object.fromEntries([
         [
           "id",

package/tests/PgPipeline_IntegrationTest.res.mjs

@@ -132,7 +132,7 @@ function flatItem(id, seq, service, event) {
       "data",
       match[1]
     ]
-  ].concat(Message$ReventlessCore.decomposeMeta(Message$ReventlessCore.generateMeta(service, undefined, undefined, undefined, undefined, undefined, undefined, undefined))));
+  ].concat(Message$ReventlessCore.decomposeMeta(Message$ReventlessCore.generateMeta(service, undefined, undefined, undefined, undefined, undefined, undefined))));
 }
 
 function asSqsEvent(bodies) {

package/tests/Upload_ReleaseRuleTest.res

@@ -88,3 +88,27 @@ describe("Upload_Presign_S3_Ops.decideRelease", () => {
     )
   )
 })
+
+describe("Upload_Presign_S3_Ops.presignKey", () => {
+  testSync("is {prefix}/{sub}/{uuid}.{ext}, with nothing the uploader typed", () =>
+    expect(
+      Ops.presignKey(~servedPrefix=prefix, ~sub, ~uuid="0b1c", ~contentType=Some("image/png")),
+    )->toEqual("uploads/user-1/0b1c.png")
+  )
+
+  testSync("an undeclared content type is stored as bin", () =>
+    expect(Ops.presignKey(~servedPrefix=prefix, ~sub, ~uuid="0b1c", ~contentType=None))->toEqual(
+      "uploads/user-1/0b1c.bin",
+    )
+  )
+
+  testSync("a minted key passes the release rule's scope check for its own caller", () =>
+    expect(
+      Ops.scopeCheck(
+        ~key=Ops.presignKey(~servedPrefix=prefix, ~sub, ~uuid="0b1c", ~contentType=None),
+        ~sub,
+        ~servedPrefix=prefix,
+      ),
+    )->toEqual(Ok())
+  )
+})

package/tests/Upload_ReleaseRuleTest.res.mjs

@@ -89,6 +89,21 @@ globalThis.describe("Upload_Presign_S3_Ops.decideRelease", () => {
   });
 });
 
+globalThis.describe("Upload_Presign_S3_Ops.presignKey", () => {
+  globalThis.test("is {prefix}/{sub}/{uuid}.{ext}, with nothing the uploader typed", () => {
+    globalThis.expect(Upload_Presign_S3_Ops$ReventlessAws.presignKey(prefix, sub, "0b1c", "image/png")).toEqual("uploads/user-1/0b1c.png");
+  });
+  globalThis.test("an undeclared content type is stored as bin", () => {
+    globalThis.expect(Upload_Presign_S3_Ops$ReventlessAws.presignKey(prefix, sub, "0b1c", undefined)).toEqual("uploads/user-1/0b1c.bin");
+  });
+  globalThis.test("a minted key passes the release rule's scope check for its own caller", () => {
+    globalThis.expect(Upload_Presign_S3_Ops$ReventlessAws.scopeCheck(Upload_Presign_S3_Ops$ReventlessAws.presignKey(prefix, sub, "0b1c", undefined), sub, prefix)).toEqual({
+      TAG: "Ok",
+      _0: undefined
+    });
+  });
+});
+
 let Ops;
 
 let nowMs = 1000000.0;