From 432cb3da3a67f51c3eb662f7ee4c24e65b185f6a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 11 Aug 2020 22:24:04 -0700 Subject: [PATCH] build: use gapic-generator-typescrit, correct PHP namespace for BQ connection, update protos (#29) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/5f7f9c6d-c75a-4c60-8bb8-0026a14cead7/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 325949033 Source-Link: https://github.com/googleapis/googleapis/commit/94006b3cb8d2fb44703cf535da15608eed6bf7db PiperOrigin-RevId: 323795963 Source-Link: https://github.com/googleapis/googleapis/commit/c1b9289be1be876ef494f31c9662bc49b4f906e0 --- .../google/cloud/bigquery/connection/v1/connection.proto | 2 +- .../google-cloud-bigquery-connection/protos/protos.d.ts | 2 +- packages/google-cloud-bigquery-connection/protos/protos.js | 2 +- .../google-cloud-bigquery-connection/protos/protos.json | 2 +- .../src/v1/connection_service_client.ts | 5 ++--- packages/google-cloud-bigquery-connection/synth.metadata | 6 +++--- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/google-cloud-bigquery-connection/protos/google/cloud/bigquery/connection/v1/connection.proto b/packages/google-cloud-bigquery-connection/protos/google/cloud/bigquery/connection/v1/connection.proto index 47399138093..2d1eccfc447 100644 --- a/packages/google-cloud-bigquery-connection/protos/google/cloud/bigquery/connection/v1/connection.proto +++ b/packages/google-cloud-bigquery-connection/protos/google/cloud/bigquery/connection/v1/connection.proto @@ -30,7 +30,7 @@ option csharp_namespace = "Google.Cloud.BigQuery.Connection.V1"; option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/connection/v1;connection"; option java_multiple_files = true; option java_package = "com.google.cloud.bigquery.connection.v1"; -option php_namespace = "Google\\Cloud\\BigQuery\\Connection\\V1beta1"; +option php_namespace = "Google\\Cloud\\BigQuery\\Connection\\V1"; // Manages external data source connections and credentials. service ConnectionService { diff --git a/packages/google-cloud-bigquery-connection/protos/protos.d.ts b/packages/google-cloud-bigquery-connection/protos/protos.d.ts index 77668b8e833..25b205b4993 100644 --- a/packages/google-cloud-bigquery-connection/protos/protos.d.ts +++ b/packages/google-cloud-bigquery-connection/protos/protos.d.ts @@ -13,7 +13,7 @@ // limitations under the License. import * as Long from "long"; -import * as $protobuf from "protobufjs"; +import {protobuf as $protobuf} from "google-gax"; /** Namespace google. */ export namespace google { diff --git a/packages/google-cloud-bigquery-connection/protos/protos.js b/packages/google-cloud-bigquery-connection/protos/protos.js index 1e83a9c9227..11b009f0580 100644 --- a/packages/google-cloud-bigquery-connection/protos/protos.js +++ b/packages/google-cloud-bigquery-connection/protos/protos.js @@ -19,7 +19,7 @@ define(["protobufjs/minimal"], factory); /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports) - module.exports = factory(require("protobufjs/minimal")); + module.exports = factory(require("google-gax").protobufMinimal); })(this, function($protobuf) { "use strict"; diff --git a/packages/google-cloud-bigquery-connection/protos/protos.json b/packages/google-cloud-bigquery-connection/protos/protos.json index 56075de46b4..58922ab423d 100644 --- a/packages/google-cloud-bigquery-connection/protos/protos.json +++ b/packages/google-cloud-bigquery-connection/protos/protos.json @@ -14,7 +14,7 @@ "go_package": "google.golang.org/genproto/googleapis/cloud/bigquery/connection/v1;connection", "java_multiple_files": true, "java_package": "com.google.cloud.bigquery.connection.v1", - "php_namespace": "Google\\Cloud\\BigQuery\\Connection\\V1beta1" + "php_namespace": "Google\\Cloud\\BigQuery\\Connection\\V1" }, "nested": { "ConnectionService": { diff --git a/packages/google-cloud-bigquery-connection/src/v1/connection_service_client.ts b/packages/google-cloud-bigquery-connection/src/v1/connection_service_client.ts index 64c1317eea8..45077d13d38 100644 --- a/packages/google-cloud-bigquery-connection/src/v1/connection_service_client.ts +++ b/packages/google-cloud-bigquery-connection/src/v1/connection_service_client.ts @@ -249,12 +249,11 @@ export class ConnectionServiceClient { } ); + const descriptor = this.descriptors.page[methodName] || undefined; const apiCall = this._gaxModule.createApiCall( callPromise, this._defaults[methodName], - this.descriptors.page[methodName] || - this.descriptors.stream[methodName] || - this.descriptors.longrunning[methodName] + descriptor ); this.innerApiCalls[methodName] = apiCall; diff --git a/packages/google-cloud-bigquery-connection/synth.metadata b/packages/google-cloud-bigquery-connection/synth.metadata index ca76cf50cf9..0390bd428bd 100644 --- a/packages/google-cloud-bigquery-connection/synth.metadata +++ b/packages/google-cloud-bigquery-connection/synth.metadata @@ -4,15 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/nodejs-bigquery-connection.git", - "sha": "297340ab64a53fef9080ec3bda11e3869a0746ea" + "sha": "39313b930e12a20203d137058899479ca83d51d5" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0c6a73081373ff3ff3d470efe554f2f1efd64041", - "internalRef": "323605868" + "sha": "94006b3cb8d2fb44703cf535da15608eed6bf7db", + "internalRef": "325949033" } }, {