@genoacms/adapter-gcp 0.7.8 → 0.8.2-1

package/dist/services/authorization/index.js

@@ -1,13 +1,11 @@
-import config from '../../config.js';
+import { getProvider } from '@genoacms/cloudabstraction';
 import { ProjectsClient } from '@google-cloud/resource-manager';
-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;
+const ADAPTER_PATH = '@genoacms/adapter-gcp/authorization';
+const provider = getProvider('authorization', ADAPTER_PATH);
+const projectId = provider.projectId;
 const resourceManager = new ProjectsClient({
     projectId,
-    credentials: authorizationConfig.credentials
+    credentials: provider.credentials
 });
 const isEmailAdmins = async (email) => {
     const resource = `projects/${projectId}`;

package/dist/services/database/index.js

@@ -1,13 +1,11 @@
-import config from '../../config.js';
 import { Firestore } from '@google-cloud/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');
+import { getProvider } from '@genoacms/cloudabstraction';
+const ADAPTER_PATH = '@genoacms/adapter-gcp/database';
+const provider = getProvider('database', ADAPTER_PATH);
 const firestore = new Firestore({
-    credentials: firestoreConfig.credentials,
-    databaseId: firestoreConfig.databaseId,
-    projectId: firestoreConfig.projectId
+    credentials: provider.credentials,
+    databaseId: provider.databaseId,
+    projectId: provider.projectId
 });
 const createDocument = async (reference, data) => {
     const document = await firestore.collection(reference.name).add(data);

package/dist/services/deployment/deploy.js

@@ -1,15 +1,16 @@
-import config from '../../config.js';
 import { createReadStream, createWriteStream } from 'node:fs';
 import { resolve, dirname, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { v2 } from '@google-cloud/functions';
 import archiver from 'archiver';
+import { getProvider } from '@genoacms/cloudabstraction';
+const ADAPTER_PATH = '@genoacms/adapter-gcp/deployment';
 const { FunctionServiceClient } = v2;
+const provider = getProvider('deployment', ADAPTER_PATH);
 const functionsClient = new FunctionServiceClient({
-    credentials: config.deployment.credentials
+    credentials: provider.credentials
 });
-const projectId = config.deployment.projectId;
-const region = config.deployment.region;
+const { projectId, region, functionName } = provider;
 const currentDir = dirname(fileURLToPath(import.meta.url));
 async function createZip(source, injectPaths, ignorePaths, out) {
     await new Promise((resolve, reject) => {
@@ -109,6 +110,6 @@ async function deploy() {
     ];
     await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath);
     const functionStorageSource = await uploadSource(buildArchivePath);
-    await deployFunction('genoacms', functionStorageSource);
+    await deployFunction(functionName ?? 'genoacms', functionStorageSource);
 }
 export default deploy;

package/dist/services/deployment/index.d.ts

@@ -1,4 +1,4 @@
 import type { Adapter } from '@genoacms/cloudabstraction/deployment';
-declare const svelteKitAdapter: Adapter.svelteKitAdapter;
-declare const deployProcedure: Adapter.deployProcedure;
+declare const svelteKitAdapter: Adapter['svelteKitAdapter'];
+declare const deployProcedure: Adapter['deployProcedure'];
 export { svelteKitAdapter, deployProcedure };

package/dist/services/storage/index.js

@@ -55,7 +55,13 @@ const listDirectory = async ({ bucket, name }, listingParams = {}) => {
                 lastModified: new Date(file.metadata.updated)
             };
         }),
-        directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name).map(i => i.replace(name, ''))
+        directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name).map(i => {
+            const object = {
+                bucket,
+                name: i
+            };
+            return object;
+        })
     };
 };
 const createDirectory = async ({ bucket, name }) => {

package/dist/services/storage/storage.js

@@ -1,14 +1,14 @@
-import config from '../../config.js';
 import { Storage } from '@google-cloud/storage';
-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');
+import { getProvider } from '@genoacms/cloudabstraction';
+import config from '../../config.js';
+const ADAPTER_PATH = '@genoacms/adapter-gcp/storage';
+const provider = getProvider('storage', ADAPTER_PATH);
 const storage = new Storage({
-    credentials: storageConfig.credentials
+    credentials: provider.credentials
 });
 const hasBucket = (name) => {
-    const has = config.storage.buckets.find((bucket) => bucket.name === name && bucket.providerName === PROVIDER_NAME);
+    const has = config.storage.buckets.find((bucket) => bucket.name === name &&
+        bucket.providerName === provider.name);
     return !!has;
 };
 const getBucket = (name) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.7.8",
+  "version": "0.8.2-1",
   "type": "module",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
@@ -20,7 +20,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@genoacms/cloudabstraction": "^0.7.8",
+    "@genoacms/cloudabstraction": "^0.8.2",
     "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/functions": "^3.4.0",
     "@google-cloud/resource-manager": "^5.1.0",

package/src/config.ts

@@ -1,4 +1,4 @@
-import type Config from './genoa.config.js'
+import type { Config } from './genoa.config.js'
 import { config } from '@genoacms/cloudabstraction'
 
 export default config satisfies Config

package/src/genoa.config.d.ts

@@ -1,4 +1,8 @@
-import type Config from '@genoacms/cloudabstraction/src/genoa.config.js'
+import type { Config as ConfigG } from '@genoacms/cloudabstraction/src/genoa.config.js'
+import type { AuthorizationProvider as AuthorizationProviderG } from '@genoacms/cloudabstraction/authorization'
+import type { DatabaseProvider as DatabaseProviderG } from '@genoacms/cloudabstraction/database'
+import type { DeploymentProvider as DeploymentProviderG } from '@genoacms/cloudabstraction/deployment'
+import type { StorageProvider as StorageProviderG } from '@genoacms/cloudabstraction/storage'
 
 interface Credentials {
   type: string
@@ -14,17 +18,34 @@ interface Credentials {
   'universe_domain': string
 }
 
-interface DatabaseConfig {
+interface AuthorizationProvider extends AuthorizationProviderG {
+  projectId: string
+  credentials: Credentials
+}
+
+interface DatabaseProvider extends DatabaseProviderG {
+  projectId: string
   credentials: Credentials
   databaseId: string
   region: string
 }
+interface DeploymentProvider extends DeploymentProviderG {
+  projectId: string
+  credentials: Credentials
+  region: string
+  functionName: string
+}
 
-interface StorageConfig {
+interface StorageProvider extends StorageProviderG {
   credentials: Credentials
-  buckets: string[]
 }
 
-interface ConfigGCP extends Config<object, object, DatabaseConfig, StorageConfig> {}
+interface Config extends ConfigG<object, AuthorizationProvider, DatabaseProvider, StorageProvider> {}
 
-export default ConfigGCP
+export type {
+  Config,
+  AuthorizationProvider,
+  DatabaseProvider,
+  DeploymentProvider,
+  StorageProvider
+}

package/src/services/authorization/index.ts

@@ -1,14 +1,14 @@
-import type { Adapter, AuthorizationProvider } from '@genoacms/cloudabstraction/authorization'
-import config from '../../config.js'
+import type { Adapter } from '@genoacms/cloudabstraction/authorization'
+import type { AuthorizationProvider } from '../../genoa.config.js'
+import { getProvider } from '@genoacms/cloudabstraction'
 import { ProjectsClient } from '@google-cloud/resource-manager'
 
-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 ADAPTER_PATH = '@genoacms/adapter-gcp/authorization'
+const provider = getProvider('authorization', ADAPTER_PATH) as AuthorizationProvider
+const projectId = provider.projectId
 const resourceManager = new ProjectsClient({
   projectId,
-  credentials: authorizationConfig.credentials
+  credentials: provider.credentials
 })
 
 const isEmailAdmins: Adapter.isEmailAdmins = async (email: string) => {

package/src/services/database/index.ts

@@ -1,22 +1,23 @@
 import type {
   Adapter,
-  DatabaseProvider,
   CollectionSnapshot,
   Document,
   DocumentReference,
   DocumentSnapshot,
   UpdateSnapshot
 } from '@genoacms/cloudabstraction/database'
-import config from '../../config.js'
+import type {
+  DatabaseProvider
+} from '../../genoa.config.js'
 import { Firestore } from '@google-cloud/firestore'
+import { getProvider } from '@genoacms/cloudabstraction'
 
-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 ADAPTER_PATH = '@genoacms/adapter-gcp/database'
+const provider = getProvider('database', ADAPTER_PATH) as DatabaseProvider
 const firestore = new Firestore({
-  credentials: firestoreConfig.credentials,
-  databaseId: firestoreConfig.databaseId,
-  projectId: firestoreConfig.projectId
+  credentials: provider.credentials,
+  databaseId: provider.databaseId,
+  projectId: provider.projectId
 })
 
 const createDocument: Adapter['createDocument'] = async (reference, data) => {

package/src/services/deployment/deploy.ts

@@ -1,18 +1,20 @@
-import config from '../../config.js'
+import type { google } from '@google-cloud/functions/build/protos/protos.js'
+import { type DeploymentProvider } from '../../genoa.config.js'
 import { createReadStream, createWriteStream } from 'node:fs'
 import { resolve, dirname, basename } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { v2 } from '@google-cloud/functions'
 import archiver from 'archiver'
-import type { google } from '@google-cloud/functions/build/protos/protos.js'
+import { getProvider } from '@genoacms/cloudabstraction'
 type IStorageSource = google.cloud.functions.v2.IStorageSource
 
+const ADAPTER_PATH = '@genoacms/adapter-gcp/deployment'
 const { FunctionServiceClient } = v2
+const provider = getProvider('deployment', ADAPTER_PATH) as DeploymentProvider
 const functionsClient = new FunctionServiceClient({
-  credentials: config.deployment.credentials
+  credentials: provider.credentials
 })
-const projectId = config.deployment.projectId
-const region = config.deployment.region
+const { projectId, region, functionName } = provider
 
 const currentDir = dirname(fileURLToPath(import.meta.url))
 
@@ -117,7 +119,7 @@ async function deploy (): Promise<void> {
   ]
   await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath)
   const functionStorageSource = await uploadSource(buildArchivePath)
-  await deployFunction('genoacms', functionStorageSource)
+  await deployFunction(functionName ?? 'genoacms', functionStorageSource)
 }
 
 export default deploy

package/src/services/deployment/index.ts

@@ -1,8 +1,8 @@
 import type { Adapter } from '@genoacms/cloudabstraction/deployment'
 
-const svelteKitAdapter: Adapter.svelteKitAdapter = '@genoacms/sveltekit-adapter-cloud-run-functions'
+const svelteKitAdapter: Adapter['svelteKitAdapter'] = '@genoacms/sveltekit-adapter-cloud-run-functions'
 
-const deployProcedure: Adapter.deployProcedure = async () => {
+const deployProcedure: Adapter['deployProcedure'] = async () => {
   const deploy = (await import('./deploy.js')).default
   await deploy()
 }

package/src/services/storage/index.ts

@@ -1,5 +1,6 @@
 import type {
   Adapter,
+  ObjectReference,
   StorageObject
 } from '@genoacms/cloudabstraction/storage'
 import { type File } from '@google-cloud/storage'
@@ -71,7 +72,13 @@ const listDirectory: Adapter['listDirectory'] = async ({ bucket, name }, listing
         lastModified: new Date(file.metadata.updated as string)
       } satisfies StorageObject
     }),
-    directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name).map(i => i.replace(name, ''))
+    directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name).map(i => {
+      const object: ObjectReference = {
+        bucket,
+        name: i
+      }
+      return object
+    })
   }
 }
 

package/src/services/storage/storage.ts

@@ -1,16 +1,18 @@
-import config from '../../config.js'
+import type { BucketInit } from '@genoacms/cloudabstraction/storage'
+import type { StorageProvider } from '../../genoa.config.js'
 import { type Bucket, Storage } from '@google-cloud/storage'
-import type { StorageProvider, BucketInit } from '@genoacms/cloudabstraction/storage'
+import { getProvider } from '@genoacms/cloudabstraction'
+import config from '../../config.js'
 
-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 ADAPTER_PATH = '@genoacms/adapter-gcp/storage'
+const provider = getProvider('storage', ADAPTER_PATH) as StorageProvider
 const storage = new Storage({
-  credentials: storageConfig.credentials
+  credentials: provider.credentials
 })
 
 const hasBucket = (name: string): boolean => {
-  const has = config.storage.buckets.find((bucket: BucketInit) => bucket.name === name && bucket.providerName === PROVIDER_NAME)
+  const has = config.storage.buckets.find((bucket: BucketInit) => bucket.name === name &&
+    bucket.providerName === provider.name)
   return !!has
 }