@azure/app-configuration 1.3.2-alpha.20220401.1 → 1.4.0-alpha.20220412.2

package/dist/index.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var coreHttp = require('@azure/core-http');
 var crypto = require('crypto');
-var abortController = require('@azure/abort-controller');
-require('@azure/core-asynciterator-polyfill');
+var coreClient = require('@azure/core-client');
+var coreHttpCompat = require('@azure/core-http-compat');
+var coreAuth = require('@azure/core-auth');
+var coreRestPipeline = require('@azure/core-rest-pipeline');
 var coreTracing = require('@azure/core-tracing');
 
 function _interopNamespace(e) {
@@ -27,7 +28,8 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
-var coreHttp__namespace = /*#__PURE__*/_interopNamespace(coreHttp);
+var coreClient__namespace = /*#__PURE__*/_interopNamespace(coreClient);
+var coreHttpCompat__namespace = /*#__PURE__*/_interopNamespace(coreHttpCompat);
 
 // Copyright (c) Microsoft Corporation.
 /**
@@ -48,36 +50,31 @@ async function sha256Hmac(secret, stringToSign) {
 
 // Copyright (c) Microsoft Corporation.
 /**
- * @internal
+ * Create an HTTP pipeline policy to authenticate a request
+ * using an `AzureKeyCredential` for AppConfig.
  */
-class AppConfigCredential {
-    constructor(credential, secret) {
-        this.credential = credential;
-        this.secret = secret;
-    }
-    /**
-     * Signs a request with the values provided in the credential and secret parameter.
-     *
-     * @param webResource - The WebResource to be signed.
-     * @returns The signed request object.
-     */
-    async signRequest(webResource) {
-        const verb = webResource.method.toUpperCase();
-        const utcNow = new Date().toUTCString();
-        const contentHash = await sha256Digest(webResource.body || "");
-        const signedHeaders = "x-ms-date;host;x-ms-content-sha256";
-        const url = coreHttp.URLBuilder.parse(webResource.url);
-        const query = url.getQuery();
-        const urlPathAndQuery = `${url.getPath()}${query ? "?" + query : ""}`;
-        const stringToSign = `${verb}\n${urlPathAndQuery}\n${utcNow};${url.getHost()};${contentHash}`;
-        const signature = await sha256Hmac(this.secret, stringToSign);
-        webResource.headers.set("x-ms-date", utcNow);
-        webResource.headers.set("x-ms-content-sha256", contentHash);
-        // Syntax for Authorization header
-        // Reference - https://docs.microsoft.com/en-us/azure/azure-app-configuration/rest-api-authentication-hmac#syntax
-        webResource.headers.set("Authorization", `HMAC-SHA256 Credential=${this.credential}&SignedHeaders=${signedHeaders}&Signature=${signature}`);
-        return webResource;
-    }
+function appConfigKeyCredentialPolicy(credential, secret) {
+    return {
+        name: "AppConfigKeyCredentialPolicy",
+        async sendRequest(request, next) {
+            var _a;
+            const verb = request.method;
+            const utcNow = new Date().toUTCString();
+            const contentHash = await sha256Digest(((_a = request.body) === null || _a === void 0 ? void 0 : _a.toString()) || "");
+            const signedHeaders = "x-ms-date;host;x-ms-content-sha256";
+            const url = new URL(request.url);
+            const query = url.search;
+            const urlPathAndQuery = query ? `${url.pathname}${query}` : url.pathname;
+            const stringToSign = `${verb}\n${urlPathAndQuery}\n${utcNow};${url.host};${contentHash}`;
+            const signature = await sha256Hmac(secret, stringToSign);
+            request.headers.set("x-ms-date", utcNow);
+            request.headers.set("x-ms-content-sha256", contentHash);
+            // Syntax for Authorization header
+            // Reference - https://docs.microsoft.com/en-us/azure/azure-app-configuration/rest-api-authentication-hmac#syntax
+            request.headers.set("Authorization", `HMAC-SHA256 Credential=${credential}&SignedHeaders=${signedHeaders}&Signature=${signature}`);
+            return next(request);
+        },
+    };
 }
 
 /*
@@ -738,7 +735,7 @@ const select = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const select1 = {
     parameterPath: ["options", "select"],
@@ -753,7 +750,7 @@ const select1 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const accept2 = {
     parameterPath: "accept",
@@ -807,7 +804,7 @@ const select2 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const contentType = {
     parameterPath: ["options", "contentType"],
@@ -837,7 +834,7 @@ const select3 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const accept3 = {
     parameterPath: "accept",
@@ -865,7 +862,7 @@ const select4 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const select5 = {
     parameterPath: ["options", "select"],
@@ -880,7 +877,7 @@ const select5 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const select6 = {
     parameterPath: ["options", "select"],
@@ -895,7 +892,7 @@ const select6 = {
             }
         }
     },
-    collectionFormat: coreHttp.QueryCollectionFormat.Csv
+    collectionFormat: "CSV"
 };
 const nextLink = {
     parameterPath: "nextLink",
@@ -916,21 +913,15 @@ const nextLink = {
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-const packageName$1 = "app-configuration";
-const packageVersion$1 = "1.3.2";
 /** @internal */
-class AppConfigurationContext extends coreHttp__namespace.ServiceClient {
+class AppConfiguration extends coreHttpCompat__namespace.ExtendedServiceClient {
     /**
-     * Initializes a new instance of the AppConfigurationContext class.
-     * @param credentials Subscription credentials which uniquely identify client subscription.
+     * Initializes a new instance of the AppConfiguration class.
      * @param endpoint The endpoint of the App Configuration instance to send requests to.
      * @param apiVersion Api Version
      * @param options The parameter options
      */
-    constructor(credentials, endpoint, apiVersion, options) {
-        if (credentials === undefined) {
-            throw new Error("'credentials' cannot be null");
-        }
+    constructor(endpoint, apiVersion, options) {
         if (endpoint === undefined) {
             throw new Error("'endpoint' cannot be null");
         }
@@ -941,77 +932,48 @@ class AppConfigurationContext extends coreHttp__namespace.ServiceClient {
         if (!options) {
             options = {};
         }
-        if (!options.userAgent) {
-            const defaultUserAgent = coreHttp__namespace.getDefaultUserAgentValue();
-            options.userAgent = `${packageName$1}/${packageVersion$1} ${defaultUserAgent}`;
-        }
-        super(credentials, options);
-        this.requestContentType = "application/json; charset=utf-8";
-        this.baseUri = options.endpoint || "{endpoint}";
+        const defaults = {
+            requestContentType: "application/json; charset=utf-8"
+        };
+        const packageDetails = `azsdk-js-app-configuration/1.4.0-beta.1`;
+        const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+            ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+            : `${packageDetails}`;
+        const optionsWithDefaults = Object.assign(Object.assign(Object.assign({}, defaults), options), { userAgentOptions: {
+                userAgentPrefix
+            }, baseUri: options.endpoint || "{endpoint}" });
+        super(optionsWithDefaults);
         // Parameter assignments
         this.endpoint = endpoint;
         this.apiVersion = apiVersion;
     }
-}
-
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-/** @internal */
-class AppConfiguration extends AppConfigurationContext {
-    /**
-     * Initializes a new instance of the AppConfiguration class.
-     * @param credentials Subscription credentials which uniquely identify client subscription.
-     * @param endpoint The endpoint of the App Configuration instance to send requests to.
-     * @param apiVersion Api Version
-     * @param options The parameter options
-     */
-    constructor(credentials, endpoint, apiVersion, options) {
-        super(credentials, endpoint, apiVersion, options);
-    }
     /**
      * Gets a list of keys.
      * @param options The options parameters.
      */
     getKeys(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getKeysOperationSpec);
+        return this.sendOperationRequest({ options }, getKeysOperationSpec);
     }
     /**
      * Requests the headers and status of the given resource.
      * @param options The options parameters.
      */
     checkKeys(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, checkKeysOperationSpec);
+        return this.sendOperationRequest({ options }, checkKeysOperationSpec);
     }
     /**
      * Gets a list of key-values.
      * @param options The options parameters.
      */
     getKeyValues(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getKeyValuesOperationSpec);
+        return this.sendOperationRequest({ options }, getKeyValuesOperationSpec);
     }
     /**
      * Requests the headers and status of the given resource.
      * @param options The options parameters.
      */
     checkKeyValues(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, checkKeyValuesOperationSpec);
+        return this.sendOperationRequest({ options }, checkKeyValuesOperationSpec);
     }
     /**
      * Gets a single key-value.
@@ -1019,11 +981,7 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     getKeyValue(key, options) {
-        const operationArguments = {
-            key,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getKeyValueOperationSpec);
+        return this.sendOperationRequest({ key, options }, getKeyValueOperationSpec);
     }
     /**
      * Creates a key-value.
@@ -1031,11 +989,7 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     putKeyValue(key, options) {
-        const operationArguments = {
-            key,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, putKeyValueOperationSpec);
+        return this.sendOperationRequest({ key, options }, putKeyValueOperationSpec);
     }
     /**
      * Deletes a key-value.
@@ -1043,11 +997,7 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     deleteKeyValue(key, options) {
-        const operationArguments = {
-            key,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, deleteKeyValueOperationSpec);
+        return this.sendOperationRequest({ key, options }, deleteKeyValueOperationSpec);
     }
     /**
      * Requests the headers and status of the given resource.
@@ -1055,31 +1005,21 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     checkKeyValue(key, options) {
-        const operationArguments = {
-            key,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, checkKeyValueOperationSpec);
+        return this.sendOperationRequest({ key, options }, checkKeyValueOperationSpec);
     }
     /**
      * Gets a list of labels.
      * @param options The options parameters.
      */
     getLabels(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getLabelsOperationSpec);
+        return this.sendOperationRequest({ options }, getLabelsOperationSpec);
     }
     /**
      * Requests the headers and status of the given resource.
      * @param options The options parameters.
      */
     checkLabels(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, checkLabelsOperationSpec);
+        return this.sendOperationRequest({ options }, checkLabelsOperationSpec);
     }
     /**
      * Locks a key-value.
@@ -1087,11 +1027,7 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     putLock(key, options) {
-        const operationArguments = {
-            key,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, putLockOperationSpec);
+        return this.sendOperationRequest({ key, options }, putLockOperationSpec);
     }
     /**
      * Unlocks a key-value.
@@ -1099,31 +1035,21 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     deleteLock(key, options) {
-        const operationArguments = {
-            key,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, deleteLockOperationSpec);
+        return this.sendOperationRequest({ key, options }, deleteLockOperationSpec);
     }
     /**
      * Gets a list of key-value revisions.
      * @param options The options parameters.
      */
     getRevisions(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getRevisionsOperationSpec);
+        return this.sendOperationRequest({ options }, getRevisionsOperationSpec);
     }
     /**
      * Requests the headers and status of the given resource.
      * @param options The options parameters.
      */
     checkRevisions(options) {
-        const operationArguments = {
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, checkRevisionsOperationSpec);
+        return this.sendOperationRequest({ options }, checkRevisionsOperationSpec);
     }
     /**
      * GetKeysNext
@@ -1131,11 +1057,7 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     getKeysNext(nextLink, options) {
-        const operationArguments = {
-            nextLink,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getKeysNextOperationSpec);
+        return this.sendOperationRequest({ nextLink, options }, getKeysNextOperationSpec);
     }
     /**
      * GetKeyValuesNext
@@ -1143,11 +1065,7 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     getKeyValuesNext(nextLink, options) {
-        const operationArguments = {
-            nextLink,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getKeyValuesNextOperationSpec);
+        return this.sendOperationRequest({ nextLink, options }, getKeyValuesNextOperationSpec);
     }
     /**
      * GetLabelsNext
@@ -1155,11 +1073,7 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     getLabelsNext(nextLink, options) {
-        const operationArguments = {
-            nextLink,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getLabelsNextOperationSpec);
+        return this.sendOperationRequest({ nextLink, options }, getLabelsNextOperationSpec);
     }
     /**
      * GetRevisionsNext
@@ -1167,15 +1081,11 @@ class AppConfiguration extends AppConfigurationContext {
      * @param options The options parameters.
      */
     getRevisionsNext(nextLink, options) {
-        const operationArguments = {
-            nextLink,
-            options: coreHttp__namespace.operationOptionsToRequestOptionsBase(options || {})
-        };
-        return this.sendOperationRequest(operationArguments, getRevisionsNextOperationSpec);
+        return this.sendOperationRequest({ nextLink, options }, getRevisionsNextOperationSpec);
     }
 }
 // Operation Specifications
-const serializer = new coreHttp__namespace.Serializer(Mappers, /* isXml */ false);
+const serializer = coreClient__namespace.createSerializer(Mappers, /* isXml */ false);
 const getKeysOperationSpec = {
     path: "/keys",
     httpMethod: "GET",
@@ -1601,128 +1511,6 @@ const getRevisionsNextOperationSpec = {
     serializer
 };
 
-// Copyright (c) Microsoft Corporation.
-/**
- * @internal
- */
-function throttlingRetryPolicy(retryOptions) {
-    return {
-        create: (nextPolicy, options) => {
-            return new ThrottlingRetryPolicy(nextPolicy, options, retryOptions);
-        },
-    };
-}
-const StandardAbortMessage = "The operation was aborted.";
-// Merge this constant with the one in core-http when we unify throttling retry policy in core-http and app-config
-const DEFAULT_CLIENT_RETRY_COUNT = 3;
-/**
- * This policy is a close copy of the ThrottlingRetryPolicy class from
- * core-http with modifications to work with how AppConfig is currently
- * responding to 429 responses (which is to throw a RestError).
- *
- * @internal
- */
-class ThrottlingRetryPolicy extends coreHttp.BaseRequestPolicy {
-    constructor(nextPolicy, options, retryOptions = { maxRetries: DEFAULT_CLIENT_RETRY_COUNT }) {
-        super(nextPolicy, options);
-        this.retryOptions = retryOptions;
-        this.numberOfRetries = 0;
-    }
-    async sendRequest(httpRequest) {
-        return this._nextPolicy.sendRequest(httpRequest.clone()).catch(async (err) => {
-            var _a;
-            if (isRestErrorWithHeaders(err)) {
-                let delayInMs = getDelayInMs(err.response.headers);
-                if (delayInMs == null) {
-                    throw err;
-                }
-                if (this.retryOptions.maxRetryDelayInMs &&
-                    delayInMs > this.retryOptions.maxRetryDelayInMs) {
-                    delayInMs = this.retryOptions.maxRetryDelayInMs;
-                }
-                this.numberOfRetries += 1;
-                await coreHttp.delay(delayInMs, undefined, {
-                    abortSignal: httpRequest.abortSignal,
-                    abortErrorMsg: StandardAbortMessage,
-                });
-                if ((_a = httpRequest.abortSignal) === null || _a === void 0 ? void 0 : _a.aborted) {
-                    throw new abortController.AbortError(StandardAbortMessage);
-                }
-                if (this.retryOptions.maxRetries === undefined || this.retryOptions.maxRetries === null) {
-                    this.retryOptions.maxRetries = DEFAULT_CLIENT_RETRY_COUNT;
-                }
-                if (this.numberOfRetries < this.retryOptions.maxRetries) {
-                    // retries
-                    return this.sendRequest(httpRequest.clone());
-                }
-                else {
-                    // passes on to the next policy
-                    return this._nextPolicy.sendRequest(httpRequest.clone());
-                }
-            }
-            else {
-                throw err;
-            }
-        });
-    }
-    static parseRetryAfterHeader(headerValue) {
-        const retryAfterInSeconds = Number(headerValue);
-        if (Number.isNaN(retryAfterInSeconds)) {
-            return ThrottlingRetryPolicy.parseDateRetryAfterHeader(headerValue);
-        }
-        else {
-            return retryAfterInSeconds * 1000;
-        }
-    }
-    static parseDateRetryAfterHeader(headerValue) {
-        try {
-            const now = Date.now();
-            const date = Date.parse(headerValue);
-            const diff = date - now;
-            return Number.isNaN(diff) ? undefined : diff;
-        }
-        catch (error) {
-            return undefined;
-        }
-    }
-}
-/**
- * The headers that come back from Azure services representing
- * the amount of time (minimum) to wait to retry (in milliseconds).
- */
-const RetryAfterMillisecondsHeaders = ["retry-after-ms", "x-ms-retry-after-ms"];
-/**
- * Extracts the retry response header, checking against several
- * header names.
- * @internal
- */
-function getDelayInMs(responseHeaders) {
-    for (const name of RetryAfterMillisecondsHeaders) {
-        const delayValueString = responseHeaders.get(name);
-        if (delayValueString == null) {
-            continue;
-        }
-        const delayValueMs = Number(delayValueString);
-        if (Number.isNaN(delayValueMs)) {
-            return undefined;
-        }
-        return delayValueMs;
-    }
-    const retryAfterValue = responseHeaders.get(coreHttp.Constants.HeaderConstants.RETRY_AFTER);
-    if (retryAfterValue != null) {
-        return ThrottlingRetryPolicy.parseRetryAfterHeader(retryAfterValue);
-    }
-    return undefined;
-}
-function isRestErrorWithHeaders(err) {
-    return (err &&
-        err.statusCode &&
-        typeof err.statusCode === "number" &&
-        err.response &&
-        err.response.headers &&
-        typeof err.response.headers.get === "function");
-}
-
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 /**
@@ -1927,8 +1715,8 @@ function formatAcceptDateTime(newOptions) {
  * @internal
  */
 function extractAfterTokenFromNextLink(nextLink) {
-    const parsedLink = coreHttp.URLBuilder.parse(nextLink);
-    const afterToken = parsedLink.getQueryParameterValue("after");
+    const searchParams = new URLSearchParams(nextLink);
+    const afterToken = searchParams.get("after");
     if (afterToken == null || Array.isArray(afterToken)) {
         throw new Error("Invalid nextLink - invalid after token");
     }
@@ -2008,24 +1796,29 @@ function serializeAsConfigurationSettingParam(setting) {
 /**
  * @internal
  */
-function transformKeyValueResponseWithStatusCode(kvp) {
-    return normalizeResponse(kvp, Object.assign(Object.assign({}, transformKeyValue(kvp)), { statusCode: kvp._response.status }));
+function transformKeyValueResponseWithStatusCode(kvp, status) {
+    const response = Object.assign(Object.assign({}, transformKeyValue(kvp)), { statusCode: status !== null && status !== void 0 ? status : -1 });
+    if (hasUnderscoreResponse(kvp)) {
+        Object.defineProperty(response, "_response", {
+            enumerable: false,
+            value: kvp._response,
+        });
+    }
+    return response;
 }
 /**
  * @internal
  */
 function transformKeyValueResponse(kvp) {
-    return normalizeResponse(kvp, Object.assign({}, transformKeyValue(kvp)));
-}
-function normalizeResponse(originalResponse, newResponse) {
-    Object.defineProperty(newResponse, "_response", {
-        enumerable: false,
-        value: originalResponse._response,
-    });
-    // this field comes from the header but it's redundant with
-    // the one serialized in the model itself
-    delete newResponse.eTag;
-    return newResponse;
+    const setting = transformKeyValue(kvp);
+    if (hasUnderscoreResponse(kvp)) {
+        Object.defineProperty(setting, "_response", {
+            enumerable: false,
+            value: kvp._response,
+        });
+    }
+    delete setting.eTag;
+    return setting;
 }
 /**
  * Translates user-facing field names into their `select` equivalents (these can be
@@ -2054,46 +1847,22 @@ function formatFieldsForSelect(fieldNames) {
     });
     return mappedFieldNames;
 }
-
-// Copyright (c) Microsoft Corporation.
-/** @internal */
-const createSpan = coreTracing.createSpanFunction({
-    namespace: "Microsoft.AppConfiguration",
-    packagePrefix: "Azure.Data.AppConfiguration",
-});
-/**
- * Traces an operation and properly handles reporting start, end and errors for a given span
- *
- * @param operationName - Name of a method in the TClient type
- * @param options - An options class, typically derived from \@azure/core-http/RequestOptionsBase
- * @param fn - The function to call with an options class that properly propagates the span context
- *
- * @internal
- */
-async function trace(operationName, options, fn, createSpanFn = createSpan) {
-    const { updatedOptions, span } = createSpanFn(operationName, options);
-    try {
-        // NOTE: we really do need to await on this function here so we can handle any exceptions thrown and properly
-        // close the span.
-        const result = await fn(updatedOptions, span);
-        span.setStatus({
-            code: coreTracing.SpanStatusCode.OK,
-        });
-        return result;
-    }
-    catch (err) {
-        span.setStatus({
-            code: coreTracing.SpanStatusCode.ERROR,
-            message: err.message,
+// eslint-disable-next-line @typescript-eslint/ban-types
+function assertResponse(result) {
+    if (!hasUnderscoreResponse(result)) {
+        Object.defineProperty(result, "_response", {
+            enumerable: false,
+            value: "Something went wrong, _response(raw response) is supposed to be part of the response. Please file a bug at https://github.com/Azure/azure-sdk-for-js",
         });
-        throw err;
-    }
-    finally {
-        span.end();
     }
 }
+// eslint-disable-next-line @typescript-eslint/ban-types
+function hasUnderscoreResponse(result) {
+    return Object.prototype.hasOwnProperty.call(result, "_response");
+}
 
 // Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 /**
  * The sync token header, as described here:
  * https://docs.microsoft.com/azure/azure-app-configuration/rest-api-consistency
@@ -2107,26 +1876,18 @@ const SyncTokenHeaderName = "sync-token";
  */
 function syncTokenPolicy(syncTokens) {
     return {
-        create: (nextPolicy, options) => {
-            return new SyncTokenPolicy(nextPolicy, options, syncTokens);
+        name: "Sync Token Policy",
+        async sendRequest(request, next) {
+            const syncTokenHeaderValue = syncTokens.getSyncTokenHeaderValue();
+            if (syncTokenHeaderValue) {
+                request.headers.set(SyncTokenHeaderName, syncTokenHeaderValue);
+            }
+            const response = await next(request);
+            syncTokens.addSyncTokenFromHeaderValue(response.headers.get(SyncTokenHeaderName));
+            return response;
         },
     };
 }
-class SyncTokenPolicy extends coreHttp.BaseRequestPolicy {
-    constructor(nextPolicy, options, _syncTokens) {
-        super(nextPolicy, options);
-        this._syncTokens = _syncTokens;
-    }
-    async sendRequest(webResource) {
-        const syncTokenHeaderValue = this._syncTokens.getSyncTokenHeaderValue();
-        if (syncTokenHeaderValue != null) {
-            webResource.headers.set(SyncTokenHeaderName, syncTokenHeaderValue);
-        }
-        const response = await this._nextPolicy.sendRequest(webResource);
-        this._syncTokens.addSyncTokenFromHeaderValue(response.headers.get(SyncTokenHeaderName));
-        return response;
-    }
-}
 /**
  * Sync token tracker (allows for real-time consistency, even in the face of
  * caching and load balancing within App Configuration).
@@ -2216,13 +1977,18 @@ function parseSyncToken(syncToken) {
 }
 
 // Copyright (c) Microsoft Corporation.
-const packageName = "azsdk-js-app-configuration";
+/** @internal */
+const tracingClient = coreTracing.createTracingClient({
+    namespace: "Microsoft.AppConfiguration",
+    packageName: "@azure/app-configuration",
+    packageVersion,
+});
+
+// Copyright (c) Microsoft Corporation.
 /**
- * This constant should always be the same as the package.json's version - we use it when forming the
- * User - Agent header. There's a unit test that makes sure it always stays in sync.
  * @internal
  */
-const packageVersion = "1.3.2";
+const packageVersion = "1.4.0-beta.1";
 const apiVersion = "1.0";
 const ConnectionStringRegex = /Endpoint=(.*);Id=(.*);Secret=(.*)/;
 const deserializationContentTypes = {
@@ -2239,29 +2005,38 @@ const deserializationContentTypes = {
  */
 class AppConfigurationClient {
     constructor(connectionStringOrEndpoint, tokenCredentialOrOptions, options) {
-        // (for tests)
-        this._trace = trace;
         let appConfigOptions = {};
         let appConfigCredential;
         let appConfigEndpoint;
-        if (coreHttp.isTokenCredential(tokenCredentialOrOptions)) {
+        let authPolicy;
+        if (coreAuth.isTokenCredential(tokenCredentialOrOptions)) {
             appConfigOptions = options || {};
             appConfigCredential = tokenCredentialOrOptions;
-            appConfigEndpoint = connectionStringOrEndpoint;
+            appConfigEndpoint = connectionStringOrEndpoint.endsWith("/")
+                ? connectionStringOrEndpoint.slice(0, -1)
+                : connectionStringOrEndpoint;
+            authPolicy = coreRestPipeline.bearerTokenAuthenticationPolicy({
+                scopes: `${appConfigEndpoint}/.default`,
+                credential: appConfigCredential,
+            });
         }
         else {
             appConfigOptions = tokenCredentialOrOptions || {};
             const regexMatch = connectionStringOrEndpoint === null || connectionStringOrEndpoint === void 0 ? void 0 : connectionStringOrEndpoint.match(ConnectionStringRegex);
             if (regexMatch) {
-                appConfigCredential = new AppConfigCredential(regexMatch[2], regexMatch[3]);
                 appConfigEndpoint = regexMatch[1];
+                authPolicy = appConfigKeyCredentialPolicy(regexMatch[2], regexMatch[3]);
             }
             else {
                 throw new Error(`Invalid connection string. Valid connection strings should match the regex '${ConnectionStringRegex.source}'.`);
             }
         }
         this._syncTokens = appConfigOptions.syncTokens || new SyncTokens();
-        this.client = new AppConfiguration(appConfigCredential, appConfigEndpoint, apiVersion, getGeneratedClientOptions(appConfigEndpoint, this._syncTokens, appConfigOptions));
+        this.client = new AppConfiguration(appConfigEndpoint, apiVersion, appConfigOptions);
+        this.client.pipeline.addPolicy(authPolicy, { phase: "Sign" });
+        this.client.pipeline.addPolicy(syncTokenPolicy(this._syncTokens), { afterPhase: "Retry" });
+        this.client.pipeline.removePolicy({ name: coreClient.deserializationPolicyName });
+        this.client.pipeline.addPolicy(coreClient.deserializationPolicy({ expectedContentTypes: deserializationContentTypes }), { phase: "Deserialize" });
     }
     /**
      * Add a setting into the Azure App Configuration service, failing if it
@@ -2275,10 +2050,12 @@ class AppConfigurationClient {
      * @param options - Optional parameters for the request.
      */
     addConfigurationSetting(configurationSetting, options = {}) {
-        return this._trace("addConfigurationSetting", options, async (newOptions) => {
+        return tracingClient.withSpan("AppConfigurationClient.addConfigurationSetting", options, async (updatedOptions) => {
             const keyValue = serializeAsConfigurationSettingParam(configurationSetting);
-            const originalResponse = await this.client.putKeyValue(configurationSetting.key, Object.assign({ ifNoneMatch: "*", label: configurationSetting.label, entity: keyValue }, newOptions));
-            return transformKeyValueResponse(originalResponse);
+            const originalResponse = await this.client.putKeyValue(configurationSetting.key, Object.assign({ ifNoneMatch: "*", label: configurationSetting.label, entity: keyValue }, updatedOptions));
+            const response = transformKeyValueResponse(originalResponse);
+            assertResponse(response);
+            return response;
         });
     }
     /**
@@ -2292,9 +2069,14 @@ class AppConfigurationClient {
      * @param options - Optional parameters for the request (ex: etag, label)
      */
     deleteConfigurationSetting(id, options = {}) {
-        return this._trace("deleteConfigurationSetting", options, async (newOptions) => {
-            const originalResponse = await this.client.deleteKeyValue(id.key, Object.assign(Object.assign({ label: id.label }, newOptions), checkAndFormatIfAndIfNoneMatch(id, options)));
-            return transformKeyValueResponseWithStatusCode(originalResponse);
+        return tracingClient.withSpan("AppConfigurationClient.deleteConfigurationSetting", options, async (updatedOptions) => {
+            let status;
+            const originalResponse = await this.client.deleteKeyValue(id.key, Object.assign(Object.assign(Object.assign({ label: id.label }, updatedOptions), checkAndFormatIfAndIfNoneMatch(id, options)), { onResponse: (response) => {
+                    status = response.status;
+                } }));
+            const response = transformKeyValueResponseWithStatusCode(originalResponse, status);
+            assertResponse(response);
+            return response;
         });
     }
     /**
@@ -2308,9 +2090,12 @@ class AppConfigurationClient {
      * @param options - Optional parameters for the request.
      */
     async getConfigurationSetting(id, options = {}) {
-        return this._trace("getConfigurationSetting", options, async (newOptions) => {
-            const originalResponse = await this.client.getKeyValue(id.key, Object.assign(Object.assign(Object.assign(Object.assign({}, newOptions), { label: id.label, select: formatFieldsForSelect(options.fields) }), formatAcceptDateTime(options)), checkAndFormatIfAndIfNoneMatch(id, options)));
-            const response = transformKeyValueResponseWithStatusCode(originalResponse);
+        return tracingClient.withSpan("AppConfigurationClient.getConfigurationSetting", options, async (updatedOptions) => {
+            let status;
+            const originalResponse = await this.client.getKeyValue(id.key, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, updatedOptions), { label: id.label, select: formatFieldsForSelect(options.fields) }), formatAcceptDateTime(options)), checkAndFormatIfAndIfNoneMatch(id, options)), { onResponse: (response) => {
+                    status = response.status;
+                } }));
+            const response = transformKeyValueResponseWithStatusCode(originalResponse, status);
             // 304 only comes back if the user has passed a conditional option in their
             // request _and_ the remote object has the same etag as what the user passed.
             if (response.statusCode === 304) {
@@ -2320,6 +2105,7 @@ class AppConfigurationClient {
                 // and now we'll undefine all the other properties that are not HTTP related
                 makeConfigurationSettingEmpty(response);
             }
+            assertResponse(response);
             return response;
         });
     }
@@ -2371,16 +2157,16 @@ class AppConfigurationClient {
     }
     listConfigurationSettingsByPage(options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listConfigurationSettingsByPage_1() {
-            let currentResponse = yield tslib.__await(this._trace("listConfigurationSettings", options, async (newOptions) => {
-                const response = await this.client.getKeyValues(Object.assign(Object.assign(Object.assign(Object.assign({}, newOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(options)), { after: options.continuationToken }));
+            let currentResponse = yield tslib.__await(tracingClient.withSpan("AppConfigurationClient.listConfigurationSettings", options, async (updatedOptions) => {
+                const response = await this.client.getKeyValues(Object.assign(Object.assign(Object.assign(Object.assign({}, updatedOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(options)), { after: options.continuationToken }));
                 return response;
             }));
             yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(this.createListConfigurationPageFromResponse(currentResponse))));
             while (currentResponse.nextLink) {
-                currentResponse = yield tslib.__await(this._trace("listConfigurationSettings", options, 
+                currentResponse = yield tslib.__await(tracingClient.withSpan("AppConfigurationClient.listConfigurationSettings", options, 
                 // TODO: same code up above. Unify.
-                async (newOptions) => {
-                    const response = await this.client.getKeyValues(Object.assign(Object.assign(Object.assign(Object.assign({}, newOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(options)), { after: extractAfterTokenFromNextLink(currentResponse.nextLink) }));
+                async (updatedOptions) => {
+                    const response = await this.client.getKeyValues(Object.assign(Object.assign(Object.assign(Object.assign({}, updatedOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(options)), { after: extractAfterTokenFromNextLink(currentResponse.nextLink) }));
                     return response;
                 }));
                 if (!currentResponse.items) {
@@ -2443,15 +2229,15 @@ class AppConfigurationClient {
     }
     listRevisionsByPage(options = {}) {
         return tslib.__asyncGenerator(this, arguments, function* listRevisionsByPage_1() {
-            let currentResponse = yield tslib.__await(this._trace("listRevisions", options, async (newOptions) => {
-                const response = await this.client.getRevisions(Object.assign(Object.assign(Object.assign(Object.assign({}, newOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(newOptions)), { after: options.continuationToken }));
+            let currentResponse = yield tslib.__await(tracingClient.withSpan("AppConfigurationClient.listRevisions", options, async (updatedOptions) => {
+                const response = await this.client.getRevisions(Object.assign(Object.assign(Object.assign(Object.assign({}, updatedOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(updatedOptions)), { after: options.continuationToken }));
                 return response;
             }));
             yield tslib.__await(yield* tslib.__asyncDelegator(tslib.__asyncValues(this.createListRevisionsPageFromResponse(currentResponse))));
             while (currentResponse.nextLink) {
-                currentResponse = yield tslib.__await(this._trace("listRevisions", options, (newOptions) => {
-                    return this.client.getRevisions(Object.assign(Object.assign(Object.assign(Object.assign({}, newOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(options)), { after: extractAfterTokenFromNextLink(currentResponse.nextLink) }));
-                }));
+                currentResponse = (yield tslib.__await(tracingClient.withSpan("AppConfigurationClient.listRevisions", options, (updatedOptions) => {
+                    return this.client.getRevisions(Object.assign(Object.assign(Object.assign(Object.assign({}, updatedOptions), formatAcceptDateTime(options)), formatFiltersAndSelect(options)), { after: extractAfterTokenFromNextLink(currentResponse.nextLink) }));
+                })));
                 if (!currentResponse.items) {
                     break;
                 }
@@ -2476,10 +2262,11 @@ class AppConfigurationClient {
      * ```
      */
     async setConfigurationSetting(configurationSetting, options = {}) {
-        return this._trace("setConfigurationSetting", options, async (newOptions) => {
+        return tracingClient.withSpan("AppConfigurationClient.setConfigurationSetting", options, async (updatedOptions) => {
             const keyValue = serializeAsConfigurationSettingParam(configurationSetting);
-            const response = await this.client.putKeyValue(configurationSetting.key, Object.assign(Object.assign(Object.assign({}, newOptions), { label: configurationSetting.label, entity: keyValue }), checkAndFormatIfAndIfNoneMatch(configurationSetting, options)));
-            return transformKeyValueResponse(response);
+            const response = transformKeyValueResponse(await this.client.putKeyValue(configurationSetting.key, Object.assign(Object.assign(Object.assign({}, updatedOptions), { label: configurationSetting.label, entity: keyValue }), checkAndFormatIfAndIfNoneMatch(configurationSetting, options))));
+            assertResponse(response);
+            return response;
         });
     }
     /**
@@ -2487,15 +2274,17 @@ class AppConfigurationClient {
      * @param id - The id of the configuration setting to modify.
      */
     async setReadOnly(id, readOnly, options = {}) {
-        return this._trace("setReadOnly", options, async (newOptions) => {
+        return tracingClient.withSpan("AppConfigurationClient.setReadOnly", options, async (newOptions) => {
+            let response;
             if (readOnly) {
-                const response = await this.client.putLock(id.key, Object.assign(Object.assign(Object.assign({}, newOptions), { label: id.label }), checkAndFormatIfAndIfNoneMatch(id, options)));
-                return transformKeyValueResponse(response);
+                response = await this.client.putLock(id.key, Object.assign(Object.assign(Object.assign({}, newOptions), { label: id.label }), checkAndFormatIfAndIfNoneMatch(id, options)));
             }
             else {
-                const response = await this.client.deleteLock(id.key, Object.assign(Object.assign(Object.assign({}, newOptions), { label: id.label }), checkAndFormatIfAndIfNoneMatch(id, options)));
-                return transformKeyValueResponse(response);
+                response = await this.client.deleteLock(id.key, Object.assign(Object.assign(Object.assign({}, newOptions), { label: id.label }), checkAndFormatIfAndIfNoneMatch(id, options)));
             }
+            response = transformKeyValueResponse(response);
+            assertResponse(response);
+            return response;
         });
     }
     /**
@@ -2507,43 +2296,6 @@ class AppConfigurationClient {
         this._syncTokens.addSyncTokenFromHeaderValue(syncToken);
     }
 }
-/**
- * Gets the options for the generated AppConfigurationClient
- * @internal
- */
-function getGeneratedClientOptions(endpoint, syncTokens, internalAppConfigOptions) {
-    const retryPolicies = [
-        coreHttp.exponentialRetryPolicy(),
-        coreHttp.systemErrorRetryPolicy(),
-        throttlingRetryPolicy(internalAppConfigOptions.retryOptions),
-    ];
-    const userAgent = getUserAgentPrefix(internalAppConfigOptions.userAgentOptions &&
-        internalAppConfigOptions.userAgentOptions.userAgentPrefix);
-    return {
-        endpoint,
-        deserializationContentTypes,
-        // we'll add in our own custom retry policies
-        noRetryPolicy: true,
-        requestPolicyFactories: (defaults) => [
-            coreHttp.tracingPolicy({ userAgent }),
-            syncTokenPolicy(syncTokens),
-            coreHttp.userAgentPolicy({ value: userAgent }),
-            ...retryPolicies,
-            ...defaults,
-        ],
-        generateClientRequestIdHeader: true,
-    };
-}
-/**
- * @internal
- */
-function getUserAgentPrefix(userSuppliedUserAgent) {
-    const appConfigDefaultUserAgent = `${packageName}/${packageVersion} ${coreHttp.getDefaultUserAgentValue()}`;
-    if (!userSuppliedUserAgent) {
-        return appConfigDefaultUserAgent;
-    }
-    return `${userSuppliedUserAgent} ${appConfigDefaultUserAgent}`;
-}
 
 exports.AppConfigurationClient = AppConfigurationClient;
 exports.featureFlagContentType = featureFlagContentType;