graphile-bucket-provisioner-plugin 1.15.0 → 1.15.1

package/esm/plugin.js

@@ -143,23 +143,28 @@ async function resolveEntityContext(pgClient, storageModule) {
  * `packages/ast-plpgsql/deploy/schemas/ast_plpgsql_helpers/procedures/triggers/job_trigger.sql`.
  * A callable enqueue function beside the trigger would be the durable fix for
  * this deliberate mirroring, but is out of scope here.
+ *
+ * The three scope shapes differ only in the payload entries and the identity
+ * arguments, so those are the only parts a caller supplies — the identifier,
+ * queue, retry, and priority policy exist exactly once.
  */
+function addJobStatement(payloadEntries, identityArgs) {
+    return `SELECT (app_jobs.add_job(
+      identifier => 'storage:provision_bucket',
+      payload => json_build_object(${payloadEntries}),
+      queue_name => 'bucket:' || $1::text,
+      max_attempts => 25,
+      priority => 0${identityArgs}
+    )).id AS id`;
+}
 async function enqueueReconciliationJob(pgClient, storageModule, bucket) {
     const scope = storageModule.scope;
     const entityField = storageModule.entity_field;
     let text;
     let values;
     if (entityField === null) {
-        text = `SELECT (app_jobs.add_job(
-      identifier => 'storage:provision_bucket',
-      payload => json_build_object(
-        'id', $1::uuid,
-        'scope', $2::text
-      ),
-      queue_name => 'bucket:' || $1::text,
-      max_attempts => 25,
-      priority => 0
-    )).id AS id`;
+        text = addJobStatement(`'id', $1::uuid,
+        'scope', $2::text`, '');
         values = [bucket.id, scope];
     }
     else if (entityField === 'database_id') {
@@ -167,21 +172,13 @@ async function enqueueReconciliationJob(pgClient, storageModule, bucket) {
         if (!databaseId) {
             throw new Error(`STORAGE_BUCKET_SCOPE_KEY_MISSING: bucket ${bucket.id} has no database_id`);
         }
-        text = `SELECT (app_jobs.add_job(
-      identifier => 'storage:provision_bucket',
-      payload => json_build_object(
-        'database_id', $2::uuid,
+        text = addJobStatement(`'database_id', $2::uuid,
         'id', $1::uuid,
-        'scope', $3::text
-      ),
+        'scope', $3::text`, `,
       db_id => $2,
-      queue_name => 'bucket:' || $1::text,
-      max_attempts => 25,
-      priority => 0,
       entity_id => $2,
       organization_id => NULL,
-      entity_type => $3
-    )).id AS id`;
+      entity_type => $3`);
         values = [bucket.id, databaseId, scope];
     }
     else if (entityField === 'owner_id') {
@@ -193,20 +190,12 @@ async function enqueueReconciliationJob(pgClient, storageModule, bucket) {
         const orgFunction = context.get_org_fn_schema && context.get_org_fn
             ? `${QuoteUtils.quoteQualifiedIdentifier(context.get_org_fn_schema, context.get_org_fn)}($3::text, $2::uuid)`
             : 'NULL';
-        text = `SELECT (app_jobs.add_job(
-      identifier => 'storage:provision_bucket',
-      payload => json_build_object(
-        'id', $1::uuid,
+        text = addJobStatement(`'id', $1::uuid,
         'owner_id', $2::uuid,
-        'scope', $3::text
-      ),
-      queue_name => 'bucket:' || $1::text,
-      max_attempts => 25,
-      priority => 0,
+        'scope', $3::text`, `,
       entity_id => $2,
       organization_id => ${orgFunction},
-      entity_type => $3
-    )).id AS id`;
+      entity_type => $3`);
         values = [bucket.id, ownerId, scope];
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-bucket-provisioner-plugin",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Bucket provisioning plugin for PostGraphile v5 — explicitly provisions S3 buckets via a GraphQL mutation",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -58,5 +58,5 @@
     "@types/node": "^22.19.11",
     "makage": "^0.3.0"
   },
-  "gitHead": "77d58bb93796be91d4e00156bb6847392584d3bc"
+  "gitHead": "9a919ff3f7ec90eab2d510bb6682ce5209e53198"
 }

package/plugin.js

@@ -147,23 +147,28 @@ async function resolveEntityContext(pgClient, storageModule) {
  * `packages/ast-plpgsql/deploy/schemas/ast_plpgsql_helpers/procedures/triggers/job_trigger.sql`.
  * A callable enqueue function beside the trigger would be the durable fix for
  * this deliberate mirroring, but is out of scope here.
+ *
+ * The three scope shapes differ only in the payload entries and the identity
+ * arguments, so those are the only parts a caller supplies — the identifier,
+ * queue, retry, and priority policy exist exactly once.
  */
+function addJobStatement(payloadEntries, identityArgs) {
+    return `SELECT (app_jobs.add_job(
+      identifier => 'storage:provision_bucket',
+      payload => json_build_object(${payloadEntries}),
+      queue_name => 'bucket:' || $1::text,
+      max_attempts => 25,
+      priority => 0${identityArgs}
+    )).id AS id`;
+}
 async function enqueueReconciliationJob(pgClient, storageModule, bucket) {
     const scope = storageModule.scope;
     const entityField = storageModule.entity_field;
     let text;
     let values;
     if (entityField === null) {
-        text = `SELECT (app_jobs.add_job(
-      identifier => 'storage:provision_bucket',
-      payload => json_build_object(
-        'id', $1::uuid,
-        'scope', $2::text
-      ),
-      queue_name => 'bucket:' || $1::text,
-      max_attempts => 25,
-      priority => 0
-    )).id AS id`;
+        text = addJobStatement(`'id', $1::uuid,
+        'scope', $2::text`, '');
         values = [bucket.id, scope];
     }
     else if (entityField === 'database_id') {
@@ -171,21 +176,13 @@ async function enqueueReconciliationJob(pgClient, storageModule, bucket) {
         if (!databaseId) {
             throw new Error(`STORAGE_BUCKET_SCOPE_KEY_MISSING: bucket ${bucket.id} has no database_id`);
         }
-        text = `SELECT (app_jobs.add_job(
-      identifier => 'storage:provision_bucket',
-      payload => json_build_object(
-        'database_id', $2::uuid,
+        text = addJobStatement(`'database_id', $2::uuid,
         'id', $1::uuid,
-        'scope', $3::text
-      ),
+        'scope', $3::text`, `,
       db_id => $2,
-      queue_name => 'bucket:' || $1::text,
-      max_attempts => 25,
-      priority => 0,
       entity_id => $2,
       organization_id => NULL,
-      entity_type => $3
-    )).id AS id`;
+      entity_type => $3`);
         values = [bucket.id, databaseId, scope];
     }
     else if (entityField === 'owner_id') {
@@ -197,20 +194,12 @@ async function enqueueReconciliationJob(pgClient, storageModule, bucket) {
         const orgFunction = context.get_org_fn_schema && context.get_org_fn
             ? `${quotes_1.QuoteUtils.quoteQualifiedIdentifier(context.get_org_fn_schema, context.get_org_fn)}($3::text, $2::uuid)`
             : 'NULL';
-        text = `SELECT (app_jobs.add_job(
-      identifier => 'storage:provision_bucket',
-      payload => json_build_object(
-        'id', $1::uuid,
+        text = addJobStatement(`'id', $1::uuid,
         'owner_id', $2::uuid,
-        'scope', $3::text
-      ),
-      queue_name => 'bucket:' || $1::text,
-      max_attempts => 25,
-      priority => 0,
+        'scope', $3::text`, `,
       entity_id => $2,
       organization_id => ${orgFunction},
-      entity_type => $3
-    )).id AS id`;
+      entity_type => $3`);
         values = [bucket.id, ownerId, scope];
     }
     else {