Merge branch 'devin/1775215835-bucket-provisioner-plugin' into devin/1775257329-cors-allowed-origins

Author: pyramation

graphile/graphile-bucket-provisioner-plugin/src/index.ts

@@ -12,17 +12,24 @@
  * @example
  * ```typescript
  * import { BucketProvisionerPreset } from 'graphile-bucket-provisioner-plugin';
+ * import { getEnvOptions } from '@constructive-io/graphql-env';
+ *
+ * // Use a lazy getter so env vars are read at runtime, not import time
+ * function getConnection() {
+ *   const { cdn } = getEnvOptions();
+ *   return {
+ *     provider: cdn?.provider || 'minio',
+ *     region: cdn?.awsRegion || 'us-east-1',
+ *     endpoint: cdn?.endpoint || 'http://minio:9000',
+ *     accessKeyId: cdn?.awsAccessKey!,
+ *     secretAccessKey: cdn?.awsSecretKey!,
+ *   };
+ * }
  *
  * const preset = {
  *   extends: [
  *     BucketProvisionerPreset({
- *       connection: {
- *         provider: 'minio',
- *         region: 'us-east-1',
- *         endpoint: 'http://minio:9000',
- *         accessKeyId: process.env.MINIO_ACCESS_KEY!,
- *         secretAccessKey: process.env.MINIO_SECRET_KEY!,
- *       },
+ *       connection: getConnection, // pass function ref, NOT getConnection()
  *       allowedOrigins: ['https://app.example.com'],
  *       bucketNamePrefix: 'myapp',
  *     }),

graphile/graphile-bucket-provisioner-plugin/src/preset.ts

@@ -15,17 +15,24 @@ import { createBucketProvisionerPlugin } from './plugin';
  * @example
  * ```typescript
  * import { BucketProvisionerPreset } from 'graphile-bucket-provisioner-plugin';
+ * import { getEnvOptions } from '@constructive-io/graphql-env';
+ *
+ * // Use a lazy getter so env vars are read at runtime, not import time
+ * function getConnection() {
+ *   const { cdn } = getEnvOptions();
+ *   return {
+ *     provider: cdn?.provider || 'minio',
+ *     region: cdn?.awsRegion || 'us-east-1',
+ *     endpoint: cdn?.endpoint || 'http://minio:9000',
+ *     accessKeyId: cdn?.awsAccessKey!,
+ *     secretAccessKey: cdn?.awsSecretKey!,
+ *   };
+ * }
  *
  * const preset = {
  *   extends: [
  *     BucketProvisionerPreset({
- *       connection: {
- *         provider: 'minio',
- *         region: 'us-east-1',
- *         endpoint: 'http://minio:9000',
- *         accessKeyId: process.env.MINIO_ACCESS_KEY!,
- *         secretAccessKey: process.env.MINIO_SECRET_KEY!,
- *       },
+ *       connection: getConnection, // pass function ref, NOT getConnection()
  *       allowedOrigins: ['https://app.example.com'],
  *       bucketNamePrefix: 'myapp',
  *     }),

graphile/graphile-settings/package.json

@@ -44,6 +44,7 @@
     "express": "^5.2.1",
     "grafast": "1.0.0",
     "grafserv": "1.0.0",
+    "graphile-bucket-provisioner-plugin": "workspace:*",
     "graphile-build": "5.0.0",
     "graphile-build-pg": "5.0.0",
     "graphile-config": "1.0.0",

graphile/graphile-settings/src/bucket-provisioner-resolver.ts

@@ -0,0 +1,48 @@
+/**
+ * Bucket provisioner resolver for the Constructive bucket provisioner plugin.
+ *
+ * Reads CDN/S3 configuration from the standard env system
+ * (getEnvOptions -> pgpmDefaults + config files + env vars) and lazily
+ * returns a StorageConnectionConfig on first use.
+ *
+ * Follows the same lazy-init pattern as presigned-url-resolver.ts.
+ */
+
+import { getEnvOptions } from '@constructive-io/graphql-env';
+import { Logger } from '@pgpmjs/logger';
+import type { StorageConnectionConfig } from 'graphile-bucket-provisioner-plugin';
+
+const log = new Logger('bucket-provisioner-resolver');
+
+let connectionConfig: StorageConnectionConfig | null = null;
+
+/**
+ * Lazily initialize and return the StorageConnectionConfig for the
+ * bucket provisioner plugin.
+ *
+ * Reads CDN config on first call via getEnvOptions() (which already merges
+ * pgpmDefaults -> config file -> env vars) and caches the result.
+ * Same CDN config source as presigned-url-resolver.ts.
+ */
+export function getBucketProvisionerConnection(): StorageConnectionConfig {
+  if (connectionConfig) return connectionConfig;
+
+  const { cdn } = getEnvOptions();
+
+  // cdn is guaranteed populated — pgpmDefaults provides all CDN fields
+  const { provider, awsRegion, awsAccessKey, awsSecretKey, endpoint } = cdn!;
+
+  log.info(
+    `[bucket-provisioner-resolver] Initializing: provider=${provider} endpoint=${endpoint}`,
+  );
+
+  connectionConfig = {
+    provider: (provider as StorageConnectionConfig['provider']) || 'minio',
+    region: awsRegion || 'us-east-1',
+    accessKeyId: awsAccessKey!,
+    secretAccessKey: awsSecretKey!,
+    ...(endpoint ? { endpoint, forcePathStyle: true } : {}),
+  };
+
+  return connectionConfig;
+}

graphile/graphile-settings/src/index.ts

@@ -62,3 +62,6 @@ export { streamToStorage } from './upload-resolver';
 
 // Presigned URL utilities
 export { getPresignedUrlS3Config } from './presigned-url-resolver';
+
+// Bucket provisioner utilities
+export { getBucketProvisionerConnection } from './bucket-provisioner-resolver';

graphile/graphile-settings/src/presets/constructive-preset.ts

@@ -16,9 +16,11 @@ import { UnifiedSearchPreset, createMatchesOperatorFactory, createTrgmOperatorFa
 import { GraphilePostgisPreset, createPostgisOperatorFactory } from 'graphile-postgis';
 import { UploadPreset } from 'graphile-upload-plugin';
 import { PresignedUrlPreset } from 'graphile-presigned-url-plugin';
+import { BucketProvisionerPreset } from 'graphile-bucket-provisioner-plugin';
 import { SqlExpressionValidatorPreset } from 'graphile-sql-expression-validator';
 import { constructiveUploadFieldDefinitions } from '../upload-resolver';
 import { getPresignedUrlS3Config } from '../presigned-url-resolver';
+import { getBucketProvisionerConnection } from '../bucket-provisioner-resolver';
 
 /**
  * Constructive PostGraphile v5 Preset
@@ -39,6 +41,8 @@ import { getPresignedUrlS3Config } from '../presigned-url-resolver';
  * - PostGIS connection filter operators (spatial filtering on geometry/geography columns)
  * - Upload plugin (file upload to S3/MinIO for image, upload, attachment domain columns)
  * - Presigned URL plugin (requestUploadUrl, confirmUpload mutations + downloadUrl computed field)
+ * - Bucket provisioner plugin (auto-provisions S3 buckets on @storageBuckets table mutations,
+ *   CORS management, provisionBucket mutation for manual/retry)
  * - SQL expression validator (validates @sqlExpression columns in mutations)
  * - PG type mappings (maps custom types like email, url to GraphQL scalars)
  * - pgvector search (auto-discovers vector columns: filter fields, distance computed fields,
@@ -87,6 +91,10 @@ export const ConstructivePreset: GraphileConfig.Preset = {
       maxFileSize: 10 * 1024 * 1024, // 10MB
     }),
     PresignedUrlPreset({ s3: getPresignedUrlS3Config }),
+    BucketProvisionerPreset({
+      connection: getBucketProvisionerConnection,
+      allowedOrigins: ['http://localhost:3000'],
+    }),
     SqlExpressionValidatorPreset(),
     PgTypeMappingsPreset,
     RequiredInputPreset,