fix: use require() to load JSON protos (#442)

The library is regenerated with gapic-generator-typescript v1.3.1. Committer: @alexander-fenster PiperOrigin-RevId: 372468161 Source-Link: googleapis/googleapis@75880c3 Source-Link: googleapis/googleapis-gen@77b1804
googleapis · May 11, 2021 · f9f768d · f9f768d
1 parent 937f27a
commit f9f768d
Show file tree

Hide file tree

Showing 9 changed files with 3,224 additions and 3,242 deletions.
diff --git a/packages/google-cloud-oslogin/protos/protos.d.ts b/packages/google-cloud-oslogin/protos/protos.d.ts
diff --git a/packages/google-cloud-oslogin/protos/protos.js b/packages/google-cloud-oslogin/protos/protos.js
diff --git a/packages/google-cloud-oslogin/protos/protos.json b/packages/google-cloud-oslogin/protos/protos.json
diff --git a/packages/google-cloud-oslogin/src/v1/os_login_service_client.ts b/packages/google-cloud-oslogin/src/v1/os_login_service_client.ts
@@ -22,6 +22,7 @@ import {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax';
 import * as path from 'path';
 
 import * as protos from '../../protos/protos';
+import jsonProtos = require('../../protos/protos.json');
 /**
  * Client JSON configuration object, loaded from
  * `src/v1/os_login_service_client_config.json`.
@@ -139,22 +140,7 @@ export class OsLoginServiceClient {
  clientHeader.push(`${opts.libName}/${opts.libVersion}`);
  }
  // Load the applicable protos.
- // For Node.js, pass the path to JSON proto file.
- // For browsers, pass the JSON content.
-
- const nodejsProtoPath = path.join(
- __dirname,
- '..',
- '..',
- 'protos',
- 'protos.json'
- );
- this._protos = this._gaxGrpc.loadProto(
- opts.fallback
- ? // eslint-disable-next-line @typescript-eslint/no-var-requires
- require('../../protos/protos.json')
- : nodejsProtoPath
- );
+ this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos);
 
  // This API contains "path templates"; forward-slash-separated
  // identifiers to uniquely identify resources within the API.

diff --git a/packages/google-cloud-oslogin/src/v1/os_login_service_client_config.json b/packages/google-cloud-oslogin/src/v1/os_login_service_client_config.json
@@ -21,27 +21,33 @@
  },
  "methods": {
  "DeletePosixAccount": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "DeleteSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "GetLoginProfile": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "GetSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "ImportSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "UpdateSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  }
  }

diff --git a/packages/google-cloud-oslogin/src/v1/os_login_service_proto_list.json b/packages/google-cloud-oslogin/src/v1/os_login_service_proto_list.json
@@ -1,4 +1,3 @@
 [
- "../../protos/google/cloud/oslogin/common/common.proto",
  "../../protos/google/cloud/oslogin/v1/oslogin.proto"
 ]
diff --git a/packages/google-cloud-oslogin/src/v1beta/os_login_service_client.ts b/packages/google-cloud-oslogin/src/v1beta/os_login_service_client.ts
@@ -22,6 +22,7 @@ import {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax';
 import * as path from 'path';
 
 import * as protos from '../../protos/protos';
+import jsonProtos = require('../../protos/protos.json');
 /**
  * Client JSON configuration object, loaded from
  * `src/v1beta/os_login_service_client_config.json`.
@@ -139,22 +140,7 @@ export class OsLoginServiceClient {
  clientHeader.push(`${opts.libName}/${opts.libVersion}`);
  }
  // Load the applicable protos.
- // For Node.js, pass the path to JSON proto file.
- // For browsers, pass the JSON content.
-
- const nodejsProtoPath = path.join(
- __dirname,
- '..',
- '..',
- 'protos',
- 'protos.json'
- );
- this._protos = this._gaxGrpc.loadProto(
- opts.fallback
- ? // eslint-disable-next-line @typescript-eslint/no-var-requires
- require('../../protos/protos.json')
- : nodejsProtoPath
- );
+ this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos);
 
  // This API contains "path templates"; forward-slash-separated
  // identifiers to uniquely identify resources within the API.

diff --git a/packages/google-cloud-oslogin/src/v1beta/os_login_service_client_config.json b/packages/google-cloud-oslogin/src/v1beta/os_login_service_client_config.json
@@ -21,27 +21,33 @@
  },
  "methods": {
  "DeletePosixAccount": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "DeleteSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "GetLoginProfile": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "GetSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "ImportSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  },
  "UpdateSshPublicKey": {
- "retry_codes_name": "non_idempotent",
+ "timeout_millis": 10000,
+ "retry_codes_name": "idempotent",
  "retry_params_name": "default"
  }
  }

diff --git a/packages/google-cloud-oslogin/src/v1beta/os_login_service_proto_list.json b/packages/google-cloud-oslogin/src/v1beta/os_login_service_proto_list.json
@@ -1,4 +1,3 @@
 [
- "../../protos/google/cloud/oslogin/common/common.proto",
  "../../protos/google/cloud/oslogin/v1beta/oslogin.proto"
 ]