refactor: use getEnvOptions() CDN defaults instead of inline fallbacks

getEnvOptions() already deep-merges pgpmDefaults.cdn with config files
and env vars — no need to re-default every field manually. Just
destructure cdn directly from the merged options.

Author: pyramation

graphile/graphile-settings/src/presigned-url-resolver.ts

@@ -1,19 +1,11 @@
 /**
  * Presigned URL resolver for the Constructive presigned URL plugin.
  *
- * Reads CDN/S3/MinIO configuration from environment variables (via getEnvOptions)
- * and lazily initializes an S3Client on first use to avoid requiring
- * env vars at module load time.
+ * Reads CDN/S3/MinIO 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.
- *
- * ENV VARS (via CDNOptions):
- *   BUCKET_PROVIDER  - 'minio' | 's3' (default: 'minio')
- *   BUCKET_NAME      - bucket name (default: 'test-bucket')
- *   AWS_REGION       - AWS region (default: 'us-east-1')
- *   AWS_ACCESS_KEY   - access key (default: 'minioadmin')
- *   AWS_SECRET_KEY   - secret key (default: 'minioadmin')
- *   MINIO_ENDPOINT   - MinIO endpoint (default: 'http://localhost:9000')
  */
 
 import { S3Client } from '@aws-sdk/client-s3';
@@ -28,54 +20,41 @@ let s3Config: S3Config | null = null;
 /**
  * Lazily initialize and return the S3Config for the presigned URL plugin.
  *
- * Reads CDN env vars on first call, creates an S3Client, and caches the
- * config for subsequent calls. Same env vars as upload-resolver.ts.
- *
- * For MinIO, constructs a publicUrlPrefix from the endpoint + bucket name
- * so that public file download URLs resolve correctly.
+ * 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.
  */
 export function getPresignedUrlS3Config(): S3Config {
   if (s3Config) return s3Config;
 
-  const opts = getEnvOptions();
-  const cdn = opts.cdn || {};
+  const { cdn } = getEnvOptions();
 
-  const provider = cdn.provider || 'minio';
+  // cdn is guaranteed populated — pgpmDefaults provides all CDN fields
+  const { provider, bucketName, awsRegion, awsAccessKey, awsSecretKey, minioEndpoint } = cdn!;
   const isMinio = provider === 'minio';
-  const bucket = cdn.bucketName || 'test-bucket';
-  const region = cdn.awsRegion || 'us-east-1';
-  const accessKey = cdn.awsAccessKey || 'minioadmin';
-  const secretKey = cdn.awsSecretKey || 'minioadmin';
-  const endpoint = cdn.minioEndpoint || 'http://localhost:9000';
-
-  if (process.env.NODE_ENV === 'production') {
-    if (!cdn.awsAccessKey || !cdn.awsSecretKey) {
-      log.warn('[presigned-url-resolver] WARNING: Using default credentials in production.');
-    }
-  }
 
   log.info(
-    `[presigned-url-resolver] Initializing: provider=${provider} bucket=${bucket}`,
+    `[presigned-url-resolver] Initializing: provider=${provider} bucket=${bucketName}`,
   );
 
   const client = new S3Client({
-    region,
-    credentials: { accessKeyId: accessKey, secretAccessKey: secretKey },
-    ...(isMinio ? { endpoint, forcePathStyle: true } : {}),
+    region: awsRegion,
+    credentials: { accessKeyId: awsAccessKey!, secretAccessKey: awsSecretKey! },
+    ...(isMinio ? { endpoint: minioEndpoint, forcePathStyle: true } : {}),
   });
 
   // For MinIO (path-style), public URL prefix is endpoint/bucket.
   // For S3 (virtual-hosted), it's https://{bucket}.s3.{region}.amazonaws.com
   const publicUrlPrefix = isMinio
-    ? `${endpoint}/${bucket}`
-    : `https://${bucket}.s3.${region}.amazonaws.com`;
+    ? `${minioEndpoint}/${bucketName}`
+    : `https://${bucketName}.s3.${awsRegion}.amazonaws.com`;
 
   s3Config = {
     client,
-    bucket,
-    region,
+    bucket: bucketName!,
+    region: awsRegion,
     publicUrlPrefix,
-    ...(isMinio ? { endpoint, forcePathStyle: true } : {}),
+    ...(isMinio ? { endpoint: minioEndpoint, forcePathStyle: true } : {}),
   };
 
   return s3Config;