From e11a481a19b94b8fd1010600e164266193331a04 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 12 Jul 2023 15:22:00 -0700 Subject: [PATCH 1/5] build: update gaxios; to 6.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b9132e94..f116f74a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", - "gaxios": "^5.0.0", + "gaxios": "^6.0.0", "gcp-metadata": "^5.3.0", "gtoken": "^7.0.0", "jws": "^4.0.0", From f1db331172c636aa0abeaaa5ca6666b82bd9b7e7 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Wed, 19 Jul 2023 17:54:44 -0700 Subject: [PATCH 2/5] chore: update gcp-metadata --- package.json | 2 +- src/auth/computeclient.ts | 2 +- src/transporters.ts | 7 +++---- test/test.awsclient.ts | 12 ++++++------ test/test.baseexternalclient.ts | 4 ++-- test/test.downscopedclient.ts | 4 ++-- test/test.externalaccountauthorizeduserclient.ts | 4 ++-- test/test.identitypoolclient.ts | 4 ++-- test/test.transporters.ts | 2 +- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index f116f74a..6ae51266 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", "gaxios": "^6.0.0", - "gcp-metadata": "^5.3.0", + "gcp-metadata": "^6.0.0", "gtoken": "^7.0.0", "jws": "^4.0.0", "lru-cache": "^6.0.0" diff --git a/src/auth/computeclient.ts b/src/auth/computeclient.ts index acc7aeb1..f4bc7a8f 100644 --- a/src/auth/computeclient.ts +++ b/src/auth/computeclient.ts @@ -120,7 +120,7 @@ export class Compute extends OAuth2Client { protected wrapError(e: GaxiosError) { const res = e.response; if (res && res.status) { - e.code = res.status.toString(); + e.status = res.status; if (res.status === 403) { e.message = 'A Forbidden error was returned while attempting to retrieve an access ' + diff --git a/src/transporters.ts b/src/transporters.ts index 47434c69..26c1dab2 100644 --- a/src/transporters.ts +++ b/src/transporters.ts @@ -81,7 +81,6 @@ export class DefaultTransporter implements Transporter { // ensure the user isn't passing in request-style options opts = this.configure(opts); validate(opts); - return request(opts).catch(e => { throw this.processError(e); }); @@ -97,7 +96,7 @@ export class DefaultTransporter implements Transporter { if (res && body && body.error && res.status !== 200) { if (typeof body.error === 'string') { err.message = body.error; - err.code = res.status.toString(); + err.status = res.status; } else if (Array.isArray(body.error.errors)) { err.message = body.error.errors .map((err2: Error) => err2.message) @@ -106,12 +105,12 @@ export class DefaultTransporter implements Transporter { err.errors = body.error.errors; } else { err.message = body.error.message; - err.code = body.error.code || res.status; + err.code = body.error.code; } } else if (res && res.status >= 400) { // Consider all 4xx and 5xx responses errors. err.message = body; - err.code = res.status.toString(); + err.status = res.status; } return err; } diff --git a/test/test.awsclient.ts b/test/test.awsclient.ts index bea72deb..2d83126e 100644 --- a/test/test.awsclient.ts +++ b/test/test.awsclient.ts @@ -404,7 +404,7 @@ describe('AwsClient', () => { const client = new AwsClient(awsOptions); await assert.rejects(client.retrieveSubjectToken(), { - code: '500', + status: 500, }); scope.done(); }); @@ -420,7 +420,7 @@ describe('AwsClient', () => { const client = new AwsClient(awsOptions); await assert.rejects(client.retrieveSubjectToken(), { - code: '403', + status: 403, }); scope.done(); }); @@ -438,7 +438,7 @@ describe('AwsClient', () => { const client = new AwsClient(awsOptions); await assert.rejects(client.retrieveSubjectToken(), { - code: '408', + status: 408, }); scope.done(); }); @@ -605,7 +605,7 @@ describe('AwsClient', () => { const client = new AwsClient(awsOptions); await assert.rejects(client.getAccessToken(), { - code: '500', + status: 500, }); scope.done(); }); @@ -707,7 +707,7 @@ describe('AwsClient', () => { const client = new AwsClient(awsOptions); await assert.rejects(client.retrieveSubjectToken(), { - code: '500', + status: 500, }); scope.done(); }); @@ -985,7 +985,7 @@ describe('AwsClient', () => { const client = new AwsClient(awsOptions); await assert.rejects(client.getAccessToken(), { - code: '500', + status: 500, }); scope.done(); }); diff --git a/test/test.baseexternalclient.ts b/test/test.baseexternalclient.ts index 2ee050bc..f409ad58 100644 --- a/test/test.baseexternalclient.ts +++ b/test/test.baseexternalclient.ts @@ -2161,7 +2161,7 @@ describe('BaseExternalAccountClient', () => { responseType: 'json', }), { - code: '401', + status: 401, } ); @@ -2238,7 +2238,7 @@ describe('BaseExternalAccountClient', () => { responseType: 'json', }), { - code: '403', + status: 403, } ); diff --git a/test/test.downscopedclient.ts b/test/test.downscopedclient.ts index 8ba7180c..d280a9ee 100644 --- a/test/test.downscopedclient.ts +++ b/test/test.downscopedclient.ts @@ -1185,7 +1185,7 @@ describe('DownscopedClient', () => { responseType: 'json', }), { - code: '401', + status: 401, } ); @@ -1262,7 +1262,7 @@ describe('DownscopedClient', () => { responseType: 'json', }), { - code: '403', + status: 403, } ); scopes.forEach(scope => scope.done()); diff --git a/test/test.externalaccountauthorizeduserclient.ts b/test/test.externalaccountauthorizeduserclient.ts index 5b5056a0..f9dcc45e 100644 --- a/test/test.externalaccountauthorizeduserclient.ts +++ b/test/test.externalaccountauthorizeduserclient.ts @@ -694,7 +694,7 @@ describe('ExternalAccountAuthorizedUserClient', () => { responseType: 'json', }), { - code: '401', + status: 401, } ); @@ -752,7 +752,7 @@ describe('ExternalAccountAuthorizedUserClient', () => { responseType: 'json', }), { - code: '403', + status: 403, } ); scopes.forEach(scope => scope.done()); diff --git a/test/test.identitypoolclient.ts b/test/test.identitypoolclient.ts index 1b6bde53..c7383757 100644 --- a/test/test.identitypoolclient.ts +++ b/test/test.identitypoolclient.ts @@ -828,7 +828,7 @@ describe('IdentityPoolClient', () => { const client = new IdentityPoolClient(urlSourcedOptions); await assert.rejects(client.retrieveSubjectToken(), { - code: '404', + status: 404, }); scope.done(); }); @@ -1033,7 +1033,7 @@ describe('IdentityPoolClient', () => { const client = new IdentityPoolClient(urlSourcedOptions); await assert.rejects(client.getAccessToken(), { - code: '404', + status: 404, }); scope.done(); }); diff --git a/test/test.transporters.ts b/test/test.transporters.ts index 89559f4d..c1949bc5 100644 --- a/test/test.transporters.ts +++ b/test/test.transporters.ts @@ -115,7 +115,7 @@ describe('transporters', () => { error => { scope.done(); assert.strictEqual(error!.message, 'Not found'); - assert.strictEqual((error as RequestError).code, '404'); + assert.strictEqual((error as RequestError).status, 404); done(); } ); From 137a1a997fab7294057f8fae162105f771f22c94 Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 20 Jul 2023 13:13:29 -0700 Subject: [PATCH 3/5] build: add fixes to test --- package.json | 6 +++++- test/test.oauth2.ts | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6ae51266..d53aa993 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,11 @@ "ecdsa-sig-formatter": "^1.0.11", "gaxios": "^6.0.0", "gcp-metadata": "^6.0.0", +<<<<<<< HEAD "gtoken": "^7.0.0", +======= + "gtoken": "^7.0.1", +>>>>>>> e37ad67 (build: add fixes to test) "jws": "^4.0.0", "lru-cache": "^6.0.0" }, @@ -34,7 +38,7 @@ "@types/mocha": "^9.0.0", "@types/mv": "^2.1.0", "@types/ncp": "^2.0.1", - "@types/node": "^16.0.0", + "@types/node": "^20.4.2", "@types/sinon": "^10.0.0", "assert-rejects": "^1.0.0", "c8": "^8.0.0", diff --git a/test/test.oauth2.ts b/test/test.oauth2.ts index 453acd09..752c7ee4 100644 --- a/test/test.oauth2.ts +++ b/test/test.oauth2.ts @@ -819,9 +819,8 @@ describe('oauth2', () => { .replyWithFile(200, certsResPath); client.getFederatedSignonCerts((err, certs) => { assert.strictEqual(err, null); - assert.strictEqual(Object.keys(certs!).length, 2); assert.notStrictEqual( - certs!.a15eea964ab9cce480e5ef4f47cb17b9fa7d0b21, + certs!['a15eea964ab9cce480e5ef4f47cb17b9fa7d0b21'], null ); assert.notStrictEqual( @@ -861,8 +860,7 @@ describe('oauth2', () => { .replyWithFile(200, pubkeysResPath); client.getIapPublicKeys((err, pubkeys) => { assert.strictEqual(err, null); - assert.strictEqual(Object.keys(pubkeys!).length, 2); - assert.notStrictEqual(pubkeys!.f9R3yg, null); + assert.notStrictEqual(pubkeys!['f9R3yg'], null); assert.notStrictEqual(pubkeys!['2nMJtw'], null); scope.done(); done(); From 3b091d04b4e5806cb0273bc71de753531101974e Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 20 Jul 2023 13:16:38 -0700 Subject: [PATCH 4/5] resolve conflict --- package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index d53aa993..fcc3385e 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,7 @@ "ecdsa-sig-formatter": "^1.0.11", "gaxios": "^6.0.0", "gcp-metadata": "^6.0.0", -<<<<<<< HEAD - "gtoken": "^7.0.0", -======= - "gtoken": "^7.0.1", ->>>>>>> e37ad67 (build: add fixes to test) + "gtoken": "^7.0.0", "jws": "^4.0.0", "lru-cache": "^6.0.0" }, From bfea43231e67b37c668747ce1634612c464cb56a Mon Sep 17 00:00:00 2001 From: Sofia Leon Date: Thu, 20 Jul 2023 13:26:08 -0700 Subject: [PATCH 5/5] update puppeteer does not support node 14 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fcc3385e..b80da56e 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "ecdsa-sig-formatter": "^1.0.11", "gaxios": "^6.0.0", "gcp-metadata": "^6.0.0", - "gtoken": "^7.0.0", + "gtoken": "^7.0.0", "jws": "^4.0.0", "lru-cache": "^6.0.0" }, @@ -57,7 +57,7 @@ "ncp": "^2.0.0", "nock": "^13.0.0", "null-loader": "^4.0.0", - "puppeteer": "^20.0.0", + "puppeteer": "^19.0.0", "sinon": "^15.0.0", "ts-loader": "^8.0.0", "typescript": "^5.1.6",