diff --git a/src/v1/data_catalog_client.ts b/src/v1/data_catalog_client.ts index 5bfd572e..51e57073 100644 --- a/src/v1/data_catalog_client.ts +++ b/src/v1/data_catalog_client.ts @@ -26,11 +26,11 @@ import { PaginationCallback, GaxCall, } from 'google-gax'; -import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1/data_catalog_client_config.json`. @@ -141,27 +141,14 @@ export class DataCatalogClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. @@ -382,7 +369,7 @@ export class DataCatalogClient { // -- Service calls -- // ------------------- createEntryGroup( - request: protos.google.cloud.datacatalog.v1.ICreateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -461,7 +448,7 @@ export class DataCatalogClient { * const [response] = await client.createEntryGroup(request); */ createEntryGroup( - request: protos.google.cloud.datacatalog.v1.ICreateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -504,7 +491,7 @@ export class DataCatalogClient { return this.innerApiCalls.createEntryGroup(request, options, callback); } getEntryGroup( - request: protos.google.cloud.datacatalog.v1.IGetEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.IGetEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -555,7 +542,7 @@ export class DataCatalogClient { * const [response] = await client.getEntryGroup(request); */ getEntryGroup( - request: protos.google.cloud.datacatalog.v1.IGetEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.IGetEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -598,7 +585,7 @@ export class DataCatalogClient { return this.innerApiCalls.getEntryGroup(request, options, callback); } updateEntryGroup( - request: protos.google.cloud.datacatalog.v1.IUpdateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -656,7 +643,7 @@ export class DataCatalogClient { * const [response] = await client.updateEntryGroup(request); */ updateEntryGroup( - request: protos.google.cloud.datacatalog.v1.IUpdateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -699,7 +686,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateEntryGroup(request, options, callback); } deleteEntryGroup( - request: protos.google.cloud.datacatalog.v1.IDeleteEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -754,7 +741,7 @@ export class DataCatalogClient { * const [response] = await client.deleteEntryGroup(request); */ deleteEntryGroup( - request: protos.google.cloud.datacatalog.v1.IDeleteEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -797,7 +784,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteEntryGroup(request, options, callback); } createEntry( - request: protos.google.cloud.datacatalog.v1.ICreateEntryRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateEntryRequest, options?: CallOptions ): Promise< [ @@ -862,7 +849,7 @@ export class DataCatalogClient { * const [response] = await client.createEntry(request); */ createEntry( - request: protos.google.cloud.datacatalog.v1.ICreateEntryRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -903,7 +890,7 @@ export class DataCatalogClient { return this.innerApiCalls.createEntry(request, options, callback); } updateEntry( - request: protos.google.cloud.datacatalog.v1.IUpdateEntryRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateEntryRequest, options?: CallOptions ): Promise< [ @@ -976,7 +963,7 @@ export class DataCatalogClient { * const [response] = await client.updateEntry(request); */ updateEntry( - request: protos.google.cloud.datacatalog.v1.IUpdateEntryRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1017,7 +1004,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateEntry(request, options, callback); } deleteEntry( - request: protos.google.cloud.datacatalog.v1.IDeleteEntryRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteEntryRequest, options?: CallOptions ): Promise< [ @@ -1069,7 +1056,7 @@ export class DataCatalogClient { * const [response] = await client.deleteEntry(request); */ deleteEntry( - request: protos.google.cloud.datacatalog.v1.IDeleteEntryRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1110,7 +1097,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteEntry(request, options, callback); } getEntry( - request: protos.google.cloud.datacatalog.v1.IGetEntryRequest, + request?: protos.google.cloud.datacatalog.v1.IGetEntryRequest, options?: CallOptions ): Promise< [ @@ -1156,7 +1143,7 @@ export class DataCatalogClient { * const [response] = await client.getEntry(request); */ getEntry( - request: protos.google.cloud.datacatalog.v1.IGetEntryRequest, + request?: protos.google.cloud.datacatalog.v1.IGetEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1197,7 +1184,7 @@ export class DataCatalogClient { return this.innerApiCalls.getEntry(request, options, callback); } lookupEntry( - request: protos.google.cloud.datacatalog.v1.ILookupEntryRequest, + request?: protos.google.cloud.datacatalog.v1.ILookupEntryRequest, options?: CallOptions ): Promise< [ @@ -1280,7 +1267,7 @@ export class DataCatalogClient { * const [response] = await client.lookupEntry(request); */ lookupEntry( - request: protos.google.cloud.datacatalog.v1.ILookupEntryRequest, + request?: protos.google.cloud.datacatalog.v1.ILookupEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1315,7 +1302,7 @@ export class DataCatalogClient { return this.innerApiCalls.lookupEntry(request, options, callback); } createTagTemplate( - request: protos.google.cloud.datacatalog.v1.ICreateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1380,7 +1367,7 @@ export class DataCatalogClient { * const [response] = await client.createTagTemplate(request); */ createTagTemplate( - request: protos.google.cloud.datacatalog.v1.ICreateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1423,7 +1410,7 @@ export class DataCatalogClient { return this.innerApiCalls.createTagTemplate(request, options, callback); } getTagTemplate( - request: protos.google.cloud.datacatalog.v1.IGetTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.IGetTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1473,7 +1460,7 @@ export class DataCatalogClient { * const [response] = await client.getTagTemplate(request); */ getTagTemplate( - request: protos.google.cloud.datacatalog.v1.IGetTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.IGetTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1516,7 +1503,7 @@ export class DataCatalogClient { return this.innerApiCalls.getTagTemplate(request, options, callback); } updateTagTemplate( - request: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1577,7 +1564,7 @@ export class DataCatalogClient { * const [response] = await client.updateTagTemplate(request); */ updateTagTemplate( - request: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1620,7 +1607,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateTagTemplate(request, options, callback); } deleteTagTemplate( - request: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1678,7 +1665,7 @@ export class DataCatalogClient { * const [response] = await client.deleteTagTemplate(request); */ deleteTagTemplate( - request: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1721,7 +1708,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteTagTemplate(request, options, callback); } createTagTemplateField( - request: protos.google.cloud.datacatalog.v1.ICreateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -1792,7 +1779,7 @@ export class DataCatalogClient { * const [response] = await client.createTagTemplateField(request); */ createTagTemplateField( - request: protos.google.cloud.datacatalog.v1.ICreateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1842,7 +1829,7 @@ export class DataCatalogClient { ); } updateTagTemplateField( - request: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -1918,7 +1905,7 @@ export class DataCatalogClient { * const [response] = await client.updateTagTemplateField(request); */ updateTagTemplateField( - request: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1968,7 +1955,7 @@ export class DataCatalogClient { ); } renameTagTemplateField( - request: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -2027,7 +2014,7 @@ export class DataCatalogClient { * const [response] = await client.renameTagTemplateField(request); */ renameTagTemplateField( - request: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2077,7 +2064,7 @@ export class DataCatalogClient { ); } renameTagTemplateFieldEnumValue( - request: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldEnumValueRequest, + request?: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldEnumValueRequest, options?: CallOptions ): Promise< [ @@ -2133,7 +2120,7 @@ export class DataCatalogClient { * const [response] = await client.renameTagTemplateFieldEnumValue(request); */ renameTagTemplateFieldEnumValue( - request: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldEnumValueRequest, + request?: protos.google.cloud.datacatalog.v1.IRenameTagTemplateFieldEnumValueRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2183,7 +2170,7 @@ export class DataCatalogClient { ); } deleteTagTemplateField( - request: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -2244,7 +2231,7 @@ export class DataCatalogClient { * const [response] = await client.deleteTagTemplateField(request); */ deleteTagTemplateField( - request: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2294,7 +2281,7 @@ export class DataCatalogClient { ); } createTag( - request: protos.google.cloud.datacatalog.v1.ICreateTagRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTagRequest, options?: CallOptions ): Promise< [ @@ -2352,7 +2339,7 @@ export class DataCatalogClient { * const [response] = await client.createTag(request); */ createTag( - request: protos.google.cloud.datacatalog.v1.ICreateTagRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2393,7 +2380,7 @@ export class DataCatalogClient { return this.innerApiCalls.createTag(request, options, callback); } updateTag( - request: protos.google.cloud.datacatalog.v1.IUpdateTagRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTagRequest, options?: CallOptions ): Promise< [ @@ -2444,7 +2431,7 @@ export class DataCatalogClient { * const [response] = await client.updateTag(request); */ updateTag( - request: protos.google.cloud.datacatalog.v1.IUpdateTagRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2485,7 +2472,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateTag(request, options, callback); } deleteTag( - request: protos.google.cloud.datacatalog.v1.IDeleteTagRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTagRequest, options?: CallOptions ): Promise< [ @@ -2531,7 +2518,7 @@ export class DataCatalogClient { * const [response] = await client.deleteTag(request); */ deleteTag( - request: protos.google.cloud.datacatalog.v1.IDeleteTagRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2572,7 +2559,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteTag(request, options, callback); } setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -2635,7 +2622,7 @@ export class DataCatalogClient { * const [response] = await client.setIamPolicy(request); */ setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2674,7 +2661,7 @@ export class DataCatalogClient { return this.innerApiCalls.setIamPolicy(request, options, callback); } getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -2737,7 +2724,7 @@ export class DataCatalogClient { * const [response] = await client.getIamPolicy(request); */ getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2776,7 +2763,7 @@ export class DataCatalogClient { return this.innerApiCalls.getIamPolicy(request, options, callback); } testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, options?: CallOptions ): Promise< [ @@ -2838,7 +2825,7 @@ export class DataCatalogClient { * const [response] = await client.testIamPermissions(request); */ testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2878,7 +2865,7 @@ export class DataCatalogClient { } searchCatalog( - request: protos.google.cloud.datacatalog.v1.ISearchCatalogRequest, + request?: protos.google.cloud.datacatalog.v1.ISearchCatalogRequest, options?: CallOptions ): Promise< [ @@ -2980,7 +2967,7 @@ export class DataCatalogClient { * for more details and examples. */ searchCatalog( - request: protos.google.cloud.datacatalog.v1.ISearchCatalogRequest, + request?: protos.google.cloud.datacatalog.v1.ISearchCatalogRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -3162,7 +3149,7 @@ export class DataCatalogClient { ) as AsyncIterable; } listEntryGroups( - request: protos.google.cloud.datacatalog.v1.IListEntryGroupsRequest, + request?: protos.google.cloud.datacatalog.v1.IListEntryGroupsRequest, options?: CallOptions ): Promise< [ @@ -3222,7 +3209,7 @@ export class DataCatalogClient { * for more details and examples. */ listEntryGroups( - request: protos.google.cloud.datacatalog.v1.IListEntryGroupsRequest, + request?: protos.google.cloud.datacatalog.v1.IListEntryGroupsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -3368,7 +3355,7 @@ export class DataCatalogClient { ) as AsyncIterable; } listEntries( - request: protos.google.cloud.datacatalog.v1.IListEntriesRequest, + request?: protos.google.cloud.datacatalog.v1.IListEntriesRequest, options?: CallOptions ): Promise< [ @@ -3433,7 +3420,7 @@ export class DataCatalogClient { * for more details and examples. */ listEntries( - request: protos.google.cloud.datacatalog.v1.IListEntriesRequest, + request?: protos.google.cloud.datacatalog.v1.IListEntriesRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -3589,7 +3576,7 @@ export class DataCatalogClient { ) as AsyncIterable; } listTags( - request: protos.google.cloud.datacatalog.v1.IListTagsRequest, + request?: protos.google.cloud.datacatalog.v1.IListTagsRequest, options?: CallOptions ): Promise< [ @@ -3648,7 +3635,7 @@ export class DataCatalogClient { * for more details and examples. */ listTags( - request: protos.google.cloud.datacatalog.v1.IListTagsRequest, + request?: protos.google.cloud.datacatalog.v1.IListTagsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< diff --git a/src/v1/policy_tag_manager_client.ts b/src/v1/policy_tag_manager_client.ts index b42d1a88..661630a7 100644 --- a/src/v1/policy_tag_manager_client.ts +++ b/src/v1/policy_tag_manager_client.ts @@ -26,11 +26,11 @@ import { PaginationCallback, GaxCall, } from 'google-gax'; -import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1/policy_tag_manager_client_config.json`. @@ -145,27 +145,14 @@ export class PolicyTagManagerClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. @@ -358,7 +345,7 @@ export class PolicyTagManagerClient { // -- Service calls -- // ------------------- createTaxonomy( - request: protos.google.cloud.datacatalog.v1.ICreateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -409,7 +396,7 @@ export class PolicyTagManagerClient { * const [response] = await client.createTaxonomy(request); */ createTaxonomy( - request: protos.google.cloud.datacatalog.v1.ICreateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.ICreateTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -452,7 +439,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.createTaxonomy(request, options, callback); } deleteTaxonomy( - request: protos.google.cloud.datacatalog.v1.IDeleteTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -503,7 +490,7 @@ export class PolicyTagManagerClient { * const [response] = await client.deleteTaxonomy(request); */ deleteTaxonomy( - request: protos.google.cloud.datacatalog.v1.IDeleteTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.IDeleteTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -546,7 +533,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.deleteTaxonomy(request, options, callback); } updateTaxonomy( - request: protos.google.cloud.datacatalog.v1.IUpdateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -601,7 +588,7 @@ export class PolicyTagManagerClient { * const [response] = await client.updateTaxonomy(request); */ updateTaxonomy( - request: protos.google.cloud.datacatalog.v1.IUpdateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdateTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -644,7 +631,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.updateTaxonomy(request, options, callback); } getTaxonomy( - request: protos.google.cloud.datacatalog.v1.IGetTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.IGetTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -688,7 +675,7 @@ export class PolicyTagManagerClient { * const [response] = await client.getTaxonomy(request); */ getTaxonomy( - request: protos.google.cloud.datacatalog.v1.IGetTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1.IGetTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -729,7 +716,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.getTaxonomy(request, options, callback); } createPolicyTag( - request: protos.google.cloud.datacatalog.v1.ICreatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.ICreatePolicyTagRequest, options?: CallOptions ): Promise< [ @@ -779,7 +766,7 @@ export class PolicyTagManagerClient { * const [response] = await client.createPolicyTag(request); */ createPolicyTag( - request: protos.google.cloud.datacatalog.v1.ICreatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.ICreatePolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -822,7 +809,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.createPolicyTag(request, options, callback); } deletePolicyTag( - request: protos.google.cloud.datacatalog.v1.IDeletePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.IDeletePolicyTagRequest, options?: CallOptions ): Promise< [ @@ -876,7 +863,7 @@ export class PolicyTagManagerClient { * const [response] = await client.deletePolicyTag(request); */ deletePolicyTag( - request: protos.google.cloud.datacatalog.v1.IDeletePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.IDeletePolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -919,7 +906,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.deletePolicyTag(request, options, callback); } updatePolicyTag( - request: protos.google.cloud.datacatalog.v1.IUpdatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdatePolicyTagRequest, options?: CallOptions ): Promise< [ @@ -977,7 +964,7 @@ export class PolicyTagManagerClient { * const [response] = await client.updatePolicyTag(request); */ updatePolicyTag( - request: protos.google.cloud.datacatalog.v1.IUpdatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.IUpdatePolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1020,7 +1007,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.updatePolicyTag(request, options, callback); } getPolicyTag( - request: protos.google.cloud.datacatalog.v1.IGetPolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.IGetPolicyTagRequest, options?: CallOptions ): Promise< [ @@ -1068,7 +1055,7 @@ export class PolicyTagManagerClient { * const [response] = await client.getPolicyTag(request); */ getPolicyTag( - request: protos.google.cloud.datacatalog.v1.IGetPolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1.IGetPolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1111,7 +1098,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.getPolicyTag(request, options, callback); } getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -1159,7 +1146,7 @@ export class PolicyTagManagerClient { * const [response] = await client.getIamPolicy(request); */ getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1198,7 +1185,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.getIamPolicy(request, options, callback); } setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -1248,7 +1235,7 @@ export class PolicyTagManagerClient { * const [response] = await client.setIamPolicy(request); */ setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1287,7 +1274,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.setIamPolicy(request, options, callback); } testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, options?: CallOptions ): Promise< [ @@ -1338,7 +1325,7 @@ export class PolicyTagManagerClient { * const [response] = await client.testIamPermissions(request); */ testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1378,7 +1365,7 @@ export class PolicyTagManagerClient { } listTaxonomies( - request: protos.google.cloud.datacatalog.v1.IListTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1.IListTaxonomiesRequest, options?: CallOptions ): Promise< [ @@ -1436,7 +1423,7 @@ export class PolicyTagManagerClient { * for more details and examples. */ listTaxonomies( - request: protos.google.cloud.datacatalog.v1.IListTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1.IListTaxonomiesRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -1576,7 +1563,7 @@ export class PolicyTagManagerClient { ) as AsyncIterable; } listPolicyTags( - request: protos.google.cloud.datacatalog.v1.IListPolicyTagsRequest, + request?: protos.google.cloud.datacatalog.v1.IListPolicyTagsRequest, options?: CallOptions ): Promise< [ @@ -1633,7 +1620,7 @@ export class PolicyTagManagerClient { * for more details and examples. */ listPolicyTags( - request: protos.google.cloud.datacatalog.v1.IListPolicyTagsRequest, + request?: protos.google.cloud.datacatalog.v1.IListPolicyTagsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< diff --git a/src/v1/policy_tag_manager_serialization_client.ts b/src/v1/policy_tag_manager_serialization_client.ts index b055ce68..35f5c977 100644 --- a/src/v1/policy_tag_manager_serialization_client.ts +++ b/src/v1/policy_tag_manager_serialization_client.ts @@ -19,9 +19,9 @@ /* global window */ import * as gax from 'google-gax'; import {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax'; -import * as path from 'path'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1/policy_tag_manager_serialization_client_config.json`. @@ -134,27 +134,14 @@ export class PolicyTagManagerSerializationClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. @@ -321,7 +308,7 @@ export class PolicyTagManagerSerializationClient { // -- Service calls -- // ------------------- importTaxonomies( - request: protos.google.cloud.datacatalog.v1.IImportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1.IImportTaxonomiesRequest, options?: CallOptions ): Promise< [ @@ -381,7 +368,7 @@ export class PolicyTagManagerSerializationClient { * const [response] = await client.importTaxonomies(request); */ importTaxonomies( - request: protos.google.cloud.datacatalog.v1.IImportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1.IImportTaxonomiesRequest, optionsOrCallback?: | CallOptions | Callback< @@ -424,7 +411,7 @@ export class PolicyTagManagerSerializationClient { return this.innerApiCalls.importTaxonomies(request, options, callback); } exportTaxonomies( - request: protos.google.cloud.datacatalog.v1.IExportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1.IExportTaxonomiesRequest, options?: CallOptions ): Promise< [ @@ -482,7 +469,7 @@ export class PolicyTagManagerSerializationClient { * const [response] = await client.exportTaxonomies(request); */ exportTaxonomies( - request: protos.google.cloud.datacatalog.v1.IExportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1.IExportTaxonomiesRequest, optionsOrCallback?: | CallOptions | Callback< diff --git a/src/v1beta1/data_catalog_client.ts b/src/v1beta1/data_catalog_client.ts index 54dad55f..bcf731c8 100644 --- a/src/v1beta1/data_catalog_client.ts +++ b/src/v1beta1/data_catalog_client.ts @@ -26,11 +26,11 @@ import { PaginationCallback, GaxCall, } from 'google-gax'; -import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1beta1/data_catalog_client_config.json`. @@ -141,27 +141,14 @@ export class DataCatalogClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. @@ -378,7 +365,7 @@ export class DataCatalogClient { // -- Service calls -- // ------------------- createEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.ICreateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -446,7 +433,7 @@ export class DataCatalogClient { * const [response] = await client.createEntryGroup(request); */ createEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.ICreateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -492,7 +479,7 @@ export class DataCatalogClient { return this.innerApiCalls.createEntryGroup(request, options, callback); } updateEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -550,7 +537,7 @@ export class DataCatalogClient { * const [response] = await client.updateEntryGroup(request); */ updateEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -596,7 +583,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateEntryGroup(request, options, callback); } getEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.IGetEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -647,7 +634,7 @@ export class DataCatalogClient { * const [response] = await client.getEntryGroup(request); */ getEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.IGetEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -690,7 +677,7 @@ export class DataCatalogClient { return this.innerApiCalls.getEntryGroup(request, options, callback); } deleteEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryGroupRequest, options?: CallOptions ): Promise< [ @@ -748,7 +735,7 @@ export class DataCatalogClient { * const [response] = await client.deleteEntryGroup(request); */ deleteEntryGroup( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryGroupRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryGroupRequest, optionsOrCallback?: | CallOptions | Callback< @@ -794,7 +781,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteEntryGroup(request, options, callback); } createEntry( - request: protos.google.cloud.datacatalog.v1beta1.ICreateEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateEntryRequest, options?: CallOptions ): Promise< [ @@ -859,7 +846,7 @@ export class DataCatalogClient { * const [response] = await client.createEntry(request); */ createEntry( - request: protos.google.cloud.datacatalog.v1beta1.ICreateEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -902,7 +889,7 @@ export class DataCatalogClient { return this.innerApiCalls.createEntry(request, options, callback); } updateEntry( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryRequest, options?: CallOptions ): Promise< [ @@ -975,7 +962,7 @@ export class DataCatalogClient { * const [response] = await client.updateEntry(request); */ updateEntry( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1018,7 +1005,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateEntry(request, options, callback); } deleteEntry( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryRequest, options?: CallOptions ): Promise< [ @@ -1074,7 +1061,7 @@ export class DataCatalogClient { * const [response] = await client.deleteEntry(request); */ deleteEntry( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1117,7 +1104,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteEntry(request, options, callback); } getEntry( - request: protos.google.cloud.datacatalog.v1beta1.IGetEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetEntryRequest, options?: CallOptions ): Promise< [ @@ -1167,7 +1154,7 @@ export class DataCatalogClient { * const [response] = await client.getEntry(request); */ getEntry( - request: protos.google.cloud.datacatalog.v1beta1.IGetEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1210,7 +1197,7 @@ export class DataCatalogClient { return this.innerApiCalls.getEntry(request, options, callback); } lookupEntry( - request: protos.google.cloud.datacatalog.v1beta1.ILookupEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ILookupEntryRequest, options?: CallOptions ): Promise< [ @@ -1281,7 +1268,7 @@ export class DataCatalogClient { * const [response] = await client.lookupEntry(request); */ lookupEntry( - request: protos.google.cloud.datacatalog.v1beta1.ILookupEntryRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ILookupEntryRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1318,7 +1305,7 @@ export class DataCatalogClient { return this.innerApiCalls.lookupEntry(request, options, callback); } createTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1382,7 +1369,7 @@ export class DataCatalogClient { * const [response] = await client.createTagTemplate(request); */ createTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1428,7 +1415,7 @@ export class DataCatalogClient { return this.innerApiCalls.createTagTemplate(request, options, callback); } getTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.IGetTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1481,7 +1468,7 @@ export class DataCatalogClient { * const [response] = await client.getTagTemplate(request); */ getTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.IGetTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1527,7 +1514,7 @@ export class DataCatalogClient { return this.innerApiCalls.getTagTemplate(request, options, callback); } updateTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1592,7 +1579,7 @@ export class DataCatalogClient { * const [response] = await client.updateTagTemplate(request); */ updateTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1638,7 +1625,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateTagTemplate(request, options, callback); } deleteTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateRequest, options?: CallOptions ): Promise< [ @@ -1699,7 +1686,7 @@ export class DataCatalogClient { * const [response] = await client.deleteTagTemplate(request); */ deleteTagTemplate( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1745,7 +1732,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteTagTemplate(request, options, callback); } createTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -1813,7 +1800,7 @@ export class DataCatalogClient { * const [response] = await client.createTagTemplateField(request); */ createTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1863,7 +1850,7 @@ export class DataCatalogClient { ); } updateTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -1937,7 +1924,7 @@ export class DataCatalogClient { * const [response] = await client.updateTagTemplateField(request); */ updateTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1987,7 +1974,7 @@ export class DataCatalogClient { ); } renameTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.IRenameTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IRenameTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -2046,7 +2033,7 @@ export class DataCatalogClient { * const [response] = await client.renameTagTemplateField(request); */ renameTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.IRenameTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IRenameTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2096,7 +2083,7 @@ export class DataCatalogClient { ); } deleteTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateFieldRequest, options?: CallOptions ): Promise< [ @@ -2157,7 +2144,7 @@ export class DataCatalogClient { * const [response] = await client.deleteTagTemplateField(request); */ deleteTagTemplateField( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateFieldRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTagTemplateFieldRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2207,7 +2194,7 @@ export class DataCatalogClient { ); } createTag( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTagRequest, options?: CallOptions ): Promise< [ @@ -2269,7 +2256,7 @@ export class DataCatalogClient { * const [response] = await client.createTag(request); */ createTag( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2312,7 +2299,7 @@ export class DataCatalogClient { return this.innerApiCalls.createTag(request, options, callback); } updateTag( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTagRequest, options?: CallOptions ): Promise< [ @@ -2363,7 +2350,7 @@ export class DataCatalogClient { * const [response] = await client.updateTag(request); */ updateTag( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2406,7 +2393,7 @@ export class DataCatalogClient { return this.innerApiCalls.updateTag(request, options, callback); } deleteTag( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTagRequest, options?: CallOptions ): Promise< [ @@ -2456,7 +2443,7 @@ export class DataCatalogClient { * const [response] = await client.deleteTag(request); */ deleteTag( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2499,7 +2486,7 @@ export class DataCatalogClient { return this.innerApiCalls.deleteTag(request, options, callback); } setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -2562,7 +2549,7 @@ export class DataCatalogClient { * const [response] = await client.setIamPolicy(request); */ setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2601,7 +2588,7 @@ export class DataCatalogClient { return this.innerApiCalls.setIamPolicy(request, options, callback); } getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -2664,7 +2651,7 @@ export class DataCatalogClient { * const [response] = await client.getIamPolicy(request); */ getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2703,7 +2690,7 @@ export class DataCatalogClient { return this.innerApiCalls.getIamPolicy(request, options, callback); } testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, options?: CallOptions ): Promise< [ @@ -2765,7 +2752,7 @@ export class DataCatalogClient { * const [response] = await client.testIamPermissions(request); */ testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, optionsOrCallback?: | CallOptions | Callback< @@ -2805,7 +2792,7 @@ export class DataCatalogClient { } searchCatalog( - request: protos.google.cloud.datacatalog.v1beta1.ISearchCatalogRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ISearchCatalogRequest, options?: CallOptions ): Promise< [ @@ -2906,7 +2893,7 @@ export class DataCatalogClient { * for more details and examples. */ searchCatalog( - request: protos.google.cloud.datacatalog.v1beta1.ISearchCatalogRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ISearchCatalogRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -3086,7 +3073,7 @@ export class DataCatalogClient { ) as AsyncIterable; } listEntryGroups( - request: protos.google.cloud.datacatalog.v1beta1.IListEntryGroupsRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListEntryGroupsRequest, options?: CallOptions ): Promise< [ @@ -3146,7 +3133,7 @@ export class DataCatalogClient { * for more details and examples. */ listEntryGroups( - request: protos.google.cloud.datacatalog.v1beta1.IListEntryGroupsRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListEntryGroupsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -3292,7 +3279,7 @@ export class DataCatalogClient { ) as AsyncIterable; } listEntries( - request: protos.google.cloud.datacatalog.v1beta1.IListEntriesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListEntriesRequest, options?: CallOptions ): Promise< [ @@ -3357,7 +3344,7 @@ export class DataCatalogClient { * for more details and examples. */ listEntries( - request: protos.google.cloud.datacatalog.v1beta1.IListEntriesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListEntriesRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -3513,7 +3500,7 @@ export class DataCatalogClient { ) as AsyncIterable; } listTags( - request: protos.google.cloud.datacatalog.v1beta1.IListTagsRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListTagsRequest, options?: CallOptions ): Promise< [ @@ -3576,7 +3563,7 @@ export class DataCatalogClient { * for more details and examples. */ listTags( - request: protos.google.cloud.datacatalog.v1beta1.IListTagsRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListTagsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< diff --git a/src/v1beta1/policy_tag_manager_client.ts b/src/v1beta1/policy_tag_manager_client.ts index a2875ac9..8889e79b 100644 --- a/src/v1beta1/policy_tag_manager_client.ts +++ b/src/v1beta1/policy_tag_manager_client.ts @@ -26,11 +26,11 @@ import { PaginationCallback, GaxCall, } from 'google-gax'; -import * as path from 'path'; import {Transform} from 'stream'; import {RequestType} from 'google-gax/build/src/apitypes'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1beta1/policy_tag_manager_client_config.json`. @@ -141,27 +141,14 @@ export class PolicyTagManagerClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. @@ -355,7 +342,7 @@ export class PolicyTagManagerClient { // -- Service calls -- // ------------------- createTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -408,7 +395,7 @@ export class PolicyTagManagerClient { * const [response] = await client.createTaxonomy(request); */ createTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.ICreateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreateTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -454,7 +441,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.createTaxonomy(request, options, callback); } deleteTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -507,7 +494,7 @@ export class PolicyTagManagerClient { * const [response] = await client.deleteTaxonomy(request); */ deleteTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.IDeleteTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeleteTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -553,7 +540,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.deleteTaxonomy(request, options, callback); } updateTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -610,7 +597,7 @@ export class PolicyTagManagerClient { * const [response] = await client.updateTaxonomy(request); */ updateTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.IUpdateTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdateTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -656,7 +643,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.updateTaxonomy(request, options, callback); } getTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.IGetTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetTaxonomyRequest, options?: CallOptions ): Promise< [ @@ -704,7 +691,7 @@ export class PolicyTagManagerClient { * const [response] = await client.getTaxonomy(request); */ getTaxonomy( - request: protos.google.cloud.datacatalog.v1beta1.IGetTaxonomyRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetTaxonomyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -747,7 +734,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.getTaxonomy(request, options, callback); } createPolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.ICreatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreatePolicyTagRequest, options?: CallOptions ): Promise< [ @@ -800,7 +787,7 @@ export class PolicyTagManagerClient { * const [response] = await client.createPolicyTag(request); */ createPolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.ICreatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.ICreatePolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -846,7 +833,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.createPolicyTag(request, options, callback); } deletePolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.IDeletePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeletePolicyTagRequest, options?: CallOptions ): Promise< [ @@ -898,7 +885,7 @@ export class PolicyTagManagerClient { * const [response] = await client.deletePolicyTag(request); */ deletePolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.IDeletePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IDeletePolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -944,7 +931,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.deletePolicyTag(request, options, callback); } updatePolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.IUpdatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdatePolicyTagRequest, options?: CallOptions ): Promise< [ @@ -1004,7 +991,7 @@ export class PolicyTagManagerClient { * const [response] = await client.updatePolicyTag(request); */ updatePolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.IUpdatePolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IUpdatePolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1050,7 +1037,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.updatePolicyTag(request, options, callback); } getPolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.IGetPolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetPolicyTagRequest, options?: CallOptions ): Promise< [ @@ -1098,7 +1085,7 @@ export class PolicyTagManagerClient { * const [response] = await client.getPolicyTag(request); */ getPolicyTag( - request: protos.google.cloud.datacatalog.v1beta1.IGetPolicyTagRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IGetPolicyTagRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1141,7 +1128,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.getPolicyTag(request, options, callback); } getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -1189,7 +1176,7 @@ export class PolicyTagManagerClient { * const [response] = await client.getIamPolicy(request); */ getIamPolicy( - request: protos.google.iam.v1.IGetIamPolicyRequest, + request?: protos.google.iam.v1.IGetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1228,7 +1215,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.getIamPolicy(request, options, callback); } setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, options?: CallOptions ): Promise< [ @@ -1278,7 +1265,7 @@ export class PolicyTagManagerClient { * const [response] = await client.setIamPolicy(request); */ setIamPolicy( - request: protos.google.iam.v1.ISetIamPolicyRequest, + request?: protos.google.iam.v1.ISetIamPolicyRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1317,7 +1304,7 @@ export class PolicyTagManagerClient { return this.innerApiCalls.setIamPolicy(request, options, callback); } testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, options?: CallOptions ): Promise< [ @@ -1368,7 +1355,7 @@ export class PolicyTagManagerClient { * const [response] = await client.testIamPermissions(request); */ testIamPermissions( - request: protos.google.iam.v1.ITestIamPermissionsRequest, + request?: protos.google.iam.v1.ITestIamPermissionsRequest, optionsOrCallback?: | CallOptions | Callback< @@ -1408,7 +1395,7 @@ export class PolicyTagManagerClient { } listTaxonomies( - request: protos.google.cloud.datacatalog.v1beta1.IListTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListTaxonomiesRequest, options?: CallOptions ): Promise< [ @@ -1466,7 +1453,7 @@ export class PolicyTagManagerClient { * for more details and examples. */ listTaxonomies( - request: protos.google.cloud.datacatalog.v1beta1.IListTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListTaxonomiesRequest, optionsOrCallback?: | CallOptions | PaginationCallback< @@ -1606,7 +1593,7 @@ export class PolicyTagManagerClient { ) as AsyncIterable; } listPolicyTags( - request: protos.google.cloud.datacatalog.v1beta1.IListPolicyTagsRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListPolicyTagsRequest, options?: CallOptions ): Promise< [ @@ -1663,7 +1650,7 @@ export class PolicyTagManagerClient { * for more details and examples. */ listPolicyTags( - request: protos.google.cloud.datacatalog.v1beta1.IListPolicyTagsRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IListPolicyTagsRequest, optionsOrCallback?: | CallOptions | PaginationCallback< diff --git a/src/v1beta1/policy_tag_manager_serialization_client.ts b/src/v1beta1/policy_tag_manager_serialization_client.ts index b305bf8f..5dc0b992 100644 --- a/src/v1beta1/policy_tag_manager_serialization_client.ts +++ b/src/v1beta1/policy_tag_manager_serialization_client.ts @@ -19,9 +19,9 @@ /* global window */ import * as gax from 'google-gax'; import {Callback, CallOptions, Descriptors, ClientOptions} from 'google-gax'; -import * as path from 'path'; import * as protos from '../../protos/protos'; +import jsonProtos = require('../../protos/protos.json'); /** * Client JSON configuration object, loaded from * `src/v1beta1/policy_tag_manager_serialization_client_config.json`. @@ -133,27 +133,14 @@ export class PolicyTagManagerSerializationClient { } if (!opts.fallback) { clientHeader.push(`grpc/${this._gaxGrpc.grpcVersion}`); + } else if (opts.fallback === 'rest') { + clientHeader.push(`rest/${this._gaxGrpc.grpcVersion}`); } if (opts.libName && opts.libVersion) { clientHeader.push(`${opts.libName}/${opts.libVersion}`); } // Load the applicable protos. - // For Node.js, pass the path to JSON proto file. - // For browsers, pass the JSON content. - - const nodejsProtoPath = path.join( - __dirname, - '..', - '..', - 'protos', - 'protos.json' - ); - this._protos = this._gaxGrpc.loadProto( - opts.fallback - ? // eslint-disable-next-line @typescript-eslint/no-var-requires - require('../../protos/protos.json') - : nodejsProtoPath - ); + this._protos = this._gaxGrpc.loadProtoJSON(jsonProtos); // This API contains "path templates"; forward-slash-separated // identifiers to uniquely identify resources within the API. @@ -320,7 +307,7 @@ export class PolicyTagManagerSerializationClient { // -- Service calls -- // ------------------- importTaxonomies( - request: protos.google.cloud.datacatalog.v1beta1.IImportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IImportTaxonomiesRequest, options?: CallOptions ): Promise< [ @@ -378,7 +365,7 @@ export class PolicyTagManagerSerializationClient { * const [response] = await client.importTaxonomies(request); */ importTaxonomies( - request: protos.google.cloud.datacatalog.v1beta1.IImportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IImportTaxonomiesRequest, optionsOrCallback?: | CallOptions | Callback< @@ -424,7 +411,7 @@ export class PolicyTagManagerSerializationClient { return this.innerApiCalls.importTaxonomies(request, options, callback); } exportTaxonomies( - request: protos.google.cloud.datacatalog.v1beta1.IExportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IExportTaxonomiesRequest, options?: CallOptions ): Promise< [ @@ -483,7 +470,7 @@ export class PolicyTagManagerSerializationClient { * const [response] = await client.exportTaxonomies(request); */ exportTaxonomies( - request: protos.google.cloud.datacatalog.v1beta1.IExportTaxonomiesRequest, + request?: protos.google.cloud.datacatalog.v1beta1.IExportTaxonomiesRequest, optionsOrCallback?: | CallOptions | Callback<