@genoacms/adapter-gcp 0.7.1-fix.2 → 0.7.1-fix.4

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,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/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) });
         }
@@ -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/storage.js

@@ -5,7 +5,7 @@ const storageConfig = config.storage.providers.find((provider) => 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.7.1-fix.2",
+  "version": "0.7.1-fix.4",
   "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/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/storage.ts

@@ -6,7 +6,7 @@ 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 => {