@causa/workspace-google 0.10.1 → 0.11.0

package/README.md

@@ -41,7 +41,7 @@ This makes the `google.firebase` configuration safe to commit in your repository
 The following Causa `project.type`s are supported:
 
 - `serviceContainer`, with `google.cloudRun` as the `serviceContainer.platform`. This will ensure the built Docker images are pushed to the repository set in `google.cloudRun.dockerRepository`.
-- `serverlessFunctions`, with `google.cloudFunctions` as the `serverlessFunctions.platform`. This will push functions archives to the Cloud Storage bucket set in `google.cloudFunctions.archivesStorageLocation`.
+- `serverlessFunctions`, with `google.cloudFunctions` as the `serverlessFunctions.platform`. This will push functions archives to the Cloud Storage bucket set in `google.cloudFunctions.artefactStorage`.
 
 ### Emulators
 

package/dist/configurations/google.d.ts

@@ -244,9 +244,18 @@ export type GoogleConfiguration = {
          */
         readonly cloudFunctions?: {
             /**
-             * The Cloud Storage URI where Cloud Functions archives should be uploaded.
+             * The Cloud Storage configuration where Cloud Functions archives should be uploaded.
              */
-            readonly archivesStorageLocation?: string;
+            readonly artefactStorage?: {
+                /**
+                 * The name of the Cloud Storage bucket.
+                 */
+                readonly bucket?: string;
+                /**
+                 * An optional prefix within the Cloud Storage bucket.
+                 */
+                readonly prefix?: string;
+            };
         };
         /**
          * Configuration for Cloud Run containers.

package/dist/functions/project/get-artefact-destination-cloud-functions.d.ts

@@ -3,7 +3,7 @@ import { ProjectGetArtefactDestination } from '@causa/workspace-core';
 /**
  * Implements the {@link ProjectGetArtefactDestination} function for Cloud Functions projects.
  * Cloud Functions archives are stored in a Google Cloud Storage bucket, the destination of which must be
- * defined in the `google.cloudFunctions.archivesStorageLocation` configuration.
+ * defined in the `google.cloudFunctions.artefactStorage` configuration.
  */
 export declare class ProjectGetArtefactDestinationForCloudFunctions extends ProjectGetArtefactDestination {
     _call(context: WorkspaceContext): Promise<string>;

package/dist/functions/project/get-artefact-destination-cloud-functions.js

@@ -3,15 +3,18 @@ import { ProjectGetArtefactDestination, } from '@causa/workspace-core';
 /**
  * Implements the {@link ProjectGetArtefactDestination} function for Cloud Functions projects.
  * Cloud Functions archives are stored in a Google Cloud Storage bucket, the destination of which must be
- * defined in the `google.cloudFunctions.archivesStorageLocation` configuration.
+ * defined in the `google.cloudFunctions.artefactStorage` configuration.
  */
 export class ProjectGetArtefactDestinationForCloudFunctions extends ProjectGetArtefactDestination {
     async _call(context) {
         const projectName = context.getOrThrow('project.name');
-        const archivesStorageLocation = context
-            .asConfiguration()
-            .getOrThrow('google.cloudFunctions.archivesStorageLocation');
-        return `${archivesStorageLocation}/${projectName}/${this.tag}.zip`;
+        const googleConf = context.asConfiguration();
+        let bucketAndPrefix = googleConf.getOrThrow('google.cloudFunctions.artefactStorage.bucket');
+        const archivesStoragePrefix = googleConf.get('google.cloudFunctions.artefactStorage.prefix');
+        if (archivesStoragePrefix) {
+            bucketAndPrefix += `/${archivesStoragePrefix}`;
+        }
+        return `gs://${bucketAndPrefix}/${projectName}/${this.tag}.zip`;
     }
     _supports(context) {
         const conf = context.asConfiguration();

package/dist/services/firebase-app.js

@@ -4,7 +4,7 @@ import { IAMCredentialsClient } from '@google-cloud/iam-credentials';
 import { initializeApp as initializeAdminApp, } from 'firebase-admin/app';
 import { initializeApp } from 'firebase/app';
 import { firebase_v1beta1 } from 'googleapis';
-import * as uuid from 'uuid';
+import { randomUUID } from 'node:crypto';
 import { FirebaseAdminServiceAccountNotFoundError, FirebaseApiKeyNotFoundError, NoFirebaseAppFoundError, } from './firebase-app.errors.js';
 import { GoogleApisService } from './google-apis.js';
 /**
@@ -79,7 +79,7 @@ export class FirebaseAppService {
         const keysClient = new ApiKeysClient();
         const parent = `projects/${this.projectId}/locations/global`;
         let name;
-        for await (const key of keysClient.listKeysAsync({ parent })) {
+        for await (const key of keysClient.listKeysAsync({ parent }, { autoPaginate: false })) {
             if (key.displayName?.includes(FIREBASE_AUTOMATIC_KEY_INFO) && key.name) {
                 name = key.name;
                 break;
@@ -127,7 +127,7 @@ export class FirebaseAppService {
         if (this.app) {
             return this.app;
         }
-        const name = uuid.v4();
+        const name = randomUUID();
         this.app = initializeApp({ projectId: this.projectId, apiKey, authDomain: this.authDomain }, name);
         return this.app;
     }
@@ -203,7 +203,7 @@ export class FirebaseAppService {
         if (this.adminAppForAdminServiceAccount) {
             return this.adminAppForAdminServiceAccount;
         }
-        const name = uuid.v4();
+        const name = randomUUID();
         this.adminAppForAdminServiceAccount = initializeAdminApp({
             projectId: this.projectId,
             serviceAccountId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@causa/workspace-google",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "description": "The Causa workspace module providing many functionalities related to GCP and its services.",
   "repository": {
     "type": "git",
@@ -32,31 +32,30 @@
     "test:cov": "npm run test -- --coverage"
   },
   "dependencies": {
-    "@causa/cli": ">= 0.6.2 < 1.0.0",
-    "@causa/workspace": ">= 0.18.0 < 1.0.0",
-    "@causa/workspace-core": ">= 0.24.0 < 1.0.0",
-    "@causa/workspace-typescript": ">= 0.11.0 < 1.0.0",
-    "@google-cloud/apikeys": "^2.2.0",
+    "@causa/cli": ">= 0.6.3 < 1.0.0",
+    "@causa/workspace": ">= 0.18.1 < 1.0.0",
+    "@causa/workspace-core": ">= 0.24.1 < 1.0.0",
+    "@causa/workspace-typescript": ">= 0.14.0 < 1.0.0",
+    "@google-cloud/apikeys": "^2.2.1",
     "@google-cloud/bigquery": "^8.1.1",
-    "@google-cloud/iam-credentials": "^4.2.0",
+    "@google-cloud/iam-credentials": "^4.2.1",
     "@google-cloud/pubsub": "^5.2.0",
-    "@google-cloud/resource-manager": "^6.2.0",
-    "@google-cloud/run": "^3.0.0",
-    "@google-cloud/secret-manager": "^6.1.0",
-    "@google-cloud/service-usage": "^4.2.0",
-    "@google-cloud/spanner": "8.2.0",
-    "@google-cloud/storage": "^7.17.0",
+    "@google-cloud/resource-manager": "^6.2.1",
+    "@google-cloud/run": "^3.0.1",
+    "@google-cloud/secret-manager": "^6.1.1",
+    "@google-cloud/service-usage": "^4.2.1",
+    "@google-cloud/spanner": "8.2.2",
+    "@google-cloud/storage": "^7.17.2",
     "class-validator": "^0.14.2",
-    "firebase": "^12.1.0",
-    "firebase-admin": "^13.4.0",
-    "globby": "^14.1.0",
-    "google-auth-library": "^10.3.0",
-    "google-gax": "5.0.1",
-    "googleapis": "^158.0.0",
+    "firebase": "^12.4.0",
+    "firebase-admin": "^13.5.0",
+    "globby": "^15.0.0",
+    "google-auth-library": "^10.4.1",
+    "google-gax": "5.0.3",
+    "googleapis": "^164.0.0",
     "micromatch": "^4.0.8",
-    "pino": "^9.9.0",
-    "quicktype-core": "^23.2.6",
-    "uuid": "^11.1.0"
+    "pino": "^10.1.0",
+    "quicktype-core": "^23.2.6"
   },
   "devDependencies": {
     "@swc/core": "^1.13.5",
@@ -64,17 +63,16 @@
     "@tsconfig/node20": "^20.1.6",
     "@types/jest": "^30.0.0",
     "@types/micromatch": "^4.0.9",
-    "@types/node": "^22.18.0",
-    "@types/uuid": "^10.0.0",
+    "@types/node": "^22.18.11",
     "copyfiles": "^2.4.1",
-    "eslint": "^9.34.0",
+    "eslint": "^9.38.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
-    "jest": "^30.1.0",
+    "jest": "^30.2.0",
     "jest-extended": "^6.0.0",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.41.0"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.1"
   }
 }