[INT-7879]: bump googleapis version

package.json

@@ -49,14 +49,14 @@
     "dotenv": "^9.0.2",
     "mutton": "^0.5.1",
     "node-fetch": "^2.6.1",
-    "ts-node": "^9.1.1"
+    "ts-node": "^10.9.1"
   },
   "dependencies": {
     "@lifeomic/attempt": "^3.0.0",
     "commander": "^9.4.1",
     "gaxios": "^4.2.1",
-    "google-auth-library": "^7.1.0",
-    "googleapis": "94.0.0",
+    "google-auth-library": "^8.8.0",
+    "googleapis": "^118.0.0",
     "lodash.get": "^4.4.2",
     "p-map": "^4.0.0"
   },

src/google-cloud/__recordings__/validateInvocation-failure-accountNotFound_2500377071/recording.har

@@ -12,7 +12,7 @@
         "_order": 0,
         "cache": {},
         "request": {
-          "bodySize": 711,
+          "bodySize": 739,
           "cookies": [],
           "headers": [
             {
@@ -22,18 +22,23 @@
             },
             {
               "_fromType": "array",
-              "name": "accept",
-              "value": "application/json"
+              "name": "user-agent",
+              "value": "google-api-nodejs-client/8.8.0"
             },
             {
               "_fromType": "array",
-              "name": "content-length",
-              "value": "711"
+              "name": "x-goog-api-client",
+              "value": "gl-node/14.21.3 auth/8.8.0"
             },
             {
               "_fromType": "array",
-              "name": "user-agent",
-              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+              "name": "accept",
+              "value": "application/json"
+            },
+            {
+              "_fromType": "array",
+              "name": "content-length",
+              "value": "739"
             },
             {
               "_fromType": "array",
@@ -50,7 +55,7 @@
               "value": "www.googleapis.com"
             }
           ],
-          "headersSize": 300,
+          "headersSize": 323,
           "httpVersion": "HTTP/1.1",
           "method": "POST",
           "postData": {
@@ -62,11 +67,11 @@
           "url": "https://www.googleapis.com/oauth2/v4/token"
         },
         "response": {
-          "bodySize": 137,
+          "bodySize": 130,
           "content": {
             "encoding": "utf-8",
             "mimeType": "application/json; charset=UTF-8",
-            "size": 137,
+            "size": 130,
             "text": "{\"error\":\"invalid_grant\",\"error_description\":\"Invalid grant: account not found\"}"
           },
           "cookies": [],
@@ -81,7 +86,7 @@
             },
             {
               "name": "date",
-              "value": "Fri, 10 Feb 2023 12:44:59 GMT"
+              "value": "Wed, 31 May 2023 16:20:28 GMT"
             },
             {
               "name": "server",
@@ -118,7 +123,7 @@
           "status": 400,
           "statusText": "Bad Request"
         },
-        "startedDateTime": "2023-02-10T12:44:59.127Z",
+        "startedDateTime": "2023-05-31T16:20:27.902Z",
         "time": 166,
         "timings": {
           "blocked": -1,

src/google-cloud/__recordings__/validateInvocation-failure-invalidJWT_3375761893/recording.har

@@ -12,7 +12,7 @@
         "_order": 0,
         "cache": {},
         "request": {
-          "bodySize": 725,
+          "bodySize": 733,
           "cookies": [],
           "headers": [
             {
@@ -22,18 +22,23 @@
             },
             {
               "_fromType": "array",
-              "name": "accept",
-              "value": "application/json"
+              "name": "user-agent",
+              "value": "google-api-nodejs-client/8.8.0"
             },
             {
               "_fromType": "array",
-              "name": "content-length",
-              "value": "725"
+              "name": "x-goog-api-client",
+              "value": "gl-node/14.21.3 auth/8.8.0"
             },
             {
               "_fromType": "array",
-              "name": "user-agent",
-              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+              "name": "accept",
+              "value": "application/json"
+            },
+            {
+              "_fromType": "array",
+              "name": "content-length",
+              "value": "733"
             },
             {
               "_fromType": "array",
@@ -50,7 +55,7 @@
               "value": "www.googleapis.com"
             }
           ],
-          "headersSize": 300,
+          "headersSize": 323,
           "httpVersion": "HTTP/1.1",
           "method": "POST",
           "postData": {
@@ -62,11 +67,11 @@
           "url": "https://www.googleapis.com/oauth2/v4/token"
         },
         "response": {
-          "bodySize": 163,
+          "bodySize": 228,
           "content": {
             "encoding": "utf-8",
             "mimeType": "application/json; charset=UTF-8",
-            "size": 163,
+            "size": 228,
             "text": "{\"error\":\"invalid_grant\",\"error_description\":\"Invalid JWT Signature.\"}"
           },
           "cookies": [],
@@ -81,7 +86,7 @@
             },
             {
               "name": "date",
-              "value": "Fri, 10 Feb 2023 12:50:03 GMT"
+              "value": "Wed, 31 May 2023 16:24:12 GMT"
             },
             {
               "name": "server",
@@ -118,16 +123,16 @@
           "status": 400,
           "statusText": "Bad Request"
         },
-        "startedDateTime": "2023-02-10T12:50:02.932Z",
-        "time": 253,
+        "startedDateTime": "2023-05-31T16:24:12.035Z",
+        "time": 179,
         "timings": {
           "blocked": -1,
           "connect": -1,
           "dns": -1,
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 253
+          "wait": 179
         }
       }
     ],

src/google-cloud/client.test.ts

@@ -3,7 +3,7 @@ import {
   IntegrationProviderAuthorizationError,
 } from '@jupiterone/integration-sdk-core';
 import { createMockExecutionContext } from '@jupiterone/integration-sdk-testing';
-import { GoogleAuth, GoogleAuthOptions } from 'google-auth-library';
+import { AuthClient, GoogleAuth, GoogleAuthOptions } from 'google-auth-library';
 import { google } from 'googleapis';
 import { IntegrationConfig, invocationConfig } from '..';
 import { getMockIntegrationConfig, integrationConfig } from '../../test/config';
@@ -16,12 +16,18 @@ import { Client } from './client';
 
 describe('#getAuthenticatedServiceClient', () => {
   let googleAuthSpy: jest.SpyInstance<
-    GoogleAuth,
-    [(GoogleAuthOptions | undefined)?]
+    GoogleAuth<AuthClient>,
+    [opts?: GoogleAuthOptions<AuthClient>]
   >;
 
   beforeEach(() => {
-    googleAuthSpy = jest.spyOn(google.auth, 'GoogleAuth');
+    googleAuthSpy = jest.spyOn(
+      google.auth,
+      'GoogleAuth',
+    ) as unknown as jest.SpyInstance<
+      GoogleAuth<AuthClient>,
+      [opts?: GoogleAuthOptions<AuthClient>]
+    >;
   });
 
   afterEach(() => {

src/google-cloud/utils/createErrorProps.ts

@@ -8,8 +8,12 @@ type J1ApiErrorProps = GetConstructorArgs<
   typeof IntegrationProviderAPIError
 >[0];
 
+const isGaxiosError = (error: Error | GaxiosError): error is GaxiosError => {
+  return error.constructor.name === 'GaxiosError';
+};
+
 export function createErrorProps(error: Error | GaxiosError): J1ApiErrorProps {
-  if (error instanceof GaxiosError && error.response) {
+  if (isGaxiosError(error) && error.response) {
     return {
       cause: error,
       endpoint: error.response?.config?.url || UNKNOWN_VALUE,

src/steps/access-context-manager/client.ts

@@ -12,7 +12,7 @@ export class AccessContextManagerClient extends Client {
     const auth = await this.getAuthenticatedServiceClient();
 
     await this.iterateApi(
-      async (nextPageToken) => {
+      async (nextPageToken: string | undefined) => {
         return this.client.accessPolicies.list({
           auth,
           parent: `organizations/${this.organizationId}`,

src/steps/big-query/converters.ts

@@ -1,5 +1,8 @@
 import { bigquery_v2 } from 'googleapis';
-import { createGoogleCloudIntegrationEntity } from '../../utils/entity';
+import {
+  GoogleCloudResourceData,
+  createGoogleCloudIntegrationEntity,
+} from '../../utils/entity';
 import {
   BIG_QUERY_DATASET_ENTITY_CLASS,
   BIG_QUERY_DATASET_ENTITY_TYPE,
@@ -41,7 +44,7 @@ function isBigQueryDatasetPublicAccess(accessList: DatasetAccess[]): boolean {
 export function createBigQueryDatasetEntity(data: bigquery_v2.Schema$Dataset) {
   return createGoogleCloudIntegrationEntity(data, {
     entityData: {
-      source: data,
+      source: data as GoogleCloudResourceData,
       assign: {
         _key: data.id as string,
         _type: BIG_QUERY_DATASET_ENTITY_TYPE,

test/mocks.ts

@@ -20,7 +20,6 @@ import {
   memcache_v1,
   monitoring_v3,
   osconfig_v1,
-  privateca_v1beta1,
   pubsub_v1,
   redis_v1,
   run_v1,
@@ -1857,79 +1856,6 @@ export function getMockSpannerInstanceConfiguration(
   };
 }
 
-export function getMockCertificateAuthority(
-  partial?: privateca_v1beta1.Schema$CertificateAuthority,
-): privateca_v1beta1.Schema$CertificateAuthority {
-  return {
-    name: 'projects/j1-gc-integration-dev-v2/locations/us-central1/certificateAuthorities/acmeName',
-    type: 'SELF_SIGNED',
-    tier: 'ENTERPRISE',
-    config: {
-      subjectConfig: {
-        subject: {
-          organization: 'Acme',
-        },
-        commonName: 'acmeName',
-      },
-      reusableConfig: {},
-    },
-    lifetime: '314496000s',
-    keySpec: {
-      algorithm: 'RSA_PKCS1_2048_SHA256',
-    },
-    issuingOptions: {
-      includeCaCertUrl: true,
-      includeCrlAccessUrl: true,
-    },
-    state: 'ENABLED',
-    caCertificateDescriptions: [
-      {
-        subjectDescription: {
-          subject: {
-            organization: 'Acme',
-          },
-          commonName: 'acmeName',
-          subjectAltName: {},
-          hexSerialNumber: '008a51de1d92de213728c7733b74700f4a684513',
-          lifetime: '314496000s',
-          notBeforeTime: '2021-04-08T14:44:07.900172684Z',
-          notAfterTime: '2031-03-27T14:44:07.900172684Z',
-        },
-        configValues: {
-          keyUsage: {
-            baseKeyUsage: {
-              certSign: true,
-              crlSign: true,
-            },
-          },
-          caOptions: {
-            isCa: true,
-          },
-        },
-        subjectKeyId: {
-          keyId: 'ec21738d89c6020cfab46e73b1a001d7fb24d34c',
-        },
-        authorityKeyId: {
-          keyId: 'ec21738d89c6020cfab46e73b1a001d7fb24d34c',
-        },
-        certFingerprint: {
-          sha256Hash:
-            'd7de957b8c0903c662332fc8ec4966c5dc01b7426ed778dc389aaa545a37064a',
-        },
-      },
-    ],
-    accessUrls: {
-      caCertificateAccessUrl:
-        'http://test-bucket-with-labels.storage.googleapis.com/f1cc34b5b7e8fa026582/ca.crt',
-      crlAccessUrl:
-        'http://test-bucket-with-labels.storage.googleapis.com/f1cc34b5b7e8fa026582/crl.crl',
-    },
-    createTime: '2021-04-08T14:44:07.215539285Z',
-    updateTime: '2021-04-08T14:44:09.263990183Z',
-    ...partial,
-  };
-}
-
 export function getMockApiGatewayApi(
   partial?: apigateway_v1.Schema$ApigatewayApi,
 ): apigateway_v1.Schema$ApigatewayApi {