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.

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

Jump to bottom

fix: export this.operationsClient #166

Merged
merged 3 commits into from
Dec 10, 2019
Merged

fix: export this.operationsClient #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c35aa33
fix: export this.operationsClient
alexander-fenster Dec 9, 2019
287adb8
fix: do not expose operationsClient if no LRO
alexander-fenster Dec 9, 2019
be83841
Merge branch 'master' into operations-client
alexander-fenster Dec 10, 2019
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 templates/typescript_gapic/package.json.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ limitations under the License.
"test": "c8 mocha build/test"
},
"dependencies": {
"google-gax": "^1.11.0"
"google-gax": "^1.12.0"
},
"devDependencies": {
"@types/mocha": "^5.2.5",
Expand Down
7 changes: 5 additions & 2 deletions templates/typescript_gapic/src/$version/$service_client.ts.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ export class {{ service.name }}Client {
{%- endif %}
private _terminated = false;
auth: gax.GoogleAuth;
{%- if (service.longRunning.length > 0) %}
operationsClient: gax.OperationsClient;
{%- endif %}
{{ service.name.toCamelCase() }}Stub: Promise<{[name: string]: Function}>;

/**
Expand Down Expand Up @@ -185,7 +188,7 @@ export class {{ service.name }}Client {
gaxModule.protobuf.Root.fromJSON(require("../../protos/protos.json")) :
gaxModule.protobuf.loadSync(nodejsProtoPath);

const operationsClient = gaxModule.lro({
this.operationsClient = gaxModule.lro({
auth: this.auth,
grpc: 'grpc' in gaxGrpc ? gaxGrpc.grpc : undefined
}).operationsClient(opts);
Expand All @@ -202,7 +205,7 @@ export class {{ service.name }}Client {
{%- for method in service.longRunning %}
{{- longRunningJoiner() }}
{{ method.name.toCamelCase() }}: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
{{ method.name.toCamelCase() }}Response.decode.bind({{ method.name.toCamelCase() }}Response),
{{ method.name.toCamelCase() }}Metadata.decode.bind({{ method.name.toCamelCase() }}Metadata))
{%- endfor %}
Expand Down
2 changes: 1 addition & 1 deletion typescript/test/testdata/keymanager/package.json.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test": "c8 mocha build/test"
},
"dependencies": {
"google-gax": "^1.11.0"
"google-gax": "^1.12.0"
},
"devDependencies": {
"@types/mocha": "^5.2.5",
Expand Down
2 changes: 1 addition & 1 deletion typescript/test/testdata/redis/package.json.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test": "c8 mocha build/test"
},
"dependencies": {
"google-gax": "^1.11.0"
"google-gax": "^1.12.0"
},
"devDependencies": {
"@types/mocha": "^5.2.5",
Expand Down
15 changes: 8 additions & 7 deletions typescript/test/testdata/redis/src/v1beta1/cloud_redis_client.ts.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export class CloudRedisClient {
private _pathTemplates: {[name: string]: gax.PathTemplate};
private _terminated = false;
auth: gax.GoogleAuth;
operationsClient: gax.OperationsClient;
cloudRedisStub: Promise<{[name: string]: Function}>;

/**
Expand Down Expand Up @@ -168,7 +169,7 @@ export class CloudRedisClient {
gaxModule.protobuf.Root.fromJSON(require("../../protos/protos.json")) :
gaxModule.protobuf.loadSync(nodejsProtoPath);

const operationsClient = gaxModule.lro({
this.operationsClient = gaxModule.lro({
auth: this.auth,
grpc: 'grpc' in gaxGrpc ? gaxGrpc.grpc : undefined
}).operationsClient(opts);
Expand Down Expand Up @@ -199,27 +200,27 @@ export class CloudRedisClient {

this._descriptors.longrunning = {
createInstance: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
createInstanceResponse.decode.bind(createInstanceResponse),
createInstanceMetadata.decode.bind(createInstanceMetadata)),
updateInstance: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
updateInstanceResponse.decode.bind(updateInstanceResponse),
updateInstanceMetadata.decode.bind(updateInstanceMetadata)),
importInstance: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
importInstanceResponse.decode.bind(importInstanceResponse),
importInstanceMetadata.decode.bind(importInstanceMetadata)),
exportInstance: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
exportInstanceResponse.decode.bind(exportInstanceResponse),
exportInstanceMetadata.decode.bind(exportInstanceMetadata)),
failoverInstance: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
failoverInstanceResponse.decode.bind(failoverInstanceResponse),
failoverInstanceMetadata.decode.bind(failoverInstanceMetadata)),
deleteInstance: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
deleteInstanceResponse.decode.bind(deleteInstanceResponse),
deleteInstanceMetadata.decode.bind(deleteInstanceMetadata))
};
Expand Down
2 changes: 1 addition & 1 deletion typescript/test/testdata/showcase/package.json.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test": "c8 mocha build/test"
},
"dependencies": {
"google-gax": "^1.11.0"
"google-gax": "^1.12.0"
},
"devDependencies": {
"@types/mocha": "^5.2.5",
Expand Down
5 changes: 3 additions & 2 deletions typescript/test/testdata/showcase/src/v1beta1/echo_client.ts.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export class EchoClient {
private _innerApiCalls: {[name: string]: Function};
private _terminated = false;
auth: gax.GoogleAuth;
operationsClient: gax.OperationsClient;
echoStub: Promise<{[name: string]: Function}>;

/**
Expand Down Expand Up @@ -152,7 +153,7 @@ export class EchoClient {
gaxModule.protobuf.Root.fromJSON(require("../../protos/protos.json")) :
gaxModule.protobuf.loadSync(nodejsProtoPath);

const operationsClient = gaxModule.lro({
this.operationsClient = gaxModule.lro({
auth: this.auth,
grpc: 'grpc' in gaxGrpc ? gaxGrpc.grpc : undefined
}).operationsClient(opts);
Expand All @@ -163,7 +164,7 @@ export class EchoClient {

this._descriptors.longrunning = {
wait: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
waitResponse.decode.bind(waitResponse),
waitMetadata.decode.bind(waitMetadata))
};
Expand Down
2 changes: 1 addition & 1 deletion typescript/test/testdata/texttospeech/package.json.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test": "c8 mocha build/test"
},
"dependencies": {
"google-gax": "^1.11.0"
"google-gax": "^1.12.0"
},
"devDependencies": {
"@types/mocha": "^5.2.5",
Expand Down
2 changes: 1 addition & 1 deletion typescript/test/testdata/translate/package.json.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test": "c8 mocha build/test"
},
"dependencies": {
"google-gax": "^1.11.0"
"google-gax": "^1.12.0"
},
"devDependencies": {
"@types/mocha": "^5.2.5",
Expand Down
9 changes: 5 additions & 4 deletions typescript/test/testdata/translate/src/v3beta1/translation_service_client.ts.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export class TranslationServiceClient {
private _pathTemplates: {[name: string]: gax.PathTemplate};
private _terminated = false;
auth: gax.GoogleAuth;
operationsClient: gax.OperationsClient;
translationServiceStub: Promise<{[name: string]: Function}>;

/**
Expand Down Expand Up @@ -154,7 +155,7 @@ export class TranslationServiceClient {
gaxModule.protobuf.Root.fromJSON(require("../../protos/protos.json")) :
gaxModule.protobuf.loadSync(nodejsProtoPath);

const operationsClient = gaxModule.lro({
this.operationsClient = gaxModule.lro({
auth: this.auth,
grpc: 'grpc' in gaxGrpc ? gaxGrpc.grpc : undefined
}).operationsClient(opts);
Expand All @@ -173,15 +174,15 @@ export class TranslationServiceClient {

this._descriptors.longrunning = {
batchTranslateText: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
batchTranslateTextResponse.decode.bind(batchTranslateTextResponse),
batchTranslateTextMetadata.decode.bind(batchTranslateTextMetadata)),
createGlossary: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
createGlossaryResponse.decode.bind(createGlossaryResponse),
createGlossaryMetadata.decode.bind(createGlossaryMetadata)),
deleteGlossary: new gaxModule.LongrunningDescriptor(
operationsClient,
this.operationsClient,
deleteGlossaryResponse.decode.bind(deleteGlossaryResponse),
deleteGlossaryMetadata.decode.bind(deleteGlossaryMetadata))
};
Expand Down