@google-cloud/discoveryengine 2.1.0 → 2.3.0

package/build/src/v1/engine_service_client.js

@@ -99,26 +99,17 @@ class EngineServiceClient {
     constructor(opts, gaxInstance) {
         // Ensure that options include all the required fields.
         const staticMembers = this.constructor;
-        if (opts?.universe_domain &&
-            opts?.universeDomain &&
-            opts?.universe_domain !== opts?.universeDomain) {
+        if (opts?.universe_domain && opts?.universeDomain && opts?.universe_domain !== opts?.universeDomain) {
             throw new Error('Please set either universe_domain or universeDomain, but not both.');
         }
-        const universeDomainEnvVar = typeof process === 'object' && typeof process.env === 'object'
-            ? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
-            : undefined;
-        this._universeDomain =
-            opts?.universeDomain ??
-                opts?.universe_domain ??
-                universeDomainEnvVar ??
-                'googleapis.com';
+        const universeDomainEnvVar = (typeof process === 'object' && typeof process.env === 'object') ? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN'] : undefined;
+        this._universeDomain = opts?.universeDomain ?? opts?.universe_domain ?? universeDomainEnvVar ?? 'googleapis.com';
         this._servicePath = 'discoveryengine.' + this._universeDomain;
         const servicePath = opts?.servicePath || opts?.apiEndpoint || this._servicePath;
         this._providedCustomServicePath = !!(opts?.servicePath || opts?.apiEndpoint);
         const port = opts?.port || staticMembers.port;
         const clientConfig = opts?.clientConfig ?? {};
-        const fallback = opts?.fallback ??
-            (typeof window !== 'undefined' && typeof window?.fetch === 'function');
+        const fallback = opts?.fallback ?? (typeof window !== 'undefined' && typeof window?.fetch === 'function');
         opts = Object.assign({ servicePath, port, clientConfig, fallback }, opts);
         // Request numeric enum values if REST transport is used.
         opts.numericEnums = true;
@@ -148,7 +139,10 @@ class EngineServiceClient {
         }
         this.locationsClient = new this._gaxModule.LocationsClient(this._gaxGrpc, opts);
         // Determine the client header string.
-        const clientHeader = [`gax/${this._gaxModule.version}`, `gapic/${version}`];
+        const clientHeader = [
+            `gax/${this._gaxModule.version}`,
+            `gapic/${version}`,
+        ];
         if (typeof process === 'object' && 'versions' in process) {
             clientHeader.push(`gl-node/${process.versions.node}`);
         }
@@ -172,7 +166,10 @@ class EngineServiceClient {
         this.pathTemplates = {
             collectionPathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/collections/{collection}'),
             enginePathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/collections/{collection}/engines/{engine}'),
+            identityMappingStorePathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/identityMappingStores/{identity_mapping_store}'),
             projectPathTemplate: new this._gaxModule.PathTemplate('projects/{project}'),
+            projectLocationCmekConfigPathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/cmekConfig'),
+            projectLocationCmekConfigsPathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/cmekConfigs/{cmek_config}'),
             projectLocationCollectionDataStorePathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}'),
             projectLocationCollectionDataStoreBranchDocumentPathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}/branches/{branch}/documents/{document}'),
             projectLocationCollectionDataStoreBranchDocumentChunkPathTemplate: new this._gaxModule.PathTemplate('projects/{project}/locations/{location}/collections/{collection}/dataStores/{data_store}/branches/{branch}/documents/{document}/chunks/{chunk}'),
@@ -211,136 +208,31 @@ class EngineServiceClient {
         // (e.g. 50 results at a time, with tokens to get subsequent
         // pages). Denote the keys used for pagination and results.
         this.descriptors.page = {
-            listEngines: new this._gaxModule.PageDescriptor('pageToken', 'nextPageToken', 'engines'),
+            listEngines: new this._gaxModule.PageDescriptor('pageToken', 'nextPageToken', 'engines')
         };
-        const protoFilesRoot = this._gaxModule.protobuf.Root.fromJSON(jsonProtos);
+        const protoFilesRoot = this._gaxModule.protobufFromJSON(jsonProtos);
         // This API contains "long-running operations", which return a
         // an Operation object that allows for tracking of the operation,
         // rather than holding a request open.
         const lroOptions = {
             auth: this.auth,
-            grpc: 'grpc' in this._gaxGrpc ? this._gaxGrpc.grpc : undefined,
+            grpc: 'grpc' in this._gaxGrpc ? this._gaxGrpc.grpc : undefined
         };
         if (opts.fallback) {
             lroOptions.protoJson = protoFilesRoot;
-            lroOptions.httpRules = [
-                {
-                    selector: 'google.longrunning.Operations.CancelOperation',
-                    post: '/v1/{name=projects/*/operations/*}:cancel',
-                    body: '*',
-                    additional_bindings: [
-                        {
-                            post: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/branches/*/operations/*}:cancel',
-                            body: '*',
-                        },
-                        {
-                            post: '/v1/{name=projects/*/locations/*/dataStores/*/branches/*/operations/*}:cancel',
-                            body: '*',
-                        },
-                    ],
-                },
-                {
-                    selector: 'google.longrunning.Operations.GetOperation',
-                    get: '/v1/{name=projects/*/operations/*}',
-                    additional_bindings: [
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataConnector/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/branches/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/models/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/schemas/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/targetSites/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/engines/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/dataStores/*/branches/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/dataStores/*/models/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/dataStores/*/operations/*}',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/identityMappingStores/*/operations/*}',
-                        },
-                        { get: '/v1/{name=projects/*/locations/*/operations/*}' },
-                        { get: '/v1/{name=projects/*/operations/*}' },
-                    ],
-                },
-                {
-                    selector: 'google.longrunning.Operations.ListOperations',
-                    get: '/v1/{name=projects/*}/operations',
-                    additional_bindings: [
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataConnector}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/branches/*}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/models/*}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/schemas/*}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/targetSites}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/collections/*/engines/*}/operations',
-                        },
-                        { get: '/v1/{name=projects/*/locations/*/collections/*}/operations' },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/dataStores/*/branches/*}/operations',
-                        },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/dataStores/*/models/*}/operations',
-                        },
-                        { get: '/v1/{name=projects/*/locations/*/dataStores/*}/operations' },
-                        {
-                            get: '/v1/{name=projects/*/locations/*/identityMappingStores/*}/operations',
-                        },
-                        { get: '/v1/{name=projects/*/locations/*}/operations' },
-                        { get: '/v1/{name=projects/*}/operations' },
-                    ],
-                },
-            ];
+            lroOptions.httpRules = [{ selector: 'google.longrunning.Operations.CancelOperation', post: '/v1/{name=projects/*/operations/*}:cancel', body: '*', additional_bindings: [{ post: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/branches/*/operations/*}:cancel', body: '*', }, { post: '/v1/{name=projects/*/locations/*/collections/*/engines/*/operations/*}:cancel', body: '*', }, { post: '/v1/{name=projects/*/locations/*/dataStores/*/branches/*/operations/*}:cancel', body: '*', }],
+                }, { selector: 'google.longrunning.Operations.GetOperation', get: '/v1/{name=projects/*/operations/*}', additional_bindings: [{ get: '/v1/{name=projects/*/locations/*/collections/*/dataConnector/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/branches/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/models/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/schemas/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/targetSites/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/engines/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/collections/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/dataStores/*/branches/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/dataStores/*/models/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/dataStores/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/identityMappingStores/*/operations/*}', }, { get: '/v1/{name=projects/*/locations/*/operations/*}', }, { get: '/v1/{name=projects/*/operations/*}', }],
+                }, { selector: 'google.longrunning.Operations.ListOperations', get: '/v1/{name=projects/*}/operations', additional_bindings: [{ get: '/v1/{name=projects/*/locations/*/collections/*/dataConnector}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/branches/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/models/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/schemas/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine/targetSites}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*/siteSearchEngine}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*/dataStores/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*/engines/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/collections/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/dataStores/*/branches/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/dataStores/*/models/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/dataStores/*}/operations', }, { get: '/v1/{name=projects/*/locations/*/identityMappingStores/*}/operations', }, { get: '/v1/{name=projects/*/locations/*}/operations', }, { get: '/v1/{name=projects/*}/operations', }],
+                }];
         }
-        this.operationsClient = this._gaxModule
-            .lro(lroOptions)
-            .operationsClient(opts);
+        this.operationsClient = this._gaxModule.lro(lroOptions).operationsClient(opts);
         const createEngineResponse = protoFilesRoot.lookup('.google.cloud.discoveryengine.v1.Engine');
         const createEngineMetadata = protoFilesRoot.lookup('.google.cloud.discoveryengine.v1.CreateEngineMetadata');
         const deleteEngineResponse = protoFilesRoot.lookup('.google.protobuf.Empty');
         const deleteEngineMetadata = protoFilesRoot.lookup('.google.cloud.discoveryengine.v1.DeleteEngineMetadata');
         this.descriptors.longrunning = {
             createEngine: new this._gaxModule.LongrunningDescriptor(this.operationsClient, createEngineResponse.decode.bind(createEngineResponse), createEngineMetadata.decode.bind(createEngineMetadata)),
-            deleteEngine: new this._gaxModule.LongrunningDescriptor(this.operationsClient, deleteEngineResponse.decode.bind(deleteEngineResponse), deleteEngineMetadata.decode.bind(deleteEngineMetadata)),
+            deleteEngine: new this._gaxModule.LongrunningDescriptor(this.operationsClient, deleteEngineResponse.decode.bind(deleteEngineResponse), deleteEngineMetadata.decode.bind(deleteEngineMetadata))
         };
         // Put together the default options sent with requests.
         this._defaults = this._gaxGrpc.constructSettings('google.cloud.discoveryengine.v1.EngineService', gapicConfig, opts.clientConfig || {}, { 'x-goog-api-client': clientHeader.join(' ') });
@@ -369,19 +261,13 @@ class EngineServiceClient {
         }
         // Put together the "service stub" for
         // google.cloud.discoveryengine.v1.EngineService.
-        this.engineServiceStub = this._gaxGrpc.createStub(this._opts.fallback
-            ? this._protos.lookupService('google.cloud.discoveryengine.v1.EngineService')
-            : // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                this._protos.google.cloud.discoveryengine.v1.EngineService, this._opts, this._providedCustomServicePath);
+        this.engineServiceStub = this._gaxGrpc.createStub(this._opts.fallback ?
+            this._protos.lookupService('google.cloud.discoveryengine.v1.EngineService') :
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this._protos.google.cloud.discoveryengine.v1.EngineService, this._opts, this._providedCustomServicePath);
         // Iterate over each of the methods that the service provides
         // and create an API call method for each.
-        const engineServiceStubMethods = [
-            'createEngine',
-            'deleteEngine',
-            'updateEngine',
-            'getEngine',
-            'listEngines',
-        ];
+        const engineServiceStubMethods = ['createEngine', 'deleteEngine', 'updateEngine', 'getEngine', 'listEngines'];
         for (const methodName of engineServiceStubMethods) {
             const callPromise = this.engineServiceStub.then(stub => (...args) => {
                 if (this._terminated) {
@@ -406,8 +292,7 @@ class EngineServiceClient {
      * @returns {string} The DNS address for this service.
      */
     static get servicePath() {
-        if (typeof process === 'object' &&
-            typeof process.emitWarning === 'function') {
+        if (typeof process === 'object' && typeof process.emitWarning === 'function') {
             process.emitWarning('Static servicePath is deprecated, please use the instance method instead.', 'DeprecationWarning');
         }
         return 'discoveryengine.googleapis.com';
@@ -418,8 +303,7 @@ class EngineServiceClient {
      * @returns {string} The DNS address for this service.
      */
     static get apiEndpoint() {
-        if (typeof process === 'object' &&
-            typeof process.emitWarning === 'function') {
+        if (typeof process === 'object' && typeof process.emitWarning === 'function') {
             process.emitWarning('Static apiEndpoint is deprecated, please use the instance method instead.', 'DeprecationWarning');
         }
         return 'discoveryengine.googleapis.com';
@@ -447,7 +331,9 @@ class EngineServiceClient {
      * @returns {string[]} List of default scopes.
      */
     static get scopes() {
-        return ['https://www.googleapis.com/auth/cloud-platform'];
+        return [
+            'https://www.googleapis.com/auth/cloud-platform'
+        ];
     }
     /**
      * Return the project ID used by this class.
@@ -473,13 +359,10 @@ class EngineServiceClient {
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
-        options.otherArgs.headers['x-goog-request-params'] =
-            this._gaxModule.routingHeader.fromParams({
-                'engine.name': request.engine.name ?? '',
-            });
-        this.initialize().catch(err => {
-            throw err;
+        options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({
+            'engine.name': request.engine.name ?? '',
         });
+        this.initialize().catch(err => { throw err; });
         this._log.info('updateEngine request %j', request);
         const wrappedCallback = callback
             ? (error, response, options, rawResponse) => {
@@ -487,11 +370,16 @@ class EngineServiceClient {
                 callback(error, response, options, rawResponse); // We verified callback above.
             }
             : undefined;
-        return this.innerApiCalls
-            .updateEngine(request, options, wrappedCallback)
+        return this.innerApiCalls.updateEngine(request, options, wrappedCallback)
             ?.then(([response, options, rawResponse]) => {
             this._log.info('updateEngine response %j', response);
             return [response, options, rawResponse];
+        }).catch((error) => {
+            if (error && 'statusDetails' in error && error.statusDetails instanceof Array) {
+                const protos = this._gaxModule.protobuf.Root.fromJSON(jsonProtos);
+                error.statusDetails = (0, google_gax_1.decodeAnyProtosInArray)(error.statusDetails, protos);
+            }
+            throw error;
         });
     }
     getEngine(request, optionsOrCallback, callback) {
@@ -507,13 +395,10 @@ class EngineServiceClient {
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
-        options.otherArgs.headers['x-goog-request-params'] =
-            this._gaxModule.routingHeader.fromParams({
-                name: request.name ?? '',
-            });
-        this.initialize().catch(err => {
-            throw err;
+        options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({
+            'name': request.name ?? '',
         });
+        this.initialize().catch(err => { throw err; });
         this._log.info('getEngine request %j', request);
         const wrappedCallback = callback
             ? (error, response, options, rawResponse) => {
@@ -521,11 +406,16 @@ class EngineServiceClient {
                 callback(error, response, options, rawResponse); // We verified callback above.
             }
             : undefined;
-        return this.innerApiCalls
-            .getEngine(request, options, wrappedCallback)
+        return this.innerApiCalls.getEngine(request, options, wrappedCallback)
             ?.then(([response, options, rawResponse]) => {
             this._log.info('getEngine response %j', response);
             return [response, options, rawResponse];
+        }).catch((error) => {
+            if (error && 'statusDetails' in error && error.statusDetails instanceof Array) {
+                const protos = this._gaxModule.protobuf.Root.fromJSON(jsonProtos);
+                error.statusDetails = (0, google_gax_1.decodeAnyProtosInArray)(error.statusDetails, protos);
+            }
+            throw error;
         });
     }
     createEngine(request, optionsOrCallback, callback) {
@@ -541,13 +431,10 @@ class EngineServiceClient {
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
-        options.otherArgs.headers['x-goog-request-params'] =
-            this._gaxModule.routingHeader.fromParams({
-                parent: request.parent ?? '',
-            });
-        this.initialize().catch(err => {
-            throw err;
+        options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({
+            'parent': request.parent ?? '',
         });
+        this.initialize().catch(err => { throw err; });
         const wrappedCallback = callback
             ? (error, response, rawResponse, _) => {
                 this._log.info('createEngine response %j', rawResponse);
@@ -555,8 +442,7 @@ class EngineServiceClient {
             }
             : undefined;
         this._log.info('createEngine request %j', request);
-        return this.innerApiCalls
-            .createEngine(request, options, wrappedCallback)
+        return this.innerApiCalls.createEngine(request, options, wrappedCallback)
             ?.then(([response, rawResponse, _]) => {
             this._log.info('createEngine response %j', rawResponse);
             return [response, rawResponse, _];
@@ -593,13 +479,10 @@ class EngineServiceClient {
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
-        options.otherArgs.headers['x-goog-request-params'] =
-            this._gaxModule.routingHeader.fromParams({
-                name: request.name ?? '',
-            });
-        this.initialize().catch(err => {
-            throw err;
+        options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({
+            'name': request.name ?? '',
         });
+        this.initialize().catch(err => { throw err; });
         const wrappedCallback = callback
             ? (error, response, rawResponse, _) => {
                 this._log.info('deleteEngine response %j', rawResponse);
@@ -607,8 +490,7 @@ class EngineServiceClient {
             }
             : undefined;
         this._log.info('deleteEngine request %j', request);
-        return this.innerApiCalls
-            .deleteEngine(request, options, wrappedCallback)
+        return this.innerApiCalls.deleteEngine(request, options, wrappedCallback)
             ?.then(([response, rawResponse, _]) => {
             this._log.info('deleteEngine response %j', rawResponse);
             return [response, rawResponse, _];
@@ -645,13 +527,10 @@ class EngineServiceClient {
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
-        options.otherArgs.headers['x-goog-request-params'] =
-            this._gaxModule.routingHeader.fromParams({
-                parent: request.parent ?? '',
-            });
-        this.initialize().catch(err => {
-            throw err;
+        options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({
+            'parent': request.parent ?? '',
         });
+        this.initialize().catch(err => { throw err; });
         const wrappedCallback = callback
             ? (error, values, nextPageRequest, rawResponse) => {
                 this._log.info('listEngines values %j', values);
@@ -696,15 +575,12 @@ class EngineServiceClient {
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
-        options.otherArgs.headers['x-goog-request-params'] =
-            this._gaxModule.routingHeader.fromParams({
-                parent: request.parent ?? '',
-            });
+        options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({
+            'parent': request.parent ?? '',
+        });
         const defaultCallSettings = this._defaults['listEngines'];
         const callSettings = defaultCallSettings.merge(options);
-        this.initialize().catch(err => {
-            throw err;
-        });
+        this.initialize().catch(err => { throw err; });
         this._log.info('listEngines stream %j', request);
         return this.descriptors.page.listEngines.createStream(this.innerApiCalls.listEngines, request, callSettings);
     }
@@ -741,103 +617,100 @@ class EngineServiceClient {
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
-        options.otherArgs.headers['x-goog-request-params'] =
-            this._gaxModule.routingHeader.fromParams({
-                parent: request.parent ?? '',
-            });
+        options.otherArgs.headers['x-goog-request-params'] = this._gaxModule.routingHeader.fromParams({
+            'parent': request.parent ?? '',
+        });
         const defaultCallSettings = this._defaults['listEngines'];
         const callSettings = defaultCallSettings.merge(options);
-        this.initialize().catch(err => {
-            throw err;
-        });
+        this.initialize().catch(err => { throw err; });
         this._log.info('listEngines iterate %j', request);
         return this.descriptors.page.listEngines.asyncIterate(this.innerApiCalls['listEngines'], request, callSettings);
     }
     /**
-     * Gets information about a location.
-     *
-     * @param {Object} request
-     *   The request object that will be sent.
-     * @param {string} request.name
-     *   Resource name for the location.
-     * @param {object} [options]
-     *   Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html | CallOptions} for more details.
-     * @returns {Promise} - The promise which resolves to an array.
-     *   The first element of the array is an object representing {@link google.cloud.location.Location | Location}.
-     *   Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation }
-     *   for more details and examples.
-     * @example
-     * ```
-     * const [response] = await client.getLocation(request);
-     * ```
-     */
+       * Gets information about a location.
+       *
+       * @param {Object} request
+       *   The request object that will be sent.
+       * @param {string} request.name
+       *   Resource name for the location.
+       * @param {object} [options]
+       *   Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html | CallOptions} for more details.
+       * @returns {Promise} - The promise which resolves to an array.
+       *   The first element of the array is an object representing {@link google.cloud.location.Location | Location}.
+       *   Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods | documentation }
+       *   for more details and examples.
+       * @example
+       * ```
+       * const [response] = await client.getLocation(request);
+       * ```
+       */
     getLocation(request, options, callback) {
         return this.locationsClient.getLocation(request, options, callback);
     }
     /**
-     * Lists information about the supported locations for this service. Returns an iterable object.
-     *
-     * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand.
-     * @param {Object} request
-     *   The request object that will be sent.
-     * @param {string} request.name
-     *   The resource that owns the locations collection, if applicable.
-     * @param {string} request.filter
-     *   The standard list filter.
-     * @param {number} request.pageSize
-     *   The standard list page size.
-     * @param {string} request.pageToken
-     *   The standard list page token.
-     * @param {object} [options]
-     *   Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details.
-     * @returns {Object}
-     *   An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }.
-     *   When you iterate the returned iterable, each element will be an object representing
-     *   {@link google.cloud.location.Location | Location}. The API will be called under the hood as needed, once per the page,
-     *   so you can stop the iteration when you don't need more results.
-     *   Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation }
-     *   for more details and examples.
-     * @example
-     * ```
-     * const iterable = client.listLocationsAsync(request);
-     * for await (const response of iterable) {
-     *   // process response
-     * }
-     * ```
-     */
+       * Lists information about the supported locations for this service. Returns an iterable object.
+       *
+       * `for`-`await`-`of` syntax is used with the iterable to get response elements on-demand.
+       * @param {Object} request
+       *   The request object that will be sent.
+       * @param {string} request.name
+       *   The resource that owns the locations collection, if applicable.
+       * @param {string} request.filter
+       *   The standard list filter.
+       * @param {number} request.pageSize
+       *   The standard list page size.
+       * @param {string} request.pageToken
+       *   The standard list page token.
+       * @param {object} [options]
+       *   Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details.
+       * @returns {Object}
+       *   An iterable Object that allows {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols | async iteration }.
+       *   When you iterate the returned iterable, each element will be an object representing
+       *   {@link google.cloud.location.Location | Location}. The API will be called under the hood as needed, once per the page,
+       *   so you can stop the iteration when you don't need more results.
+       *   Please see the {@link https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination | documentation }
+       *   for more details and examples.
+       * @example
+       * ```
+       * const iterable = client.listLocationsAsync(request);
+       * for await (const response of iterable) {
+       *   // process response
+       * }
+       * ```
+       */
     listLocationsAsync(request, options) {
         return this.locationsClient.listLocationsAsync(request, options);
     }
     /**
-     * Gets the latest state of a long-running operation.  Clients can use this
-     * method to poll the operation result at intervals as recommended by the API
-     * service.
-     *
-     * @param {Object} request - The request object that will be sent.
-     * @param {string} request.name - The name of the operation resource.
-     * @param {Object=} options
-     *   Optional parameters. You can override the default settings for this call,
-     *   e.g, timeout, retries, paginations, etc. See {@link
-     *   https://googleapis.github.io/gax-nodejs/global.html#CallOptions | gax.CallOptions}
-     *   for the details.
-     * @param {function(?Error, ?Object)=} callback
-     *   The function which will be called with the result of the API call.
-     *
-     *   The second parameter to the callback is an object representing
-     *   {@link google.longrunning.Operation | google.longrunning.Operation}.
-     * @return {Promise} - The promise which resolves to an array.
-     *   The first element of the array is an object representing
-     * {@link google.longrunning.Operation | google.longrunning.Operation}.
-     * The promise has a method named "cancel" which cancels the ongoing API call.
-     *
-     * @example
-     * ```
-     * const client = longrunning.operationsClient();
-     * const name = '';
-     * const [response] = await client.getOperation({name});
-     * // doThingsWith(response)
-     * ```
-     */
+       * Gets the latest state of a long-running operation.  Clients can use this
+       * method to poll the operation result at intervals as recommended by the API
+       * service.
+       *
+       * @param {Object} request - The request object that will be sent.
+       * @param {string} request.name - The name of the operation resource.
+       * @param {Object=} options
+       *   Optional parameters. You can override the default settings for this call,
+       *   e.g, timeout, retries, paginations, etc. See {@link
+       *   https://googleapis.github.io/gax-nodejs/global.html#CallOptions | gax.CallOptions}
+       *   for the details.
+       * @param {function(?Error, ?Object)=} callback
+       *   The function which will be called with the result of the API call.
+       *
+       *   The second parameter to the callback is an object representing
+       *   {@link google.longrunning.Operation | google.longrunning.Operation}.
+       * @return {Promise} - The promise which resolves to an array.
+       *   The first element of the array is an object representing
+       * {@link google.longrunning.Operation | google.longrunning.Operation}.
+       * The promise has a method named "cancel" which cancels the ongoing API call.
+       *
+       * @example
+       * ```
+       * const client = longrunning.operationsClient();
+       * const name = '';
+       * const [response] = await client.getOperation({name});
+       * // doThingsWith(response)
+       * ```
+       */
     getOperation(request, optionsOrCallback, callback) {
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -1014,8 +887,7 @@ class EngineServiceClient {
      * @returns {string} A string representing the project.
      */
     matchProjectFromCollectionName(collectionName) {
-        return this.pathTemplates.collectionPathTemplate.match(collectionName)
-            .project;
+        return this.pathTemplates.collectionPathTemplate.match(collectionName).project;
     }
     /**
      * Parse the location from Collection resource.
@@ -1025,8 +897,7 @@ class EngineServiceClient {
      * @returns {string} A string representing the location.
      */
     matchLocationFromCollectionName(collectionName) {
-        return this.pathTemplates.collectionPathTemplate.match(collectionName)
-            .location;
+        return this.pathTemplates.collectionPathTemplate.match(collectionName).location;
     }
     /**
      * Parse the collection from Collection resource.
@@ -1036,8 +907,7 @@ class EngineServiceClient {
      * @returns {string} A string representing the collection.
      */
     matchCollectionFromCollectionName(collectionName) {
-        return this.pathTemplates.collectionPathTemplate.match(collectionName)
-            .collection;
+        return this.pathTemplates.collectionPathTemplate.match(collectionName).collection;
     }
     /**
      * Return a fully-qualified engine resource name string.
@@ -1096,6 +966,51 @@ class EngineServiceClient {
     matchEngineFromEngineName(engineName) {
         return this.pathTemplates.enginePathTemplate.match(engineName).engine;
     }
+    /**
+     * Return a fully-qualified identityMappingStore resource name string.
+     *
+     * @param {string} project
+     * @param {string} location
+     * @param {string} identity_mapping_store
+     * @returns {string} Resource name string.
+     */
+    identityMappingStorePath(project, location, identityMappingStore) {
+        return this.pathTemplates.identityMappingStorePathTemplate.render({
+            project: project,
+            location: location,
+            identity_mapping_store: identityMappingStore,
+        });
+    }
+    /**
+     * Parse the project from IdentityMappingStore resource.
+     *
+     * @param {string} identityMappingStoreName
+     *   A fully-qualified path representing IdentityMappingStore resource.
+     * @returns {string} A string representing the project.
+     */
+    matchProjectFromIdentityMappingStoreName(identityMappingStoreName) {
+        return this.pathTemplates.identityMappingStorePathTemplate.match(identityMappingStoreName).project;
+    }
+    /**
+     * Parse the location from IdentityMappingStore resource.
+     *
+     * @param {string} identityMappingStoreName
+     *   A fully-qualified path representing IdentityMappingStore resource.
+     * @returns {string} A string representing the location.
+     */
+    matchLocationFromIdentityMappingStoreName(identityMappingStoreName) {
+        return this.pathTemplates.identityMappingStorePathTemplate.match(identityMappingStoreName).location;
+    }
+    /**
+     * Parse the identity_mapping_store from IdentityMappingStore resource.
+     *
+     * @param {string} identityMappingStoreName
+     *   A fully-qualified path representing IdentityMappingStore resource.
+     * @returns {string} A string representing the identity_mapping_store.
+     */
+    matchIdentityMappingStoreFromIdentityMappingStoreName(identityMappingStoreName) {
+        return this.pathTemplates.identityMappingStorePathTemplate.match(identityMappingStoreName).identity_mapping_store;
+    }
     /**
      * Return a fully-qualified project resource name string.
      *
@@ -1117,6 +1032,84 @@ class EngineServiceClient {
     matchProjectFromProjectName(projectName) {
         return this.pathTemplates.projectPathTemplate.match(projectName).project;
     }
+    /**
+     * Return a fully-qualified projectLocationCmekConfig resource name string.
+     *
+     * @param {string} project
+     * @param {string} location
+     * @returns {string} Resource name string.
+     */
+    projectLocationCmekConfigPath(project, location) {
+        return this.pathTemplates.projectLocationCmekConfigPathTemplate.render({
+            project: project,
+            location: location,
+        });
+    }
+    /**
+     * Parse the project from ProjectLocationCmekConfig resource.
+     *
+     * @param {string} projectLocationCmekConfigName
+     *   A fully-qualified path representing project_location_cmekConfig resource.
+     * @returns {string} A string representing the project.
+     */
+    matchProjectFromProjectLocationCmekConfigName(projectLocationCmekConfigName) {
+        return this.pathTemplates.projectLocationCmekConfigPathTemplate.match(projectLocationCmekConfigName).project;
+    }
+    /**
+     * Parse the location from ProjectLocationCmekConfig resource.
+     *
+     * @param {string} projectLocationCmekConfigName
+     *   A fully-qualified path representing project_location_cmekConfig resource.
+     * @returns {string} A string representing the location.
+     */
+    matchLocationFromProjectLocationCmekConfigName(projectLocationCmekConfigName) {
+        return this.pathTemplates.projectLocationCmekConfigPathTemplate.match(projectLocationCmekConfigName).location;
+    }
+    /**
+     * Return a fully-qualified projectLocationCmekConfigs resource name string.
+     *
+     * @param {string} project
+     * @param {string} location
+     * @param {string} cmek_config
+     * @returns {string} Resource name string.
+     */
+    projectLocationCmekConfigsPath(project, location, cmekConfig) {
+        return this.pathTemplates.projectLocationCmekConfigsPathTemplate.render({
+            project: project,
+            location: location,
+            cmek_config: cmekConfig,
+        });
+    }
+    /**
+     * Parse the project from ProjectLocationCmekConfigs resource.
+     *
+     * @param {string} projectLocationCmekConfigsName
+     *   A fully-qualified path representing project_location_cmekConfigs resource.
+     * @returns {string} A string representing the project.
+     */
+    matchProjectFromProjectLocationCmekConfigsName(projectLocationCmekConfigsName) {
+        return this.pathTemplates.projectLocationCmekConfigsPathTemplate.match(projectLocationCmekConfigsName).project;
+    }
+    /**
+     * Parse the location from ProjectLocationCmekConfigs resource.
+     *
+     * @param {string} projectLocationCmekConfigsName
+     *   A fully-qualified path representing project_location_cmekConfigs resource.
+     * @returns {string} A string representing the location.
+     */
+    matchLocationFromProjectLocationCmekConfigsName(projectLocationCmekConfigsName) {
+        return this.pathTemplates.projectLocationCmekConfigsPathTemplate.match(projectLocationCmekConfigsName).location;
+    }
+    /**
+     * Parse the cmek_config from ProjectLocationCmekConfigs resource.
+     *
+     * @param {string} projectLocationCmekConfigsName
+     *   A fully-qualified path representing project_location_cmekConfigs resource.
+     * @returns {string} A string representing the cmek_config.
+     */
+    matchCmekConfigFromProjectLocationCmekConfigsName(projectLocationCmekConfigsName) {
+        return this.pathTemplates.projectLocationCmekConfigsPathTemplate.match(projectLocationCmekConfigsName).cmek_config;
+    }
     /**
      * Return a fully-qualified projectLocationCollectionDataStore resource name string.
      *
@@ -3274,8 +3267,8 @@ class EngineServiceClient {
                 this._log.info('ending gRPC channel');
                 this._terminated = true;
                 stub.close();
-                this.locationsClient.close();
-                this.operationsClient.close();
+                this.locationsClient.close().catch(err => { throw err; });
+                void this.operationsClient.close();
             });
         }
         return Promise.resolve();