Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependency google-proto-files to ^0.18.0 #348

Merged
merged 2 commits into from
Nov 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@grpc/proto-loader": "^0.3.0",
"duplexify": "^3.6.0",
"google-auth-library": "^2.0.0",
"google-proto-files": "^0.17.0",
"google-proto-files": "^0.18.0",
"grpc": "^1.15.1",
"is-stream-ended": "^0.1.4",
"lodash.at": "^4.6.0",
Expand Down
5 changes: 2 additions & 3 deletions src/grpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import * as grpcProtoLoaderTypes from '@grpc/proto-loader'; // for types only
import * as fs from 'fs';
import {GoogleAuth, GoogleAuthOptions} from 'google-auth-library';
import {getProtoPath} from 'google-proto-files';
import * as grpcTypes from 'grpc'; // for types only
import {OutgoingHttpHeaders} from 'http';
import * as path from 'path';
Expand All @@ -42,9 +43,7 @@ import * as walk from 'walkdir';

import * as gax from './gax';

let googleProtoFilesDir = require('google-proto-files')('..');
googleProtoFilesDir = path.normalize(googleProtoFilesDir);

const googleProtoFilesDir = path.normalize(getProtoPath('..'));

// INCLUDE_DIRS is passed to @grpc/proto-loader
const INCLUDE_DIRS: string[] = [];
Expand Down
5 changes: 4 additions & 1 deletion src/operations_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
* merge preserves those additions if the generated source changes.
*/

import {getProtoPath} from 'google-proto-files';

import * as apiCallable from './api_callable';
import * as gax from './gax';
import * as pagedIteration from './paged_iteration';
Expand Down Expand Up @@ -431,9 +433,10 @@ export class OperationsClient {
return this['_deleteOperation'](request, options, callback);
}
}

export class OperationsClientBuilder {
constructor(gaxGrpc) {
const protoFilesRoot = require('google-proto-files')('..');
const protoFilesRoot = getProtoPath('..');
const operationsClient = gaxGrpc.loadProto(
protoFilesRoot, 'google/longrunning/operations.proto');
Object.assign(this, operationsClient.google.longrunning);
Expand Down