Skip to content

fix(deps): update dependency grpc-gcp to ^0.3.0 #885

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

fix(deps): update dependency grpc-gcp to ^0.3.0 #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a69596
fix(deps): update dependency grpc-gcp to ^0.3.0
renovate-bot Apr 15, 2020
16971ee
fix: attempt at fixing grpc-gcp import issue
skuruppu Apr 18, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"google-auth-library": "^6.0.0",
"google-gax": "^2.1.0",
"grpc": "^1.21.1",
"grpc-gcp": "^0.1.1",
"grpc-gcp": "^0.3.0",
"is": "^3.2.1",
"lodash.snakecase": "^4.1.1",
"merge-stream": "^2.0.0",
Expand Down
14 changes: 6 additions & 8 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,15 @@ import {Table} from './table';
import {PartitionedDml, Snapshot, Transaction} from './transaction';
import {GrpcClientOptions} from 'google-gax';
import {ChannelCredentials} from 'grpc';
import {
createGcpApiConfig,
gcpCallInvocationTransformer,
gcpChannelFactoryOverride,
} from 'grpc-gcp';
import * as v1 from './v1';
import * as grpc from 'grpc';

// eslint-disable-next-line @typescript-eslint/no-var-requires
const gcpApiConfig = require('./spanner_grpc_config.json');

// eslint-disable-next-line @typescript-eslint/no-var-requires
const grpcGcp = require('grpc-gcp')(grpc);

export type IOperation = instanceAdmin.longrunning.IOperation;
export type CreateInstanceResponse = [Instance, GaxOperation, IOperation];

Expand Down Expand Up @@ -199,9 +197,9 @@ class Spanner extends GrpcService {
libVersion: require('../../package.json').version,
scopes,
// Enable grpc-gcp support
'grpc.callInvocationTransformer': gcpCallInvocationTransformer,
'grpc.channelFactoryOverride': gcpChannelFactoryOverride,
'grpc.gcpApiConfig': createGcpApiConfig(gcpApiConfig),
'grpc.callInvocationTransformer': grpcGcp.gcpCallInvocationTransformer,
'grpc.channelFactoryOverride': grpcGcp.gcpChannelFactoryOverride,
'grpc.gcpApiConfig': grpcGcp.createGcpApiConfig(gcpApiConfig),
grpc,
},
options || {}
Expand Down