Write migration JSON params as objects and widen row ids

Rhys Sullivan committed 4 months ago

Commit 9cc69e41 parent 77756bb2 files · +22 −19Browse files

Unified · Split

2 files

scripts/migration/service-split-postgres-cli.ts +12 −17
tests/migration/service-split-postgres-cli.test.ts +10 −2

scripts/migration/service-split-postgres-cli.ts+12−17

 /* oxlint-disable executor/no-error-constructor, executor/no-try-catch-or-throw -- boundary: one-shot migration CLI */
+import { createHash } from "node:crypto";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
   return value;
 };
-const stableId = (...parts: readonly string[]): string => {
+// sha256-based: a 31-bit hash collides around ~50k rows (observed in prod);
-  const text = parts.join("\u0000");
+// 96 bits keeps re-run determinism with no realistic collision risk.
-  let hash = 0;
+const stableId = (...parts: readonly string[]): string =>
-  for (let index = 0; index < text.length; index += 1) {
+  `service_split_${createHash("sha256").update(parts.join("\u0000")).digest("hex").slice(0, 24)}`;
-    hash = (hash * 31 + text.charCodeAt(index)) >>> 0;
-  }
-  return `service_split_${hash.toString(36)}`;
-};
 const operationKeyPrefix = (integration: string): string =>
   `${operationStorageKey(integration, "").split(".").slice(0, 2).join(".")}.%`;
           row.target.pluginId,
           row.target.name,
           row.target.description,
-          JSON.stringify(scrubJson(row.config)),
+          scrubJson(row.config),
-          row.healthCheck ? JSON.stringify(scrubJson(row.healthCheck)) : null,
+          row.healthCheck ? scrubJson(row.healthCheck) : null,
           now,
           stableId("integration", org.tenant, row.target.slug),
           org.tenant,
               params.push(
                 integration.target.pluginId,
                 operationStorageKey(integration.target.slug, toolName),
-                JSON.stringify(
+                scrubJson({
-                  scrubJson({
+                  ...storageDataRecord(operation),
-                    ...storageDataRecord(operation),
+                  integration: integration.target.slug,
-                    integration: integration.target.slug,
+                  toolName,
-                    toolName,
+                }),
-                  }),
-                ),
                 operation.created_at,
                 now,
                 stableId("operation", org.tenant, integration.target.slug, toolName),

tests/migration/service-split-postgres-cli.test.ts+10−2

           readonly plugin_id: string;
           readonly config: unknown;
         }[]
-      >("SELECT slug, plugin_id, config::jsonb AS config FROM integration ORDER BY slug");
+      >(
+        "SELECT slug, plugin_id, config::jsonb AS config, jsonb_typeof(config::jsonb) AS config_type FROM integration ORDER BY slug",
+      );
       expect(integrations).toHaveLength(1);
       expect(integrations[0]).toMatchObject({
         slug: "google_calendar",
         plugin_id: "openapi",
+        // A double-encoded config lands as jsonb string, which some runtime
+        // readers reject; the migration must write a real JSON object.
+        config_type: "object",
       });
       expect(parseJson(integrations[0]?.config)).toMatchObject({
         specHash: "mono-hash",
           readonly key: string;
           readonly data: unknown;
         }[]
-      >("SELECT plugin_id, key, data FROM plugin_storage WHERE collection = 'operation'");
+      >(
+        "SELECT plugin_id, key, data, jsonb_typeof(data::jsonb) AS data_type FROM plugin_storage WHERE collection = 'operation'",
+      );
       expect(operations).toHaveLength(1);
       expect(operations[0]).toMatchObject({
         plugin_id: "openapi",
         key: operationStorageKey("google_calendar", "calendar.events.list"),
+        data_type: "object",
       });
       expect(parseJson(operations[0]?.data)).toMatchObject({
         integration: "google_calendar",