Merge branch 'main' into yp-add-fid-arg

Author: yvonnep165

package.json

@@ -221,8 +221,7 @@
     "fast-deep-equal": "^3.1.1",
     "google-auth-library": "^10.6.1",
     "jsonwebtoken": "^9.0.0",
-    "jwks-rsa": "^3.1.0",
-    "uuid": "^11.0.2"
+    "jwks-rsa": "^3.1.0"
   },
   "optionalDependencies": {
     "@google-cloud/firestore": "^7.11.0",
@@ -248,7 +247,6 @@
     "@types/request-promise": "^4.1.41",
     "@types/sinon": "^17.0.2",
     "@types/sinon-chai": "^3.0.0",
-    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^8.56.0",
     "@typescript-eslint/parser": "^8.56.0",
     "bcrypt": "^6.0.0",
@@ -281,4 +279,4 @@
     "typescript": "^5.7.3",
     "yargs": "^17.0.1"
   }
-}
+}

src/app/credential-internal.ts

@@ -16,7 +16,7 @@
  */
 
 import fs = require('fs');
-import { createPrivateKey } from 'crypto';
+import { createPrivateKey } from 'node:crypto';
 
 import { Credentials as GoogleAuthCredentials, GoogleAuth, Compute, AnyAuthClient } from 'google-auth-library'
 import { Agent } from 'http';

src/eventarc/eventarc-utils.ts

@@ -17,8 +17,8 @@
 
 import { PrefixedFirebaseError } from '../utils/error';
 import { CloudEvent } from './cloudevent';
-import { v4 as uuid } from 'uuid';
 import * as validator from '../utils/validator';
+import { randomUUID } from 'node:crypto';
 
 // List of CloudEvent properties that are handled "by hand" and should be skipped by
 // automatic attribute copy.
@@ -50,7 +50,7 @@ export function toCloudEventProtoFormat(ce: CloudEvent): any {
   }
   const out: Record<string, any> = {
     '@type': 'type.googleapis.com/io.cloudevents.v1.CloudEvent',
-    'id': ce.id ?? uuid(),
+    'id': ce.id ?? randomUUID(),
     'type': ce.type,
     'specVersion': ce.specversion ?? '1.0',
     'source': source

src/remote-config/condition-evaluator-internal.ts

@@ -27,7 +27,7 @@ import {
   CustomSignalCondition,
   CustomSignalOperator,
 } from './remote-config-api';
-import { createHash } from 'crypto';
+import { createHash } from 'node:crypto';
 
 
 /**

src/utils/crypto-signer.ts

@@ -79,7 +79,7 @@ export class ServiceAccountSigner implements CryptoSigner {
    * @inheritDoc
    */
   public sign(buffer: Buffer): Promise<Buffer> {
-    const crypto = require('crypto'); // eslint-disable-line @typescript-eslint/no-var-requires
+    const crypto = require('node:crypto'); // eslint-disable-line @typescript-eslint/no-var-requires
     const sign = crypto.createSign('RSA-SHA256');
     sign.update(buffer);
     return Promise.resolve(sign.sign(this.credential.privateKey));

test/integration/auth.spec.ts

@@ -15,7 +15,7 @@
  */
 
 import * as url from 'url';
-import * as crypto from 'crypto';
+import * as crypto from 'node:crypto';
 import * as bcrypt from 'bcrypt';
 import * as chai from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';

test/unit/remote-config/condition-evaluator.spec.ts

@@ -26,9 +26,8 @@ import {
   NamedCondition,
   OneOfCondition,
 } from '../../../src/remote-config/remote-config-api';
-import { v4 as uuidv4 } from 'uuid';
 import { clone } from 'lodash';
-import * as crypto from 'crypto';
+import * as crypto from 'node:crypto';
 
 const expect = chai.expect;
 
@@ -907,7 +906,7 @@ describe('ConditionEvaluator', () => {
             ...clone(condition),
             seed: 'seed'
           };
-          const context = { randomizationId: uuidv4() }
+          const context = { randomizationId: crypto.randomUUID() }
           if (conditionEvaluator.evaluateConditions([{
             name: 'is_enabled',
             condition: { percent: clonedCondition }

test/unit/utils/crypto-signer.spec.ts

@@ -57,7 +57,7 @@ describe('CryptoSigner', () => {
       const cert = new ServiceAccountCredential(mocks.certificateObject);
 
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const crypto = require('crypto');
+      const crypto = require('node:crypto');
       const rsa = crypto.createSign('RSA-SHA256');
       rsa.update(payload);
       const result = rsa.sign(cert.privateKey, 'base64');
@@ -104,8 +104,8 @@ describe('CryptoSigner', () => {
       const signRequest = {
         method: 'POST',
         url: 'https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/foo@project_id.iam.gserviceaccount.com:signBlob',
-        headers: { 
-          Authorization: `Bearer ${mockAccessToken}`, 
+        headers: {
+          Authorization: `Bearer ${mockAccessToken}`,
           'X-Goog-Api-Client': getMetricsHeader()
         },
         data: { payload: input.toString('base64') },
@@ -162,7 +162,7 @@ describe('CryptoSigner', () => {
       const signRequest = {
         method: 'POST',
         url: 'https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/discovered-service-account:signBlob',
-        headers: { 
+        headers: {
           Authorization: `Bearer ${mockAccessToken}`,
           'X-Goog-Api-Client': getMetricsHeader()
         },