@azure/search-documents 11.3.0-beta.8 → 11.3.1

package/dist-esm/src/searchIndexerClient.js

@@ -1,14 +1,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 import { isTokenCredential } from "@azure/core-auth";
-import { bearerTokenAuthenticationPolicy } from "@azure/core-rest-pipeline";
+import { createPipelineFromOptions, operationOptionsToRequestOptionsBase, bearerTokenAuthenticationPolicy } from "@azure/core-http";
+import { SpanStatusCode } from "@azure/core-tracing";
 import { SDK_VERSION } from "./constants";
 import { SearchServiceClient as GeneratedClient } from "./generated/service/searchServiceClient";
 import { logger } from "./logger";
 import { createSearchApiKeyCredentialPolicy } from "./searchApiKeyCredentialPolicy";
 import * as utils from "./serviceUtils";
 import { createSpan } from "./tracing";
-import { createOdataMetadataPolicy } from "./odataMetadataPolicy";
+import { odataMetadataPolicy } from "./odataMetadataPolicy";
 import { KnownSearchAudience } from "./searchAudience";
 /**
  * Class to perform operations to manage
@@ -36,12 +37,7 @@ export class SearchIndexerClient {
         /**
          * The API version to use when communicating with the service.
          */
-        this.serviceVersion = utils.defaultServiceVersion;
-        /**
-         * The API version to use when communicating with the service.
-         * @deprecated use {@Link serviceVersion} instead
-         */
-        this.apiVersion = utils.defaultServiceVersion;
+        this.apiVersion = "2020-06-30";
         this.endpoint = endpoint;
         const libInfo = `azsdk-js-search-documents/${SDK_VERSION}`;
         if (!options.userAgentOptions) {
@@ -53,44 +49,37 @@ export class SearchIndexerClient {
         else {
             options.userAgentOptions.userAgentPrefix = libInfo;
         }
-        const internalClientPipelineOptions = Object.assign(Object.assign({}, options), {
+        const internalPipelineOptions = Object.assign(Object.assign({}, options), {
             loggingOptions: {
                 logger: logger.info,
-                additionalAllowedHeaderNames: [
+                allowedHeaderNames: [
                     "elapsed-time",
                     "Location",
                     "OData-MaxVersion",
                     "OData-Version",
                     "Prefer",
-                    "throttle-reason",
-                ],
-            },
+                    "throttle-reason"
+                ]
+            }
         });
+        const scope = options.audience
+            ? `${options.audience}/.default`
+            : `${KnownSearchAudience.AzurePublicCloud}/.default`;
+        const requestPolicyFactory = isTokenCredential(credential)
+            ? bearerTokenAuthenticationPolicy(credential, scope)
+            : createSearchApiKeyCredentialPolicy(credential);
+        const pipeline = createPipelineFromOptions(internalPipelineOptions, requestPolicyFactory);
+        if (Array.isArray(pipeline.requestPolicyFactories)) {
+            pipeline.requestPolicyFactories.unshift(odataMetadataPolicy("minimal"));
+        }
+        let apiVersion = this.apiVersion;
         if (options.apiVersion) {
-            if (!utils.serviceVersions.includes(options.apiVersion)) {
+            if (!["2020-06-30-Preview", "2020-06-30"].includes(options.apiVersion)) {
                 throw new Error(`Invalid Api Version: ${options.apiVersion}`);
             }
-            this.serviceVersion = options.apiVersion;
-            this.apiVersion = options.apiVersion;
-        }
-        if (options.serviceVersion) {
-            if (!utils.serviceVersions.includes(options.serviceVersion)) {
-                throw new Error(`Invalid Service Version: ${options.serviceVersion}`);
-            }
-            this.serviceVersion = options.serviceVersion;
-            this.apiVersion = options.serviceVersion;
-        }
-        this.client = new GeneratedClient(this.endpoint, this.serviceVersion, internalClientPipelineOptions);
-        if (isTokenCredential(credential)) {
-            const scope = options.audience
-                ? `${options.audience}/.default`
-                : `${KnownSearchAudience.AzurePublicCloud}/.default`;
-            this.client.pipeline.addPolicy(bearerTokenAuthenticationPolicy({ credential, scopes: scope }));
-        }
-        else {
-            this.client.pipeline.addPolicy(createSearchApiKeyCredentialPolicy(credential));
+            apiVersion = options.apiVersion;
         }
-        this.client.pipeline.addPolicy(createOdataMetadataPolicy("minimal"));
+        this.client = new GeneratedClient(this.endpoint, apiVersion, pipeline);
     }
     /**
      * Retrieves a list of existing indexers in the service.
@@ -99,13 +88,13 @@ export class SearchIndexerClient {
     async listIndexers(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listIndexers", options);
         try {
-            const result = await this.client.indexers.list(updatedOptions);
+            const result = await this.client.indexers.list(operationOptionsToRequestOptionsBase(updatedOptions));
             return result.indexers.map(utils.generatedSearchIndexerToPublicSearchIndexer);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -120,13 +109,13 @@ export class SearchIndexerClient {
     async listIndexersNames(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listIndexersNames", options);
         try {
-            const result = await this.client.indexers.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" }));
+            const result = await this.client.indexers.list(Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" }));
             return result.indexers.map((idx) => idx.name);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -141,13 +130,13 @@ export class SearchIndexerClient {
     async listDataSourceConnections(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listDataSourceConnections", options);
         try {
-            const result = await this.client.dataSources.list(updatedOptions);
+            const result = await this.client.dataSources.list(operationOptionsToRequestOptionsBase(updatedOptions));
             return result.dataSources.map(utils.generatedDataSourceToPublicDataSource);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -162,13 +151,13 @@ export class SearchIndexerClient {
     async listDataSourceConnectionsNames(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listDataSourceConnectionsNames", options);
         try {
-            const result = await this.client.dataSources.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" }));
+            const result = await this.client.dataSources.list(Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" }));
             return result.dataSources.map((ds) => ds.name);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -183,13 +172,13 @@ export class SearchIndexerClient {
     async listSkillsets(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listSkillsets", options);
         try {
-            const result = await this.client.skillsets.list(updatedOptions);
+            const result = await this.client.skillsets.list(operationOptionsToRequestOptionsBase(updatedOptions));
             return result.skillsets.map(utils.generatedSkillsetToPublicSkillset);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -204,13 +193,13 @@ export class SearchIndexerClient {
     async listSkillsetsNames(options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-listSkillsetsNames", options);
         try {
-            const result = await this.client.skillsets.list(Object.assign(Object.assign({}, updatedOptions), { select: "name" }));
+            const result = await this.client.skillsets.list(Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { select: "name" }));
             return result.skillsets.map((sks) => sks.name);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -226,13 +215,13 @@ export class SearchIndexerClient {
     async getIndexer(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getIndexer", options);
         try {
-            const result = await this.client.indexers.get(indexerName, updatedOptions);
+            const result = await this.client.indexers.get(indexerName, operationOptionsToRequestOptionsBase(updatedOptions));
             return utils.generatedSearchIndexerToPublicSearchIndexer(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -248,13 +237,13 @@ export class SearchIndexerClient {
     async getDataSourceConnection(dataSourceConnectionName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getDataSourceConnection", options);
         try {
-            const result = await this.client.dataSources.get(dataSourceConnectionName, updatedOptions);
+            const result = await this.client.dataSources.get(dataSourceConnectionName, operationOptionsToRequestOptionsBase(updatedOptions));
             return utils.generatedDataSourceToPublicDataSource(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -270,13 +259,13 @@ export class SearchIndexerClient {
     async getSkillset(skillsetName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getSkillset", options);
         try {
-            const result = await this.client.skillsets.get(skillsetName, updatedOptions);
+            const result = await this.client.skillsets.get(skillsetName, operationOptionsToRequestOptionsBase(updatedOptions));
             return utils.generatedSkillsetToPublicSkillset(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -292,13 +281,13 @@ export class SearchIndexerClient {
     async createIndexer(indexer, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createIndexer", options);
         try {
-            const result = await this.client.indexers.create(utils.publicSearchIndexerToGeneratedSearchIndexer(indexer), updatedOptions);
+            const result = await this.client.indexers.create(utils.publicSearchIndexerToGeneratedSearchIndexer(indexer), operationOptionsToRequestOptionsBase(updatedOptions));
             return utils.generatedSearchIndexerToPublicSearchIndexer(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -314,13 +303,13 @@ export class SearchIndexerClient {
     async createDataSourceConnection(dataSourceConnection, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createDataSourceConnection", options);
         try {
-            const result = await this.client.dataSources.create(utils.publicDataSourceToGeneratedDataSource(dataSourceConnection), updatedOptions);
+            const result = await this.client.dataSources.create(utils.publicDataSourceToGeneratedDataSource(dataSourceConnection), operationOptionsToRequestOptionsBase(updatedOptions));
             return utils.generatedDataSourceToPublicDataSource(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -336,13 +325,13 @@ export class SearchIndexerClient {
     async createSkillset(skillset, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createSkillset", options);
         try {
-            const result = await this.client.skillsets.create(utils.publicSkillsetToGeneratedSkillset(skillset), updatedOptions);
+            const result = await this.client.skillsets.create(utils.publicSkillsetToGeneratedSkillset(skillset), operationOptionsToRequestOptionsBase(updatedOptions));
             return utils.generatedSkillsetToPublicSkillset(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -359,13 +348,13 @@ export class SearchIndexerClient {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createOrUpdateIndexer", options);
         try {
             const etag = options.onlyIfUnchanged ? indexer.etag : undefined;
-            const result = await this.client.indexers.createOrUpdate(indexer.name, utils.publicSearchIndexerToGeneratedSearchIndexer(indexer), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag, skipIndexerResetRequirementForCache: options.skipIndexerResetRequirementForCache, disableCacheReprocessingChangeDetection: options.disableCacheReprocessingChangeDetection }));
+            const result = await this.client.indexers.createOrUpdate(indexer.name, utils.publicSearchIndexerToGeneratedSearchIndexer(indexer), Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
             return utils.generatedSearchIndexerToPublicSearchIndexer(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -382,13 +371,13 @@ export class SearchIndexerClient {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createOrUpdateDataSourceConnection", options);
         try {
             const etag = options.onlyIfUnchanged ? dataSourceConnection.etag : undefined;
-            const result = await this.client.dataSources.createOrUpdate(dataSourceConnection.name, utils.publicDataSourceToGeneratedDataSource(dataSourceConnection), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag, skipIndexerResetRequirementForCache: options.skipIndexerResetRequirementForCache }));
+            const result = await this.client.dataSources.createOrUpdate(dataSourceConnection.name, utils.publicDataSourceToGeneratedDataSource(dataSourceConnection), Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
             return utils.generatedDataSourceToPublicDataSource(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -405,13 +394,13 @@ export class SearchIndexerClient {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-createOrUpdateSkillset", options);
         try {
             const etag = options.onlyIfUnchanged ? skillset.etag : undefined;
-            const result = await this.client.skillsets.createOrUpdate(skillset.name, utils.publicSkillsetToGeneratedSkillset(skillset), Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag, skipIndexerResetRequirementForCache: options.skipIndexerResetRequirementForCache, disableCacheReprocessingChangeDetection: options.disableCacheReprocessingChangeDetection }));
+            const result = await this.client.skillsets.createOrUpdate(skillset.name, utils.publicSkillsetToGeneratedSkillset(skillset), Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
             return utils.generatedSkillsetToPublicSkillset(result);
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -433,12 +422,12 @@ export class SearchIndexerClient {
                 : options.onlyIfUnchanged
                     ? indexer.etag
                     : undefined;
-            await this.client.indexers.delete(indexerName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
+            await this.client.indexers.delete(indexerName, Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -460,12 +449,12 @@ export class SearchIndexerClient {
                 : options.onlyIfUnchanged
                     ? dataSourceConnection.etag
                     : undefined;
-            await this.client.dataSources.delete(dataSourceConnectionName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
+            await this.client.dataSources.delete(dataSourceConnectionName, Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -487,12 +476,12 @@ export class SearchIndexerClient {
                 : options.onlyIfUnchanged
                     ? skillset.etag
                     : undefined;
-            await this.client.skillsets.delete(skillsetName, Object.assign(Object.assign({}, updatedOptions), { ifMatch: etag }));
+            await this.client.skillsets.delete(skillsetName, Object.assign(Object.assign({}, operationOptionsToRequestOptionsBase(updatedOptions)), { ifMatch: etag }));
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -508,13 +497,13 @@ export class SearchIndexerClient {
     async getIndexerStatus(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-getIndexerStatus", options);
         try {
-            const result = await this.client.indexers.getStatus(indexerName, updatedOptions);
+            const result = await this.client.indexers.getStatus(indexerName, operationOptionsToRequestOptionsBase(updatedOptions));
             return result;
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -530,12 +519,12 @@ export class SearchIndexerClient {
     async resetIndexer(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-resetIndexer", options);
         try {
-            await this.client.indexers.reset(indexerName, updatedOptions);
+            await this.client.indexers.reset(indexerName, operationOptionsToRequestOptionsBase(updatedOptions));
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }
@@ -551,58 +540,12 @@ export class SearchIndexerClient {
     async runIndexer(indexerName, options = {}) {
         const { span, updatedOptions } = createSpan("SearchIndexerClient-runIndexer", options);
         try {
-            await this.client.indexers.run(indexerName, updatedOptions);
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    /**
-     * Resets specific documents in the datasource to be selectively re-ingested by the indexer.
-     * @param indexerName - The name of the indexer to reset documents for.
-     * @param options - Additional optional arguments.
-     */
-    async resetDocuments(indexerName, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexerClient-resetDocs", options);
-        try {
-            await this.client.indexers.resetDocs(indexerName, Object.assign(Object.assign({}, updatedOptions), { keysOrIds: {
-                    documentKeys: updatedOptions.documentKeys,
-                    datasourceDocumentIds: updatedOptions.datasourceDocumentIds,
-                } }));
-        }
-        catch (e) {
-            span.setStatus({
-                status: "error",
-                error: e.message,
-            });
-            throw e;
-        }
-        finally {
-            span.end();
-        }
-    }
-    /**
-     * Reset an existing skillset in a search service.
-     * @param skillsetName - The name of the skillset to reset.
-     * @param skillNames - The names of skills to reset.
-     * @param options - The options parameters.
-     */
-    async resetSkills(skillsetName, options = {}) {
-        const { span, updatedOptions } = createSpan("SearchIndexerClient-resetSkills", options);
-        try {
-            await this.client.skillsets.resetSkills(skillsetName, { skillNames: options.skillNames }, updatedOptions);
+            await this.client.indexers.run(indexerName, operationOptionsToRequestOptionsBase(updatedOptions));
         }
         catch (e) {
             span.setStatus({
-                status: "error",
-                error: e.message,
+                code: SpanStatusCode.ERROR,
+                message: e.message
             });
             throw e;
         }