@genoacms/adapter-gcp 0.7.1-fix.1 → 0.7.1-fix.3

package/dist/services/authorization/index.js

@@ -1,6 +1,7 @@
 import config from '../../config.js';
 import { ProjectsClient } from '@google-cloud/resource-manager';
-const authorizationConfig = config.authorization.providers.find((provider) => provider.name === 'gcp');
+const PROVIDER_NAME = '@genoacms/adapter-gcp/authorization';
+const authorizationConfig = config.authorization.providers.find((provider) => provider.name === PROVIDER_NAME);
 if (!authorizationConfig)
     throw new Error('authorization-provider-not-found');
 const projectId = authorizationConfig.projectId;

package/dist/services/database/index.js

@@ -1,6 +1,7 @@
 import config from '../../config.js';
 import { Firestore } from '@google-cloud/firestore';
-const firestoreConfig = config.database.providers.find((provider) => provider.name === 'firestore');
+const PROVIDER_NAME = '@genoacms/adapter-gcp/database';
+const firestoreConfig = config.database.providers.find((provider) => provider.name === PROVIDER_NAME);
 if (!firestoreConfig)
     throw new Error('firestore-provider-not-found');
 const firestore = new Firestore({

package/dist/services/storage/storage.js

@@ -1,13 +1,18 @@
 import config from '../../config.js';
 import { Storage } from '@google-cloud/storage';
-const storageConfig = config.storage.providers.find((provider) => provider.name === 'gcs');
+const PROVIDER_NAME = '@genoacms/adapter-gcp/storage';
+const storageConfig = config.storage.providers.find((provider) => provider.name === PROVIDER_NAME);
 if (!storageConfig)
     throw new Error('storage-provider-not-found');
 const storage = new Storage({
-    credentials: config.storage.credentials
+    credentials: storageConfig.credentials
 });
+const hasBucket = (name) => {
+    const has = config.storage.buckets.find((bucket) => bucket.name === name && bucket.providerName === PROVIDER_NAME);
+    return !!has;
+};
 const getBucket = (name) => {
-    if (!config.storage.buckets.includes(name))
+    if (!hasBucket(name))
         throw new Error('bucket-unregistered');
     const bucket = storage.bucket(name);
     return bucket;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.7.1-fix.1",
+  "version": "0.7.1-fix.3",
   "type": "module",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {

package/src/services/authorization/index.ts

@@ -2,7 +2,8 @@ import type { Adapter, AuthorizationProvider } from '@genoacms/cloudabstraction/
 import config from '../../config.js'
 import { ProjectsClient } from '@google-cloud/resource-manager'
 
-const authorizationConfig = config.authorization.providers.find((provider: AuthorizationProvider) => provider.name === 'gcp')
+const PROVIDER_NAME = '@genoacms/adapter-gcp/authorization'
+const authorizationConfig = config.authorization.providers.find((provider: AuthorizationProvider) => provider.name === PROVIDER_NAME)
 if (!authorizationConfig) throw new Error('authorization-provider-not-found')
 const projectId = authorizationConfig.projectId
 const resourceManager = new ProjectsClient({

package/src/services/database/index.ts

@@ -10,7 +10,8 @@ import type {
 import config from '../../config.js'
 import { Firestore } from '@google-cloud/firestore'
 
-const firestoreConfig = config.database.providers.find((provider: DatabaseProvider) => provider.name === 'firestore')
+const PROVIDER_NAME = '@genoacms/adapter-gcp/database'
+const firestoreConfig = config.database.providers.find((provider: DatabaseProvider) => provider.name === PROVIDER_NAME)
 if (!firestoreConfig) throw new Error('firestore-provider-not-found')
 const firestore = new Firestore({
   credentials: firestoreConfig.credentials,

package/src/services/storage/storage.ts

@@ -1,15 +1,21 @@
 import config from '../../config.js'
 import { type Bucket, Storage } from '@google-cloud/storage'
-import type { StorageProvider } from '@genoacms/cloudabstraction/storage'
+import type { StorageProvider, BucketInit } from '@genoacms/cloudabstraction/storage'
 
-const storageConfig = config.storage.providers.find((provider: StorageProvider) => provider.name === 'gcs')
+const PROVIDER_NAME = '@genoacms/adapter-gcp/storage'
+const storageConfig = config.storage.providers.find((provider: StorageProvider) => provider.name === PROVIDER_NAME)
 if (!storageConfig) throw new Error('storage-provider-not-found')
 const storage = new Storage({
-  credentials: config.storage.credentials
+  credentials: storageConfig.credentials
 })
 
+const hasBucket = (name: string): boolean => {
+  const has = config.storage.buckets.find((bucket: BucketInit) => bucket.name === name && bucket.providerName === PROVIDER_NAME)
+  return !!has
+}
+
 const getBucket = (name: string): Bucket => {
-  if (!config.storage.buckets.includes(name)) throw new Error('bucket-unregistered')
+  if (!hasBucket(name)) throw new Error('bucket-unregistered')
   const bucket = storage.bucket(name)
   return bucket
 }