diff --git a/src/v2/bigtable_client.ts b/src/v2/bigtable_client.ts index d0012edb2..83102ce94 100644 --- a/src/v2/bigtable_client.ts +++ b/src/v2/bigtable_client.ts @@ -332,7 +332,7 @@ export class BigtableClient { /** * The DNS address for this API service. - * @deprecated + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get servicePath() { @@ -349,9 +349,8 @@ export class BigtableClient { } /** - * The DNS address for this API service - same as servicePath, - * exists for compatibility reasons. - * @deprecated + * The DNS address for this API service - same as servicePath. + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get apiEndpoint() { @@ -371,14 +370,6 @@ export class BigtableClient { * The DNS address for this API service. * @returns {string} The DNS address for this service. */ - get servicePath() { - return this._servicePath; - } - - /** - * The DNS address for this API service - same as servicePath(). - * @returns {string} The DNS address for this service. - */ get apiEndpoint() { return this._servicePath; } diff --git a/src/v2/bigtable_instance_admin_client.ts b/src/v2/bigtable_instance_admin_client.ts index 1e4fb9b05..b67984c7f 100644 --- a/src/v2/bigtable_instance_admin_client.ts +++ b/src/v2/bigtable_instance_admin_client.ts @@ -450,7 +450,7 @@ export class BigtableInstanceAdminClient { /** * The DNS address for this API service. - * @deprecated + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get servicePath() { @@ -467,9 +467,8 @@ export class BigtableInstanceAdminClient { } /** - * The DNS address for this API service - same as servicePath, - * exists for compatibility reasons. - * @deprecated + * The DNS address for this API service - same as servicePath. + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get apiEndpoint() { @@ -489,14 +488,6 @@ export class BigtableInstanceAdminClient { * The DNS address for this API service. * @returns {string} The DNS address for this service. */ - get servicePath() { - return this._servicePath; - } - - /** - * The DNS address for this API service - same as servicePath(). - * @returns {string} The DNS address for this service. - */ get apiEndpoint() { return this._servicePath; } diff --git a/src/v2/bigtable_table_admin_client.ts b/src/v2/bigtable_table_admin_client.ts index 9e6132174..8ca05f513 100644 --- a/src/v2/bigtable_table_admin_client.ts +++ b/src/v2/bigtable_table_admin_client.ts @@ -470,7 +470,7 @@ export class BigtableTableAdminClient { /** * The DNS address for this API service. - * @deprecated + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get servicePath() { @@ -487,9 +487,8 @@ export class BigtableTableAdminClient { } /** - * The DNS address for this API service - same as servicePath, - * exists for compatibility reasons. - * @deprecated + * The DNS address for this API service - same as servicePath. + * @deprecated Use the apiEndpoint method of the client instance. * @returns {string} The DNS address for this service. */ static get apiEndpoint() { @@ -509,14 +508,6 @@ export class BigtableTableAdminClient { * The DNS address for this API service. * @returns {string} The DNS address for this service. */ - get servicePath() { - return this._servicePath; - } - - /** - * The DNS address for this API service - same as servicePath(). - * @returns {string} The DNS address for this service. - */ get apiEndpoint() { return this._servicePath; } diff --git a/src/v2/bigtable_table_admin_client_config.json b/src/v2/bigtable_table_admin_client_config.json index 5ed77e65a..8ddb3cd4c 100644 --- a/src/v2/bigtable_table_admin_client_config.json +++ b/src/v2/bigtable_table_admin_client_config.json @@ -53,7 +53,7 @@ "retry_params_name": "default" }, "DeleteTable": { - "timeout_millis": 60000, + "timeout_millis": 300000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, @@ -96,7 +96,7 @@ "retry_params_name": "264268458a9e88347dbacbd9398202ff5885a40b" }, "DeleteSnapshot": { - "timeout_millis": 60000, + "timeout_millis": 300000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, @@ -116,7 +116,7 @@ "retry_params_name": "default" }, "DeleteBackup": { - "timeout_millis": 60000, + "timeout_millis": 300000, "retry_codes_name": "non_idempotent", "retry_params_name": "default" }, diff --git a/test/gapic_bigtable_instance_admin_v2.ts b/test/gapic_bigtable_instance_admin_v2.ts index cf8180226..a54590546 100644 --- a/test/gapic_bigtable_instance_admin_v2.ts +++ b/test/gapic_bigtable_instance_admin_v2.ts @@ -161,13 +161,6 @@ function stubAsyncIterationCall( describe('v2.BigtableInstanceAdminClient', () => { describe('Common methods', () => { - it('has servicePath', () => { - const client = - new bigtableinstanceadminModule.v2.BigtableInstanceAdminClient(); - const servicePath = client.servicePath; - assert.strictEqual(servicePath, 'bigtableadmin.googleapis.com'); - }); - it('has apiEndpoint', () => { const client = new bigtableinstanceadminModule.v2.BigtableInstanceAdminClient(); @@ -206,21 +199,21 @@ describe('v2.BigtableInstanceAdminClient', () => { stub.restore(); }); } - it('sets servicePath according to universe domain camelCase', () => { + it('sets apiEndpoint according to universe domain camelCase', () => { const client = new bigtableinstanceadminModule.v2.BigtableInstanceAdminClient({ universeDomain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'bigtableadmin.example.com'); }); - it('sets servicePath according to universe domain snakeCase', () => { + it('sets apiEndpoint according to universe domain snakeCase', () => { const client = new bigtableinstanceadminModule.v2.BigtableInstanceAdminClient({ universe_domain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'bigtableadmin.example.com'); }); it('does not allow setting both universeDomain and universe_domain', () => { diff --git a/test/gapic_bigtable_table_admin_v2.ts b/test/gapic_bigtable_table_admin_v2.ts index 2c7094a47..90e5b1801 100644 --- a/test/gapic_bigtable_table_admin_v2.ts +++ b/test/gapic_bigtable_table_admin_v2.ts @@ -161,12 +161,6 @@ function stubAsyncIterationCall( describe('v2.BigtableTableAdminClient', () => { describe('Common methods', () => { - it('has servicePath', () => { - const client = new bigtabletableadminModule.v2.BigtableTableAdminClient(); - const servicePath = client.servicePath; - assert.strictEqual(servicePath, 'bigtableadmin.googleapis.com'); - }); - it('has apiEndpoint', () => { const client = new bigtabletableadminModule.v2.BigtableTableAdminClient(); const apiEndpoint = client.apiEndpoint; @@ -201,19 +195,19 @@ describe('v2.BigtableTableAdminClient', () => { stub.restore(); }); } - it('sets servicePath according to universe domain camelCase', () => { + it('sets apiEndpoint according to universe domain camelCase', () => { const client = new bigtabletableadminModule.v2.BigtableTableAdminClient({ universeDomain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'bigtableadmin.example.com'); }); - it('sets servicePath according to universe domain snakeCase', () => { + it('sets apiEndpoint according to universe domain snakeCase', () => { const client = new bigtabletableadminModule.v2.BigtableTableAdminClient({ universe_domain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'bigtableadmin.example.com'); }); it('does not allow setting both universeDomain and universe_domain', () => { diff --git a/test/gapic_bigtable_v2.ts b/test/gapic_bigtable_v2.ts index 06cc456ea..eae52474a 100644 --- a/test/gapic_bigtable_v2.ts +++ b/test/gapic_bigtable_v2.ts @@ -89,12 +89,6 @@ function stubServerStreamingCall( describe('v2.BigtableClient', () => { describe('Common methods', () => { - it('has servicePath', () => { - const client = new bigtableModule.v2.BigtableClient(); - const servicePath = client.servicePath; - assert.strictEqual(servicePath, 'bigtable.googleapis.com'); - }); - it('has apiEndpoint', () => { const client = new bigtableModule.v2.BigtableClient(); const apiEndpoint = client.apiEndpoint; @@ -127,19 +121,19 @@ describe('v2.BigtableClient', () => { stub.restore(); }); } - it('sets servicePath according to universe domain camelCase', () => { + it('sets apiEndpoint according to universe domain camelCase', () => { const client = new bigtableModule.v2.BigtableClient({ universeDomain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'bigtable.example.com'); }); - it('sets servicePath according to universe domain snakeCase', () => { + it('sets apiEndpoint according to universe domain snakeCase', () => { const client = new bigtableModule.v2.BigtableClient({ universe_domain: 'example.com', }); - const servicePath = client.servicePath; + const servicePath = client.apiEndpoint; assert.strictEqual(servicePath, 'bigtable.example.com'); }); it('does not allow setting both universeDomain and universe_domain', () => {