graphile-settings 6.24.7 → 6.25.0

package/esm/index.d.ts

@@ -35,4 +35,4 @@ export { ConstructivePreset, createConstructivePreset } from './presets/construc
 export * from './plugins/index';
 export * from './presets/index';
 export { makePgService };
-export { getPresignedUrlS3Config } from './presigned-url-resolver';
+export { getStorageCredentials } from './presigned-url-resolver';

package/esm/index.js

@@ -46,4 +46,4 @@ export * from './presets/index';
 // Re-export makePgService for convenience
 export { makePgService };
 // Presigned URL utilities
-export { getPresignedUrlS3Config } from './presigned-url-resolver';
+export { getStorageCredentials } from './presigned-url-resolver';

package/esm/presets/constructive-preset.js

@@ -12,7 +12,7 @@ import { RealtimeSubscriptionsPreset } from 'graphile-realtime-subscriptions';
 import { createMatchesOperatorFactory, createTrgmOperatorFactories, UnifiedSearchPreset } from 'graphile-search';
 import { UploadPreset } from 'graphile-upload-plugin';
 import { ConflictDetectorPreset, EnableAllFilterColumnsPreset, InflectorLoggerPreset, InflektPreset, ManyToManyOptInPreset, MetaSchemaPreset, MinimalPreset, NoUniqueLookupPreset, PgTypeMappingsPreset, RequiredInputPreset } from '../plugins';
-import { getPresignedUrlS3Config } from '../presigned-url-resolver';
+import { getStorageCredentials } from '../presigned-url-resolver';
 import { constructiveUploadFieldDefinitions } from '../upload-resolver';
 /**
  * grafast / @dataplan/pg require Node >= 22 (they call Promise.withResolvers()
@@ -138,7 +138,7 @@ export function createConstructivePreset(options) {
     }
     if (opts.enablePresignedUploads) {
         presets.push(PresignedUrlPreset({
-            s3: getPresignedUrlS3Config,
+            credentials: getStorageCredentials,
         }), BucketProvisionerPreset());
     }
     if (opts.enableAggregates) {

package/esm/presigned-url-resolver.d.ts

@@ -1,23 +1,10 @@
 /**
- * Presigned URL resolver for the Constructive presigned URL plugin.
+ * Object-store credentials for the presigned URL plugin.
  *
- * Reads CDN/S3 configuration from the standard env system
- * (getEnvOptions → pgpmDefaults + config files + env vars) and lazily
- * initializes an S3Client on first use.
- *
- * Follows the same lazy-init pattern as upload-resolver.ts.
- */
-import type { S3Config } from 'graphile-presigned-url-plugin';
-/**
- * Lazily initialize and return the S3Config for the presigned URL plugin.
- *
- * Reads CDN config on first call via getEnvOptions() (which already merges
- * pgpmDefaults → config file → env vars), creates an S3Client, and caches
- * the result. Same CDN config as upload-resolver.ts.
- *
- * NOTE: The `bucket` field here is only the connection's default and is never
- * uploaded to. Every managed upload names its bucket explicitly, resolved from
- * the tenant's logical bucket row; there is no environment-global upload
- * bucket.
+ * Credentials are the only storage input read from the environment
+ * (`STORAGE_ACCESS_KEY_ID` / `STORAGE_SECRET_ACCESS_KEY`). Endpoint, provider,
+ * region, bucket and public URL prefix are resolved per request from the
+ * tenant's `storage_module` row by the plugin itself.
  */
-export declare function getPresignedUrlS3Config(): S3Config;
+import type { StorageCredentials } from 'graphile-presigned-url-plugin';
+export declare function getStorageCredentials(): StorageCredentials;

package/esm/presigned-url-resolver.js

@@ -1,61 +1,17 @@
 /**
- * Presigned URL resolver for the Constructive presigned URL plugin.
+ * Object-store credentials for the presigned URL plugin.
  *
- * Reads CDN/S3 configuration from the standard env system
- * (getEnvOptions → pgpmDefaults + config files + env vars) and lazily
- * initializes an S3Client on first use.
- *
- * Follows the same lazy-init pattern as upload-resolver.ts.
+ * Credentials are the only storage input read from the environment
+ * (`STORAGE_ACCESS_KEY_ID` / `STORAGE_SECRET_ACCESS_KEY`). Endpoint, provider,
+ * region, bucket and public URL prefix are resolved per request from the
+ * tenant's `storage_module` row by the plugin itself.
  */
 import { getEnvOptions } from '@constructive-io/graphql-env';
-import { createS3Client } from '@constructive-io/s3-utils';
-import { Logger } from '@pgpmjs/logger';
-const log = new Logger('presigned-url-resolver');
-let s3Config = null;
-/**
- * Lazily initialize and return the S3Config for the presigned URL plugin.
- *
- * Reads CDN config on first call via getEnvOptions() (which already merges
- * pgpmDefaults → config file → env vars), creates an S3Client, and caches
- * the result. Same CDN config as upload-resolver.ts.
- *
- * NOTE: The `bucket` field here is only the connection's default and is never
- * uploaded to. Every managed upload names its bucket explicitly, resolved from
- * the tenant's logical bucket row; there is no environment-global upload
- * bucket.
- */
-export function getPresignedUrlS3Config() {
-    if (s3Config)
-        return s3Config;
-    const { cdn } = getEnvOptions();
-    if (!cdn) {
-        throw new Error('[presigned-url-resolver] CDN config not found. ' +
-            'Ensure CDN environment variables (AWS_ACCESS_KEY, AWS_SECRET_KEY, etc.) ' +
-            'are set or that pgpmDefaults provides CDN fields.');
-    }
-    const { bucketName, awsRegion, awsAccessKey, awsSecretKey, endpoint, publicUrlPrefix } = cdn;
-    if (!awsAccessKey || !awsSecretKey) {
-        throw new Error('[presigned-url-resolver] Missing S3 credentials. ' +
-            'Set AWS_ACCESS_KEY and AWS_SECRET_KEY environment variables.');
-    }
-    if (!bucketName) {
-        throw new Error('[presigned-url-resolver] Missing CDN bucket name. ' +
-            'Set CDN_BUCKET_NAME environment variable.');
+export function getStorageCredentials() {
+    const { accessKeyId, secretAccessKey } = getEnvOptions().storage ?? {};
+    if (!accessKeyId || !secretAccessKey) {
+        throw new Error('STORAGE_CREDENTIALS_MISSING: object storage requires STORAGE_ACCESS_KEY_ID and ' +
+            'STORAGE_SECRET_ACCESS_KEY');
     }
-    log.info(`[presigned-url-resolver] Initializing: bucket=${bucketName} endpoint=${endpoint}`);
-    const client = createS3Client({
-        provider: (cdn.provider || 'minio'),
-        region: awsRegion,
-        accessKeyId: awsAccessKey,
-        secretAccessKey: awsSecretKey,
-        ...(endpoint ? { endpoint } : {}),
-    });
-    s3Config = {
-        client,
-        bucket: bucketName,
-        region: awsRegion,
-        publicUrlPrefix,
-        ...(endpoint ? { endpoint, forcePathStyle: true } : {}),
-    };
-    return s3Config;
+    return { accessKeyId, secretAccessKey };
 }

package/esm/upload-resolver.d.ts

@@ -9,21 +9,15 @@
  * It used to be a second storage model: stream to `BUCKET_NAME` under a random
  * key, hand back a URL, record nothing. Objects written that way belonged to no
  * database, could not be deduplicated, listed, or access-controlled, and storage
- * GC could not see that a document still pointed at them. There is no
- * environment bucket in this path any more; `cdn.*` supplies S3 credentials and
- * an endpoint only.
+ * GC could not see that a document still pointed at them. Nothing in this path
+ * comes from the environment but the object-store credentials: the bucket and
+ * its connection (endpoint/provider/region) are the tenant's storage module.
  *
  * Compatibility: `image`/`upload` columns still receive `url` alongside the new
  * `id`/`key`/`bucket_id`/`size` fields, so existing readers of `photo.url` keep
  * working while they migrate to `id` + the files row's late-bound `downloadUrl`.
  *
- * ENV VARS (S3 connection only):
- *   BUCKET_PROVIDER  - 'minio' | 's3' (default: 'minio')
- *   AWS_REGION       - AWS region (default: 'us-east-1')
- *   Defaults come from `pgpmDefaults.cdn` (dev-only values; set these in production).
- *   AWS_ACCESS_KEY   - access key
- *   AWS_SECRET_KEY   - secret key
- *   CDN_ENDPOINT     - S3-compatible endpoint
+ * ENV VARS: STORAGE_ACCESS_KEY_ID, STORAGE_SECRET_ACCESS_KEY (required).
  */
 import type { UploadFieldDefinition } from 'graphile-upload-plugin';
 /**

package/esm/upload-resolver.js

@@ -9,70 +9,28 @@
  * It used to be a second storage model: stream to `BUCKET_NAME` under a random
  * key, hand back a URL, record nothing. Objects written that way belonged to no
  * database, could not be deduplicated, listed, or access-controlled, and storage
- * GC could not see that a document still pointed at them. There is no
- * environment bucket in this path any more; `cdn.*` supplies S3 credentials and
- * an endpoint only.
+ * GC could not see that a document still pointed at them. Nothing in this path
+ * comes from the environment but the object-store credentials: the bucket and
+ * its connection (endpoint/provider/region) are the tenant's storage module.
  *
  * Compatibility: `image`/`upload` columns still receive `url` alongside the new
  * `id`/`key`/`bucket_id`/`size` fields, so existing readers of `photo.url` keep
  * working while they migrate to `id` + the files row's late-bound `downloadUrl`.
  *
- * ENV VARS (S3 connection only):
- *   BUCKET_PROVIDER  - 'minio' | 's3' (default: 'minio')
- *   AWS_REGION       - AWS region (default: 'us-east-1')
- *   Defaults come from `pgpmDefaults.cdn` (dev-only values; set these in production).
- *   AWS_ACCESS_KEY   - access key
- *   AWS_SECRET_KEY   - secret key
- *   CDN_ENDPOINT     - S3-compatible endpoint
+ * ENV VARS: STORAGE_ACCESS_KEY_ID, STORAGE_SECRET_ACCESS_KEY (required).
  */
-import { getEnvOptions } from '@constructive-io/graphql-env';
 import Streamer from '@constructive-io/s3-streamer';
-import { Logger } from '@pgpmjs/logger';
 import { createHash, randomUUID } from 'crypto';
 import { finalizeStagedUpload, resolveManagedUploadTarget, withRequestPgClient, } from 'graphile-presigned-url-plugin';
 import { checkTypeAgreement } from 'mime-bytes';
 import { Transform } from 'stream';
-import { getPresignedUrlS3Config } from './presigned-url-resolver';
-const log = new Logger('upload-resolver');
+import { getStorageCredentials } from './presigned-url-resolver';
 const DEFAULT_IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/svg+xml'];
-let streamer = null;
-/**
- * The S3 streamer, built from the CDN connection settings.
- *
- * Deliberately constructed with no `defaultBucket`: every upload names the
- * bucket it resolved, and a default here would be an environment-owned bucket
- * standing in for a tenant's.
- */
-function getStreamer() {
-    if (streamer)
-        return streamer;
-    const { cdn } = getEnvOptions();
-    if (process.env.NODE_ENV === 'production' && (!cdn.awsAccessKey || !cdn.awsSecretKey)) {
-        log.warn('[upload-resolver] WARNING: CDN credentials not configured in production.');
-    }
-    const provider = cdn.provider;
-    log.info(`[upload-resolver] Initializing: provider=${provider}`);
-    streamer = new Streamer({
-        provider,
-        awsRegion: cdn.awsRegion,
-        awsAccessKey: cdn.awsAccessKey,
-        awsSecretKey: cdn.awsSecretKey,
-        endpoint: cdn.endpoint,
-    });
-    return streamer;
-}
-/**
- * The upload lane's view of the presigned plugin's options: the same S3
- * connection the presigned lane uses, so both transports resolve identical
- * coordinates for a bucket.
- *
- * Built on first upload rather than at import time.
- */
 let managedOptions = null;
 function getManagedOptions() {
     if (!managedOptions) {
         managedOptions = {
-            s3: getPresignedUrlS3Config,
+            credentials: getStorageCredentials,
         };
     }
     return managedOptions;
@@ -168,7 +126,7 @@ async function uploadResolver(upload, _args, context, info) {
             `bucket "${target.bucket.key}" is private, whose only URLs expire. Use an upload column, ` +
             'which stores the file id and resolves a fresh download URL on read.');
     }
-    const s3 = getStreamer();
+    const s3 = new Streamer({ client: target.s3.client, defaultBucket: target.physicalName });
     const { filename } = upload;
     // Validate before persisting: content type comes from the leading bytes, not
     // from the client's claim about them.

package/index.d.ts

@@ -35,4 +35,4 @@ export { ConstructivePreset, createConstructivePreset } from './presets/construc
 export * from './plugins/index';
 export * from './presets/index';
 export { makePgService };
-export { getPresignedUrlS3Config } from './presigned-url-resolver';
+export { getStorageCredentials } from './presigned-url-resolver';

package/index.js

@@ -42,7 +42,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPresignedUrlS3Config = exports.makePgService = exports.createConstructivePreset = exports.ConstructivePreset = exports.createGrafastCacheLimitsPreset = exports.createGrafastCacheLimitsPlugin = exports.applyGrafastCacheLimits = void 0;
+exports.getStorageCredentials = exports.makePgService = exports.createConstructivePreset = exports.ConstructivePreset = exports.createGrafastCacheLimitsPreset = exports.createGrafastCacheLimitsPlugin = exports.applyGrafastCacheLimits = void 0;
 // Import modules for type augmentation
 // These add properties to the GraphileConfig.Preset interface:
 // - grafserv: adds 'grafserv' property
@@ -65,4 +65,4 @@ __exportStar(require("./plugins/index"), exports);
 __exportStar(require("./presets/index"), exports);
 // Presigned URL utilities
 var presigned_url_resolver_1 = require("./presigned-url-resolver");
-Object.defineProperty(exports, "getPresignedUrlS3Config", { enumerable: true, get: function () { return presigned_url_resolver_1.getPresignedUrlS3Config; } });
+Object.defineProperty(exports, "getStorageCredentials", { enumerable: true, get: function () { return presigned_url_resolver_1.getStorageCredentials; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-settings",
-  "version": "6.24.7",
+  "version": "6.25.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "graphile settings",
   "main": "index.js",
@@ -30,38 +30,37 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1052.0",
-    "@constructive-io/bucket-provisioner": "^0.29.0",
-    "@constructive-io/graphql-env": "^3.34.5",
-    "@constructive-io/graphql-types": "^3.33.5",
-    "@constructive-io/s3-streamer": "^2.44.5",
-    "@constructive-io/s3-utils": "^2.34.0",
+    "@constructive-io/bucket-provisioner": "^0.30.0",
+    "@constructive-io/graphql-env": "^3.35.0",
+    "@constructive-io/graphql-types": "^3.34.0",
+    "@constructive-io/s3-streamer": "^2.45.0",
     "@constructive-io/upload-names": "^2.31.0",
     "@dataplan/json": "1.0.1",
     "@dataplan/pg": "1.1.1",
     "@graphile-contrib/pg-many-to-many": "2.0.0-rc.2",
     "@pgpmjs/logger": "^2.26.0",
-    "@pgpmjs/types": "^2.56.2",
+    "@pgpmjs/types": "^2.57.0",
     "@pgsql/quotes": "^18.2.4",
     "cors": "^2.8.6",
     "express": "^5.2.1",
     "grafast": "1.1.2",
     "grafserv": "1.0.1",
-    "graphile-bucket-provisioner-plugin": "1.16.0",
+    "graphile-bucket-provisioner-plugin": "1.17.0",
     "graphile-build": "5.1.1",
     "graphile-build-pg": "5.1.3",
-    "graphile-bulk-mutations": "^1.17.6",
+    "graphile-bulk-mutations": "^1.17.8",
     "graphile-config": "1.1.0",
-    "graphile-connection-filter": "^2.17.6",
-    "graphile-history": "^1.9.6",
-    "graphile-i18n": "^2.18.6",
-    "graphile-llm": "^1.18.6",
-    "graphile-ltree": "^2.17.6",
+    "graphile-connection-filter": "^2.17.8",
+    "graphile-history": "^1.9.8",
+    "graphile-i18n": "^2.18.8",
+    "graphile-llm": "^1.18.8",
+    "graphile-ltree": "^2.17.8",
     "graphile-meta": "^1.10.0",
-    "graphile-pg-aggregates": "^2.17.6",
-    "graphile-postgis": "^3.18.6",
-    "graphile-presigned-url-plugin": "^1.21.1",
+    "graphile-pg-aggregates": "^2.17.8",
+    "graphile-postgis": "^3.18.8",
+    "graphile-presigned-url-plugin": "^1.22.0",
     "graphile-realtime-subscriptions": "^1.12.0",
-    "graphile-search": "^2.17.6",
+    "graphile-search": "^2.17.8",
     "graphile-upload-plugin": "^2.27.0",
     "graphile-utils": "5.0.3",
     "graphql": "16.13.0",
@@ -76,11 +75,12 @@
     "tamedevil": "0.1.1"
   },
   "devDependencies": {
+    "@constructive-io/s3-utils": "^2.34.0",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.6",
     "@types/pg": "^8.20.4",
     "@types/request-ip": "^0.0.41",
-    "graphile-test": "^5.17.6",
+    "graphile-test": "^5.17.8",
     "makage": "^0.8.0",
     "nodemon": "^3.1.14",
     "ts-node": "^10.9.2"
@@ -92,5 +92,5 @@
     "constructive",
     "graphql"
   ],
-  "gitHead": "1bab719e353dad566819d58ba7912dd335ef51c4"
+  "gitHead": "1f3501d518e175803a1a3372cf9249922d82bfe5"
 }

package/presets/constructive-preset.js

@@ -142,7 +142,7 @@ function createConstructivePreset(options) {
     }
     if (opts.enablePresignedUploads) {
         presets.push((0, graphile_presigned_url_plugin_1.PresignedUrlPreset)({
-            s3: presigned_url_resolver_1.getPresignedUrlS3Config,
+            credentials: presigned_url_resolver_1.getStorageCredentials,
         }), (0, graphile_bucket_provisioner_plugin_1.BucketProvisionerPreset)());
     }
     if (opts.enableAggregates) {

package/presigned-url-resolver.d.ts

@@ -1,23 +1,10 @@
 /**
- * Presigned URL resolver for the Constructive presigned URL plugin.
+ * Object-store credentials for the presigned URL plugin.
  *
- * Reads CDN/S3 configuration from the standard env system
- * (getEnvOptions → pgpmDefaults + config files + env vars) and lazily
- * initializes an S3Client on first use.
- *
- * Follows the same lazy-init pattern as upload-resolver.ts.
- */
-import type { S3Config } from 'graphile-presigned-url-plugin';
-/**
- * Lazily initialize and return the S3Config for the presigned URL plugin.
- *
- * Reads CDN config on first call via getEnvOptions() (which already merges
- * pgpmDefaults → config file → env vars), creates an S3Client, and caches
- * the result. Same CDN config as upload-resolver.ts.
- *
- * NOTE: The `bucket` field here is only the connection's default and is never
- * uploaded to. Every managed upload names its bucket explicitly, resolved from
- * the tenant's logical bucket row; there is no environment-global upload
- * bucket.
+ * Credentials are the only storage input read from the environment
+ * (`STORAGE_ACCESS_KEY_ID` / `STORAGE_SECRET_ACCESS_KEY`). Endpoint, provider,
+ * region, bucket and public URL prefix are resolved per request from the
+ * tenant's `storage_module` row by the plugin itself.
  */
-export declare function getPresignedUrlS3Config(): S3Config;
+import type { StorageCredentials } from 'graphile-presigned-url-plugin';
+export declare function getStorageCredentials(): StorageCredentials;

package/presigned-url-resolver.js

@@ -1,64 +1,20 @@
 "use strict";
 /**
- * Presigned URL resolver for the Constructive presigned URL plugin.
+ * Object-store credentials for the presigned URL plugin.
  *
- * Reads CDN/S3 configuration from the standard env system
- * (getEnvOptions → pgpmDefaults + config files + env vars) and lazily
- * initializes an S3Client on first use.
- *
- * Follows the same lazy-init pattern as upload-resolver.ts.
+ * Credentials are the only storage input read from the environment
+ * (`STORAGE_ACCESS_KEY_ID` / `STORAGE_SECRET_ACCESS_KEY`). Endpoint, provider,
+ * region, bucket and public URL prefix are resolved per request from the
+ * tenant's `storage_module` row by the plugin itself.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPresignedUrlS3Config = getPresignedUrlS3Config;
+exports.getStorageCredentials = getStorageCredentials;
 const graphql_env_1 = require("@constructive-io/graphql-env");
-const s3_utils_1 = require("@constructive-io/s3-utils");
-const logger_1 = require("@pgpmjs/logger");
-const log = new logger_1.Logger('presigned-url-resolver');
-let s3Config = null;
-/**
- * Lazily initialize and return the S3Config for the presigned URL plugin.
- *
- * Reads CDN config on first call via getEnvOptions() (which already merges
- * pgpmDefaults → config file → env vars), creates an S3Client, and caches
- * the result. Same CDN config as upload-resolver.ts.
- *
- * NOTE: The `bucket` field here is only the connection's default and is never
- * uploaded to. Every managed upload names its bucket explicitly, resolved from
- * the tenant's logical bucket row; there is no environment-global upload
- * bucket.
- */
-function getPresignedUrlS3Config() {
-    if (s3Config)
-        return s3Config;
-    const { cdn } = (0, graphql_env_1.getEnvOptions)();
-    if (!cdn) {
-        throw new Error('[presigned-url-resolver] CDN config not found. ' +
-            'Ensure CDN environment variables (AWS_ACCESS_KEY, AWS_SECRET_KEY, etc.) ' +
-            'are set or that pgpmDefaults provides CDN fields.');
-    }
-    const { bucketName, awsRegion, awsAccessKey, awsSecretKey, endpoint, publicUrlPrefix } = cdn;
-    if (!awsAccessKey || !awsSecretKey) {
-        throw new Error('[presigned-url-resolver] Missing S3 credentials. ' +
-            'Set AWS_ACCESS_KEY and AWS_SECRET_KEY environment variables.');
-    }
-    if (!bucketName) {
-        throw new Error('[presigned-url-resolver] Missing CDN bucket name. ' +
-            'Set CDN_BUCKET_NAME environment variable.');
+function getStorageCredentials() {
+    const { accessKeyId, secretAccessKey } = (0, graphql_env_1.getEnvOptions)().storage ?? {};
+    if (!accessKeyId || !secretAccessKey) {
+        throw new Error('STORAGE_CREDENTIALS_MISSING: object storage requires STORAGE_ACCESS_KEY_ID and ' +
+            'STORAGE_SECRET_ACCESS_KEY');
     }
-    log.info(`[presigned-url-resolver] Initializing: bucket=${bucketName} endpoint=${endpoint}`);
-    const client = (0, s3_utils_1.createS3Client)({
-        provider: (cdn.provider || 'minio'),
-        region: awsRegion,
-        accessKeyId: awsAccessKey,
-        secretAccessKey: awsSecretKey,
-        ...(endpoint ? { endpoint } : {}),
-    });
-    s3Config = {
-        client,
-        bucket: bucketName,
-        region: awsRegion,
-        publicUrlPrefix,
-        ...(endpoint ? { endpoint, forcePathStyle: true } : {}),
-    };
-    return s3Config;
+    return { accessKeyId, secretAccessKey };
 }

package/upload-resolver.d.ts

@@ -9,21 +9,15 @@
  * It used to be a second storage model: stream to `BUCKET_NAME` under a random
  * key, hand back a URL, record nothing. Objects written that way belonged to no
  * database, could not be deduplicated, listed, or access-controlled, and storage
- * GC could not see that a document still pointed at them. There is no
- * environment bucket in this path any more; `cdn.*` supplies S3 credentials and
- * an endpoint only.
+ * GC could not see that a document still pointed at them. Nothing in this path
+ * comes from the environment but the object-store credentials: the bucket and
+ * its connection (endpoint/provider/region) are the tenant's storage module.
  *
  * Compatibility: `image`/`upload` columns still receive `url` alongside the new
  * `id`/`key`/`bucket_id`/`size` fields, so existing readers of `photo.url` keep
  * working while they migrate to `id` + the files row's late-bound `downloadUrl`.
  *
- * ENV VARS (S3 connection only):
- *   BUCKET_PROVIDER  - 'minio' | 's3' (default: 'minio')
- *   AWS_REGION       - AWS region (default: 'us-east-1')
- *   Defaults come from `pgpmDefaults.cdn` (dev-only values; set these in production).
- *   AWS_ACCESS_KEY   - access key
- *   AWS_SECRET_KEY   - secret key
- *   CDN_ENDPOINT     - S3-compatible endpoint
+ * ENV VARS: STORAGE_ACCESS_KEY_ID, STORAGE_SECRET_ACCESS_KEY (required).
  */
 import type { UploadFieldDefinition } from 'graphile-upload-plugin';
 /**

package/upload-resolver.js

@@ -10,75 +10,33 @@
  * It used to be a second storage model: stream to `BUCKET_NAME` under a random
  * key, hand back a URL, record nothing. Objects written that way belonged to no
  * database, could not be deduplicated, listed, or access-controlled, and storage
- * GC could not see that a document still pointed at them. There is no
- * environment bucket in this path any more; `cdn.*` supplies S3 credentials and
- * an endpoint only.
+ * GC could not see that a document still pointed at them. Nothing in this path
+ * comes from the environment but the object-store credentials: the bucket and
+ * its connection (endpoint/provider/region) are the tenant's storage module.
  *
  * Compatibility: `image`/`upload` columns still receive `url` alongside the new
  * `id`/`key`/`bucket_id`/`size` fields, so existing readers of `photo.url` keep
  * working while they migrate to `id` + the files row's late-bound `downloadUrl`.
  *
- * ENV VARS (S3 connection only):
- *   BUCKET_PROVIDER  - 'minio' | 's3' (default: 'minio')
- *   AWS_REGION       - AWS region (default: 'us-east-1')
- *   Defaults come from `pgpmDefaults.cdn` (dev-only values; set these in production).
- *   AWS_ACCESS_KEY   - access key
- *   AWS_SECRET_KEY   - secret key
- *   CDN_ENDPOINT     - S3-compatible endpoint
+ * ENV VARS: STORAGE_ACCESS_KEY_ID, STORAGE_SECRET_ACCESS_KEY (required).
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constructiveUploadFieldDefinitions = void 0;
-const graphql_env_1 = require("@constructive-io/graphql-env");
 const s3_streamer_1 = __importDefault(require("@constructive-io/s3-streamer"));
-const logger_1 = require("@pgpmjs/logger");
 const crypto_1 = require("crypto");
 const graphile_presigned_url_plugin_1 = require("graphile-presigned-url-plugin");
 const mime_bytes_1 = require("mime-bytes");
 const stream_1 = require("stream");
 const presigned_url_resolver_1 = require("./presigned-url-resolver");
-const log = new logger_1.Logger('upload-resolver');
 const DEFAULT_IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/svg+xml'];
-let streamer = null;
-/**
- * The S3 streamer, built from the CDN connection settings.
- *
- * Deliberately constructed with no `defaultBucket`: every upload names the
- * bucket it resolved, and a default here would be an environment-owned bucket
- * standing in for a tenant's.
- */
-function getStreamer() {
-    if (streamer)
-        return streamer;
-    const { cdn } = (0, graphql_env_1.getEnvOptions)();
-    if (process.env.NODE_ENV === 'production' && (!cdn.awsAccessKey || !cdn.awsSecretKey)) {
-        log.warn('[upload-resolver] WARNING: CDN credentials not configured in production.');
-    }
-    const provider = cdn.provider;
-    log.info(`[upload-resolver] Initializing: provider=${provider}`);
-    streamer = new s3_streamer_1.default({
-        provider,
-        awsRegion: cdn.awsRegion,
-        awsAccessKey: cdn.awsAccessKey,
-        awsSecretKey: cdn.awsSecretKey,
-        endpoint: cdn.endpoint,
-    });
-    return streamer;
-}
-/**
- * The upload lane's view of the presigned plugin's options: the same S3
- * connection the presigned lane uses, so both transports resolve identical
- * coordinates for a bucket.
- *
- * Built on first upload rather than at import time.
- */
 let managedOptions = null;
 function getManagedOptions() {
     if (!managedOptions) {
         managedOptions = {
-            s3: presigned_url_resolver_1.getPresignedUrlS3Config,
+            credentials: presigned_url_resolver_1.getStorageCredentials,
         };
     }
     return managedOptions;
@@ -174,7 +132,7 @@ async function uploadResolver(upload, _args, context, info) {
             `bucket "${target.bucket.key}" is private, whose only URLs expire. Use an upload column, ` +
             'which stores the file id and resolves a fresh download URL on read.');
     }
-    const s3 = getStreamer();
+    const s3 = new s3_streamer_1.default({ client: target.s3.client, defaultBucket: target.physicalName });
     const { filename } = upload;
     // Validate before persisting: content type comes from the leading bytes, not
     // from the client's claim about them.