diff --git a/src/app/credential-internal.ts b/src/app/credential-internal.ts index 34043a3597..c30f04a8e3 100644 --- a/src/app/credential-internal.ts +++ b/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'; diff --git a/src/remote-config/condition-evaluator-internal.ts b/src/remote-config/condition-evaluator-internal.ts index 73a878109f..96cf7c8d6b 100644 --- a/src/remote-config/condition-evaluator-internal.ts +++ b/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'; /** diff --git a/src/utils/crypto-signer.ts b/src/utils/crypto-signer.ts index a4b1f20be5..abca734a1f 100644 --- a/src/utils/crypto-signer.ts +++ b/src/utils/crypto-signer.ts @@ -79,7 +79,7 @@ export class ServiceAccountSigner implements CryptoSigner { * @inheritDoc */ public sign(buffer: Buffer): Promise { - 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)); diff --git a/test/integration/auth.spec.ts b/test/integration/auth.spec.ts index 3c538d3319..b4695958ac 100644 --- a/test/integration/auth.spec.ts +++ b/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'; diff --git a/test/unit/remote-config/condition-evaluator.spec.ts b/test/unit/remote-config/condition-evaluator.spec.ts index 764d1b76ef..88bbe835e0 100644 --- a/test/unit/remote-config/condition-evaluator.spec.ts +++ b/test/unit/remote-config/condition-evaluator.spec.ts @@ -28,7 +28,7 @@ import { } 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; diff --git a/test/unit/utils/crypto-signer.spec.ts b/test/unit/utils/crypto-signer.spec.ts index a964f00f7b..26bfc7cb38 100644 --- a/test/unit/utils/crypto-signer.spec.ts +++ b/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() },