@genoacms/adapter-gcp 0.7.1 → 0.7.9

package/deployment/snippets/index.js

@@ -1,4 +1,4 @@
-import { handler } from './build/handler.js'
+import { handler } from './node_modules/@genoacms/core/build/index.js'
 
 function genoacms (req, res) {
   handler(req, res, undefined)

package/dist/services/authorization/index.js

@@ -1,13 +1,14 @@
 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;
 const resourceManager = new ProjectsClient({
-    projectId: config.authorization.projectId,
-    credentials: config.authorization.credentials
+    projectId,
+    credentials: authorizationConfig.credentials
 });
-const projectId = config.authorization.projectId;
 const isEmailAdmins = async (email) => {
     const resource = `projects/${projectId}`;
     const role = resource + '/roles/genoacms';

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/deployment/deploy.js

@@ -22,7 +22,7 @@ async function createZip(source, injectPaths, ignorePaths, out) {
             reject(err);
         });
         archive.pipe(output);
-        archive.glob(source, { ignore: ignorePaths });
+        archive.glob(source, { ignore: ignorePaths, follow: true });
         for (const path of injectPaths) {
             archive.file(path, { name: basename(path) });
         }
@@ -74,7 +74,7 @@ async function deployFunction(functionName, storageSource) {
             serviceConfig: {
                 minInstanceCount: 0,
                 maxInstanceCount: 1,
-                ingressSettings: 1,
+                ingressSettings: 1, // ALLOW_ALL
                 environmentVariables: {
                     NODE_ENV: 'production'
                 }
@@ -92,17 +92,20 @@ async function deployFunction(functionName, storageSource) {
 }
 async function deploy() {
     const buildDirectoryPath = '**';
-    const buildArchivePath = resolve(currentDir, '../../../deployment/build.zip');
+    const buildArchivePath = resolve(currentDir, '../../../../../../.genoacms/build.zip');
     const functionEntryScriptPath = resolve(currentDir, '../../../deployment/snippets/index.js');
+    const builderScriptPath = resolve(currentDir, '../../../deployment/snippets/build.js');
     const ignoreArchivePaths = [
         'node_modules/**',
         '.git/**',
         '.github/**',
         '.gitignore',
+        '.genoacms/**',
         'build/**'
     ];
     const injectArchivePaths = [
-        functionEntryScriptPath
+        functionEntryScriptPath,
+        builderScriptPath
     ];
     await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath);
     const functionStorageSource = await uploadSource(buildArchivePath);

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

@@ -3,7 +3,10 @@ declare const getObject: Adapter['getObject'];
 declare const getPublicURL: Adapter['getPublicURL'];
 declare const getSignedURL: Adapter['getSignedURL'];
 declare const uploadObject: Adapter['uploadObject'];
+declare const moveObject: Adapter['moveObject'];
 declare const deleteObject: Adapter['deleteObject'];
 declare const listDirectory: Adapter['listDirectory'];
 declare const createDirectory: Adapter['createDirectory'];
-export { getObject, getPublicURL, getSignedURL, uploadObject, deleteObject, listDirectory, createDirectory };
+declare const deleteDirectory: Adapter['deleteDirectory'];
+declare const moveDirectory: Adapter['moveDirectory'];
+export { getObject, getPublicURL, getSignedURL, uploadObject, moveObject, deleteObject, listDirectory, createDirectory, deleteDirectory, moveDirectory };

package/dist/services/storage/index.js

@@ -1,5 +1,4 @@
 import { getBucket } from './storage.js';
-import { join } from 'path';
 const getObject = async ({ bucket, name }) => {
     const bucketInstance = getBucket(bucket);
     const file = bucketInstance.file(name);
@@ -26,6 +25,11 @@ const uploadObject = async ({ bucket, name }, stream, options) => {
     const file = bucketInstance.file(name);
     await file.save(stream, options);
 };
+const moveObject = async ({ bucket, name }, newName) => {
+    const bucketInstance = getBucket(bucket);
+    const file = bucketInstance.file(name);
+    await file.move(newName);
+};
 const deleteObject = async ({ bucket, name }) => {
     const bucketInstance = getBucket(bucket);
     const file = bucketInstance.file(name);
@@ -35,7 +39,7 @@ const listDirectory = async ({ bucket, name }, listingParams = {}) => {
     const bucketInstance = getBucket(bucket);
     const options = {
         autoPaginate: false,
-        prefix: join(name, '/'),
+        prefix: name,
         maxResults: listingParams?.limit,
         startOffset: listingParams?.startAfter,
         delimiter: '/'
@@ -43,7 +47,7 @@ const listDirectory = async ({ bucket, name }, listingParams = {}) => {
     let [files, , apiResponse] = (await bucketInstance.getFiles(options));
     files = files.filter((file) => !file.name.endsWith('.folderPlaceholder'));
     return {
-        files: files.map((file) => {
+        files: files.filter(f => f.name !== name).map((file) => {
             return {
                 name: file.name,
                 // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
@@ -51,7 +55,13 @@ const listDirectory = async ({ bucket, name }, listingParams = {}) => {
                 lastModified: new Date(file.metadata.updated)
             };
         }),
-        directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name)
+        directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name).map(i => {
+            const object = {
+                bucket,
+                name: i
+            };
+            return object;
+        })
     };
 };
 const createDirectory = async ({ bucket, name }) => {
@@ -59,4 +69,19 @@ const createDirectory = async ({ bucket, name }) => {
     const file = bucketInstance.file(`${name}/.folderPlaceholder`);
     await file.save('');
 };
-export { getObject, getPublicURL, getSignedURL, uploadObject, deleteObject, listDirectory, createDirectory };
+const deleteDirectory = async ({ bucket, name }) => {
+    const bucketInstance = getBucket(bucket);
+    const [files] = await bucketInstance.getFiles({ prefix: name });
+    const deletePromises = files.map(async (file) => await file.delete());
+    await Promise.all(deletePromises);
+};
+const moveDirectory = async ({ bucket, name }, newName) => {
+    const bucketInstance = getBucket(bucket);
+    const [files] = await bucketInstance.getFiles({ prefix: name });
+    const movePromises = files.map(async (file) => {
+        const newFileName = file.name.replace(name, newName);
+        await file.move(newFileName);
+    });
+    await Promise.all(movePromises);
+};
+export { getObject, getPublicURL, getSignedURL, uploadObject, moveObject, deleteObject, listDirectory, createDirectory, deleteDirectory, moveDirectory };

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",
+  "version": "0.7.9",
   "type": "module",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
@@ -20,7 +20,7 @@
     "provenance": true
   },
   "dependencies": {
-    "@genoacms/cloudabstraction": "^0.7.1",
+    "@genoacms/cloudabstraction": "^0.7.9",
     "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/functions": "^3.4.0",
     "@google-cloud/resource-manager": "^5.1.0",

package/src/services/authorization/index.ts

@@ -2,13 +2,14 @@ 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({
-  projectId: config.authorization.projectId,
-  credentials: config.authorization.credentials
+  projectId,
+  credentials: authorizationConfig.credentials
 })
-const projectId = config.authorization.projectId
 
 const isEmailAdmins: Adapter.isEmailAdmins = async (email: string) => {
   const resource = `projects/${projectId}`

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/deployment/deploy.ts

@@ -30,7 +30,7 @@ async function createZip (source: string, injectPaths: string[], ignorePaths: st
     })
 
     archive.pipe(output)
-    archive.glob(source, { ignore: ignorePaths })
+    archive.glob(source, { ignore: ignorePaths, follow: true })
     for (const path of injectPaths) {
       archive.file(path, { name: basename(path) })
     }
@@ -100,17 +100,20 @@ async function deployFunction (functionName: string, storageSource: IStorageSour
 
 async function deploy (): Promise<void> {
   const buildDirectoryPath = '**'
-  const buildArchivePath = resolve(currentDir, '../../../deployment/build.zip')
+  const buildArchivePath = resolve(currentDir, '../../../../../../.genoacms/build.zip')
   const functionEntryScriptPath = resolve(currentDir, '../../../deployment/snippets/index.js')
+  const builderScriptPath = resolve(currentDir, '../../../deployment/snippets/build.js')
   const ignoreArchivePaths = [
     'node_modules/**',
     '.git/**',
     '.github/**',
     '.gitignore',
+    '.genoacms/**',
     'build/**'
   ]
   const injectArchivePaths = [
-    functionEntryScriptPath
+    functionEntryScriptPath,
+    builderScriptPath
   ]
   await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath)
   const functionStorageSource = await uploadSource(buildArchivePath)

package/src/services/storage/index.ts

@@ -1,10 +1,10 @@
 import type {
   Adapter,
+  ObjectReference,
   StorageObject
 } from '@genoacms/cloudabstraction/storage'
 import { type File } from '@google-cloud/storage'
 import { getBucket } from './storage.js'
-import { join } from 'path'
 
 const getObject: Adapter['getObject'] = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
@@ -37,6 +37,12 @@ const uploadObject: Adapter['uploadObject'] = async ({ bucket, name }, stream, o
   await file.save(stream, options)
 }
 
+const moveObject: Adapter['moveObject'] = async ({ bucket, name }, newName) => {
+  const bucketInstance = getBucket(bucket)
+  const file = bucketInstance.file(name)
+  await file.move(newName)
+}
+
 const deleteObject: Adapter['deleteObject'] = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
@@ -47,7 +53,7 @@ const listDirectory: Adapter['listDirectory'] = async ({ bucket, name }, listing
   const bucketInstance = getBucket(bucket)
   const options = {
     autoPaginate: false,
-    prefix: join(name, '/'),
+    prefix: name,
     maxResults: listingParams?.limit,
     startOffset: listingParams?.startAfter,
     delimiter: '/'
@@ -58,7 +64,7 @@ const listDirectory: Adapter['listDirectory'] = async ({ bucket, name }, listing
   files = files.filter((file) => !file.name.endsWith('.folderPlaceholder'))
 
   return {
-    files: files.map((file) => {
+    files: files.filter(f => f.name !== name).map((file) => {
       return {
         name: file.name,
         // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
@@ -66,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)
+    directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name).map(i => {
+      const object: ObjectReference = {
+        bucket,
+        name: i
+      }
+      return object
+    })
   }
 }
 
@@ -76,12 +88,32 @@ const createDirectory: Adapter['createDirectory'] = async ({ bucket, name }) =>
   await file.save('')
 }
 
+const deleteDirectory: Adapter['deleteDirectory'] = async ({ bucket, name }) => {
+  const bucketInstance = getBucket(bucket)
+  const [files] = await bucketInstance.getFiles({ prefix: name })
+  const deletePromises = files.map(async (file) => await file.delete())
+  await Promise.all(deletePromises)
+}
+
+const moveDirectory: Adapter['moveDirectory'] = async ({ bucket, name }, newName) => {
+  const bucketInstance = getBucket(bucket)
+  const [files] = await bucketInstance.getFiles({ prefix: name })
+  const movePromises = files.map(async (file) => {
+    const newFileName = file.name.replace(name, newName)
+    await file.move(newFileName)
+  })
+  await Promise.all(movePromises)
+}
+
 export {
   getObject,
   getPublicURL,
   getSignedURL,
   uploadObject,
+  moveObject,
   deleteObject,
   listDirectory,
-  createDirectory
+  createDirectory,
+  deleteDirectory,
+  moveDirectory
 }

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
 }