@constructive-io/graphql-server 2.10.35 → 2.11.0

package/esm/scripts/create-bucket.js

@@ -1,12 +1,16 @@
-// Minimal script to create a bucket in MinIO using @constructive-io/s3-utils
+// Minimal script to create a bucket in MinIO/S3 using @constructive-io/s3-utils
 // Avoid strict type coupling between different @aws-sdk/client-s3 versions
 import { S3Client } from '@aws-sdk/client-s3';
 import { createS3Bucket } from '@constructive-io/s3-utils';
 import { getEnvOptions } from '@constructive-io/graphql-env';
+import { Logger } from '@pgpmjs/logger';
+const log = new Logger('create-bucket');
 (async () => {
     try {
         const opts = getEnvOptions();
         const { cdn } = opts;
+        const provider = cdn?.provider || 'minio';
+        const isMinio = provider === 'minio';
         const bucket = cdn?.bucketName || 'test-bucket';
         const region = cdn?.awsRegion || 'us-east-1';
         const accessKey = cdn?.awsAccessKey || 'minioadmin';
@@ -15,17 +19,22 @@ import { getEnvOptions } from '@constructive-io/graphql-env';
         const client = new S3Client({
             region,
             credentials: { accessKeyId: accessKey, secretAccessKey: secretKey },
-            endpoint,
-            forcePathStyle: true,
+            ...(isMinio ? {
+                endpoint,
+                forcePathStyle: true,
+            } : {}),
         });
-        // Hint downstream to apply MinIO policies
-        process.env.IS_MINIO = 'true';
-        const res = await createS3Bucket(client, bucket);
-        console.log(`[create-bucket] ${bucket}:`, res);
+        const res = await createS3Bucket(client, bucket, { provider });
+        if (res.success) {
+            log.success(`${bucket} (provider: ${provider})`);
+        }
+        else {
+            log.error(`Failed to create bucket ${bucket}`);
+        }
         client.destroy();
     }
     catch (e) {
-        console.error('[create-bucket] error', e);
+        log.error('error', e);
         process.exitCode = 1;
     }
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "2.10.35",
+  "version": "2.11.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -39,35 +39,35 @@
     "backend"
   ],
   "dependencies": {
-    "@constructive-io/graphql-env": "^2.8.11",
-    "@constructive-io/graphql-types": "^2.12.8",
-    "@constructive-io/s3-utils": "^2.3.8",
+    "@constructive-io/graphql-env": "^2.8.12",
+    "@constructive-io/graphql-types": "^2.12.9",
+    "@constructive-io/s3-utils": "^2.4.0",
     "@constructive-io/upload-names": "^2.3.5",
     "@constructive-io/url-domains": "^2.3.6",
     "@graphile-contrib/pg-many-to-many": "^1.0.2",
     "@pgpmjs/logger": "^1.3.5",
-    "@pgpmjs/server-utils": "^2.8.11",
-    "@pgpmjs/types": "^2.12.8",
+    "@pgpmjs/server-utils": "^2.8.12",
+    "@pgpmjs/types": "^2.13.0",
     "cors": "^2.8.5",
     "express": "^5.2.1",
     "graphile-build": "^4.14.1",
-    "graphile-cache": "^1.6.11",
-    "graphile-i18n": "^0.2.39",
-    "graphile-meta-schema": "^0.3.39",
-    "graphile-plugin-connection-filter": "^2.4.39",
-    "graphile-plugin-connection-filter-postgis": "^1.1.40",
-    "graphile-plugin-fulltext-filter": "^2.1.39",
+    "graphile-cache": "^1.6.12",
+    "graphile-i18n": "^0.2.41",
+    "graphile-meta-schema": "^0.3.41",
+    "graphile-plugin-connection-filter": "^2.4.41",
+    "graphile-plugin-connection-filter-postgis": "^1.1.42",
+    "graphile-plugin-fulltext-filter": "^2.1.41",
     "graphile-query": "^2.4.6",
-    "graphile-search-plugin": "^0.2.39",
-    "graphile-settings": "^2.9.35",
-    "graphile-simple-inflector": "^0.2.39",
+    "graphile-search-plugin": "^0.2.41",
+    "graphile-settings": "^2.10.0",
+    "graphile-simple-inflector": "^0.2.41",
     "graphile-utils": "^4.14.1",
     "graphql": "15.10.1",
     "graphql-tag": "2.12.6",
     "graphql-upload": "^13.0.0",
     "lru-cache": "^11.2.4",
     "pg": "^8.16.3",
-    "pg-cache": "^1.6.11",
+    "pg-cache": "^1.6.12",
     "pg-query-context": "^2.3.6",
     "postgraphile": "^4.14.1",
     "request-ip": "^3.3.0"
@@ -83,5 +83,5 @@
     "nodemon": "^3.1.10",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "324881a46912b7d15a76f864aada03ce926f9176"
+  "gitHead": "f04912cac2edf6435c6add5a6ec65a11d6b79df2"
 }

package/scripts/create-bucket.js

@@ -1,14 +1,18 @@
 "use strict";
-// Minimal script to create a bucket in MinIO using @constructive-io/s3-utils
+// Minimal script to create a bucket in MinIO/S3 using @constructive-io/s3-utils
 // Avoid strict type coupling between different @aws-sdk/client-s3 versions
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_utils_1 = require("@constructive-io/s3-utils");
 const graphql_env_1 = require("@constructive-io/graphql-env");
+const logger_1 = require("@pgpmjs/logger");
+const log = new logger_1.Logger('create-bucket');
 (async () => {
     try {
         const opts = (0, graphql_env_1.getEnvOptions)();
         const { cdn } = opts;
+        const provider = cdn?.provider || 'minio';
+        const isMinio = provider === 'minio';
         const bucket = cdn?.bucketName || 'test-bucket';
         const region = cdn?.awsRegion || 'us-east-1';
         const accessKey = cdn?.awsAccessKey || 'minioadmin';
@@ -17,17 +21,22 @@ const graphql_env_1 = require("@constructive-io/graphql-env");
         const client = new client_s3_1.S3Client({
             region,
             credentials: { accessKeyId: accessKey, secretAccessKey: secretKey },
-            endpoint,
-            forcePathStyle: true,
+            ...(isMinio ? {
+                endpoint,
+                forcePathStyle: true,
+            } : {}),
         });
-        // Hint downstream to apply MinIO policies
-        process.env.IS_MINIO = 'true';
-        const res = await (0, s3_utils_1.createS3Bucket)(client, bucket);
-        console.log(`[create-bucket] ${bucket}:`, res);
+        const res = await (0, s3_utils_1.createS3Bucket)(client, bucket, { provider });
+        if (res.success) {
+            log.success(`${bucket} (provider: ${provider})`);
+        }
+        else {
+            log.error(`Failed to create bucket ${bucket}`);
+        }
         client.destroy();
     }
     catch (e) {
-        console.error('[create-bucket] error', e);
+        log.error('error', e);
         process.exitCode = 1;
     }
 })();