build: update gaxios & gcp-metadata to 6.0.0, update @types/node to 20.4.2, decrease puppeteer to ^19.0.0, distinguish status and code in error handling.

package.json

@@ -19,8 +19,8 @@
   "dependencies": {
     "base64-js": "^1.3.0",
     "ecdsa-sig-formatter": "^1.0.11",
-    "gaxios": "^5.0.0",
-    "gcp-metadata": "^5.3.0",
+    "gaxios": "^6.0.0",
+    "gcp-metadata": "^6.0.0",
     "gtoken": "^7.0.0",
     "jws": "^4.0.0",
     "lru-cache": "^6.0.0"
@@ -34,7 +34,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",
@@ -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",

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 ' +

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<T>(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;
   }

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();
       });

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,
         }
       );
 

test/test.downscopedclient.ts

@@ -54,11 +54,11 @@
     this.credentials.expiry_date = expirationTime;
   }
 
   async getRequestHeaders(url?: string): Promise<Headers> {
     throw new Error('Not implemented.');
   }
 
   request<T>(opts: GaxiosOptions): GaxiosPromise<T> {
     throw new Error('Not implemented.');
   }
 }
@@ -1185,7 +1185,7 @@
           responseType: 'json',
         }),
         {
-          code: '401',
+          status: 401,
         }
       );
 
@@ -1262,7 +1262,7 @@
           responseType: 'json',
         }),
         {
-          code: '403',
+          status: 403,
         }
       );
       scopes.forEach(scope => scope.done());

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());

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();
       });

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();

test/test.transporters.ts

@@ -115,7 +115,7 @@
       error => {
         scope.done();
         assert.strictEqual(error!.message, 'Not found');
-        assert.strictEqual((error as RequestError).code, '404');
+        assert.strictEqual((error as RequestError).status, 404);
         done();
       }
     );
@@ -155,7 +155,7 @@
         assert.strictEqual(res!.status, 200);
         done();
       },
       _error => {
         scope.done();
         done('Unexpected promise failure');
       }