@reventlessdev/reventless-aws 3.0.0-alpha.309 → 3.0.0-alpha.310

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.0.0-alpha.310 (2026-08-18)
+
+### Bug Fixes
+
+* **aws:** normalize the null a table without a sort key resolves to ([8fb15ac](https://github.com/ReventlessDev/reventless-core/commit/8fb15ac066679b6799f4287c2c8d332e2367f599))
+
+
 # 3.0.0-alpha.309 (2026-08-18)
 
 * feat(core)!: tell the Monitoring seam where a unit's logs live ([6cbd595](https://github.com/ReventlessDev/reventless-core/commit/6cbd595e2474fce3f87b7720a332e82583899bae))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-aws",
-  "version": "3.0.0-alpha.309",
+  "version": "3.0.0-alpha.310",
   "description": "AWS adapters for Reventless",
   "license": "Apache-2.0",
   "dependencies": {
@@ -13,17 +13,17 @@
     "sury": "11.0.0-rc.1",
     "uuid": "^13.0.0",
     "@reventlessdev/rescript-aws-sdk": "3.0.0-alpha.12",
+    "@reventlessdev/rescript-jest": "1.0.0-alpha.10",
     "@reventlessdev/rescript-effect": "0.1.0-alpha.32",
     "@reventlessdev/rescript-node": "2.0.0-alpha.8",
-    "@reventlessdev/rescript-jest": "1.0.0-alpha.10",
-    "@reventlessdev/rescript-pulumi-aws": "3.0.0-alpha.0",
+    "@reventlessdev/rescript-pulumi-aws": "3.0.0-alpha.1",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.19",
     "@reventlessdev/rescript-uuid": "2.0.0-alpha.0",
+    "@reventlessdev/reventless-core": "3.0.0-alpha.240",
     "@reventlessdev/reventless-infra": "3.0.0-alpha.146",
+    "@reventlessdev/reventless-postgres": "3.0.0-alpha.104",
     "@reventlessdev/reventless-interop": "3.0.0-alpha.32",
-    "@reventlessdev/reventless-core": "3.0.0-alpha.240",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.118",
-    "@reventlessdev/reventless-postgres": "3.0.0-alpha.104"
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.118"
   },
   "devDependencies": {
     "rescript": "12.3.0",

package/src/util/Util_DynamoDb.res

@@ -7,7 +7,12 @@ let log = ReventlessCore.Logger.fromEnv()
 let toResourceInfo: table => Pulumi.Output.t<ReventlessInfra.Adapter.resourceInfo> = ({hashKey, rangeKey}) =>
   (hashKey, rangeKey)
   ->Pulumi.Output.all2
-  ->Pulumi.Output.apply(((hashKey, rangeKey)) => ReventlessInfra.Adapter.StorageKeys({partitionKey: hashKey, sortKey: rangeKey}))
+  ->Pulumi.Output.apply(((hashKey, rangeKey)) => ReventlessInfra.Adapter.StorageKeys({
+    partitionKey: hashKey,
+    // Normalize here: a null reaching the plugin-structure export fails sury's
+    // encode-side validation, which expects `option`'s undefined.
+    sortKey: rangeKey->Nullable.toOption,
+  }))
 
 let toResolvedTableOutput = ({name, id, arn, hashKey, rangeKey}) =>
   (name, id, arn, hashKey, rangeKey)
@@ -17,7 +22,7 @@ let toResolvedTableOutput = ({name, id, arn, hashKey, rangeKey}) =>
     name,
     arn,
     hashKey,
-    rangeKey: ?(rangeKey->Option.map(rangeKey => rangeKey->Nullable.make)),
+    rangeKey: ?(rangeKey->Nullable.toOption->Option.map(Nullable.make)),
   })
 
 let toResource = (~tags=?, {id, name, arn} as table) =>

package/src/util/Util_DynamoDb.res.mjs

@@ -24,7 +24,7 @@ function toResourceInfo(param) {
   ]).apply(param => ({
     TAG: "StorageKeys",
     partitionKey: param[0],
-    sortKey: param[1]
+    sortKey: Primitive_option.fromNullable(param[1])
   }));
 }
 
@@ -40,7 +40,7 @@ function toResolvedTableOutput(param) {
     name: param[0],
     arn: param[2],
     hashKey: param[3],
-    rangeKey: Stdlib_Option.map(param[4], rangeKey => rangeKey)
+    rangeKey: Stdlib_Option.map(Primitive_option.fromNullable(param[4]), prim => prim)
   }));
 }
 

package/tests/Util_DynamoDbTest.res

@@ -0,0 +1,44 @@
+open JestGlobals
+
+// Guards the null a table without a sort key resolves to.
+//
+// Pulumi resolves an absent `rangeKey` to `null`, and ReScript's `option` reads
+// None as undefined — so the null travelled into `resourceInfo` unconverted and
+// the plugin-structure export threw `Expected string | undefined, received null`
+// out of sury's encode-side validation, failing the deploy after it had already
+// applied part of the stack.
+
+let resolve = (output: Pulumi.Output.t<'a>): promise<'a> =>
+  Promise.make((resolve, _) => {
+    let _ = output->Pulumi.Output.apply(value => resolve(value))
+  })
+
+let table = (~rangeKey): PulumiAws.DynamoDb.Table.t => {
+  arn: "arn:aws:dynamodb:eu-west-1:123456789012:table/UiFragments-abc123"->Pulumi.Output.make,
+  name: "UiFragments-abc123"->Pulumi.Output.make,
+  id: "UiFragments-abc123"->Pulumi.Output.make,
+  hashKey: "id"->Pulumi.Output.make,
+  rangeKey: rangeKey->Pulumi.Output.make,
+  streamEnabled: None->Pulumi.Output.make,
+  streamArn: ""->Pulumi.Output.make,
+  streamLabel: ""->Pulumi.Output.make,
+  ttl: {PulumiAws.DynamoDb.Table.attributeName: ""}->Pulumi.Output.make,
+  pointInTimeRecovery: {PulumiAws.DynamoDb.Table.enabled: true}->Pulumi.Output.make,
+}
+
+describe("Util_DynamoDb.toResourceInfo", () => {
+  test("reads a table without a sort key as None", async () => {
+    let resourceInfo = await table(~rangeKey=Nullable.null)->Util_DynamoDb.toResourceInfo->resolve
+    expect(resourceInfo)->toEqual(
+      ReventlessInfra.Adapter.StorageKeys({partitionKey: "id", sortKey: None}),
+    )
+  })
+
+  test("carries a sort key when the table has one", async () => {
+    let resourceInfo =
+      await table(~rangeKey=Nullable.make("seq"))->Util_DynamoDb.toResourceInfo->resolve
+    expect(resourceInfo)->toEqual(
+      ReventlessInfra.Adapter.StorageKeys({partitionKey: "id", sortKey: Some("seq")}),
+    )
+  })
+})

package/tests/Util_DynamoDbTest.res.mjs

@@ -0,0 +1,54 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Pulumi from "@pulumi/pulumi";
+import * as Util_DynamoDb$ReventlessAws from "../src/util/Util_DynamoDb.res.mjs";
+
+function resolve(output) {
+  return new Promise((resolve, param) => {
+    output.apply(value => resolve(value));
+  });
+}
+
+function table(rangeKey) {
+  return {
+    arn: Pulumi.output("arn:aws:dynamodb:eu-west-1:123456789012:table/UiFragments-abc123"),
+    name: Pulumi.output("UiFragments-abc123"),
+    id: Pulumi.output("UiFragments-abc123"),
+    hashKey: Pulumi.output("id"),
+    rangeKey: Pulumi.output(rangeKey),
+    streamEnabled: Pulumi.output(undefined),
+    streamArn: Pulumi.output(""),
+    streamLabel: Pulumi.output(""),
+    ttl: Pulumi.output({
+      attributeName: ""
+    }),
+    pointInTimeRecovery: Pulumi.output({
+      enabled: true
+    })
+  };
+}
+
+globalThis.describe("Util_DynamoDb.toResourceInfo", () => {
+  globalThis.test("reads a table without a sort key as None", async () => {
+    let resourceInfo = await resolve(Util_DynamoDb$ReventlessAws.toResourceInfo(table(null)));
+    globalThis.expect(resourceInfo).toEqual({
+      TAG: "StorageKeys",
+      partitionKey: "id",
+      sortKey: undefined
+    });
+  });
+  globalThis.test("carries a sort key when the table has one", async () => {
+    let resourceInfo = await resolve(Util_DynamoDb$ReventlessAws.toResourceInfo(table("seq")));
+    globalThis.expect(resourceInfo).toEqual({
+      TAG: "StorageKeys",
+      partitionKey: "id",
+      sortKey: "seq"
+    });
+  });
+});
+
+export {
+  resolve,
+  table,
+}
+/*  Not a pure module */