Skip to content

Commit 0eccc12

Browse files
fix: use require() to load JSON protos (#42)
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
1 parent d294bfa commit 0eccc12

File tree

1 file changed

+4
-22
lines changed

1 file changed

+4
-22
lines changed

packages/google-devtools-artifactregistry/src/v1beta2/artifact_registry_client.ts

+4-22
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import * as path from 'path';
3232
import {Transform} from 'stream';
3333
import {RequestType} from 'google-gax/build/src/apitypes';
3434
import * as protos from '../../protos/protos';
35+
import jsonProtos = require('../../protos/protos.json');
3536
/**
3637
* Client JSON configuration object, loaded from
3738
* `src/v1beta2/artifact_registry_client_config.json`.
@@ -159,22 +160,7 @@ export class ArtifactRegistryClient {
159160
clientHeader.push(`${opts.libName}/${opts.libVersion}`);
160161
}
161162
// Load the applicable protos.
162-
// For Node.js, pass the path to JSON proto file.
163-
// For browsers, pass the JSON content.
164-
165-
const nodejsProtoPath = path.join(
166-
__dirname,
167-
'..',
168-
'..',
169-
'protos',
170-
'protos.json'
171-
);
172-
this._protos = this._gaxGrpc.loadProto(
173-
opts.fallback
174-
? // eslint-disable-next-line @typescript-eslint/no-var-requires
175-
require('../../protos/protos.json')
176-
: nodejsProtoPath
177-
);
163+
this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos);
178164

179165
// This API contains "path templates"; forward-slash-separated
180166
// identifiers to uniquely identify resources within the API.
@@ -219,15 +205,11 @@ export class ArtifactRegistryClient {
219205
),
220206
};
221207

208+
const protoFilesRoot = this._gaxModule.protobuf.Root.fromJSON(jsonProtos);
209+
222210
// This API contains "long-running operations", which return a
223211
// an Operation object that allows for tracking of the operation,
224212
// rather than holding a request open.
225-
const protoFilesRoot = opts.fallback
226-
? this._gaxModule.protobuf.Root.fromJSON(
227-
// eslint-disable-next-line @typescript-eslint/no-var-requires
228-
require('../../protos/protos.json')
229-
)
230-
: this._gaxModule.protobuf.loadSync(nodejsProtoPath);
231213

232214
this.operationsClient = this._gaxModule
233215
.lro({

0 commit comments

Comments
 (0)