@azure/arm-servicefabric 2.0.2-alpha.20221213.2 → 2.1.0

package/src/models/index.ts

@@ -807,7 +807,7 @@ export interface ServiceLoadMetricDescription {
 /** Describes the policy to be used for placement of a Service Fabric service. */
 export interface ServicePlacementPolicyDescription {
   /** Polymorphic discriminator, which specifies the different types this object can be */
-  type: "undefined";
+  type: "ServicePlacementPolicyDescription";
 }
 
 /** The list of service resources. */
@@ -824,7 +824,7 @@ export interface ServiceResourceList {
  * The cluster resource
  *
  */
-export type Cluster = Resource & {
+export interface Cluster extends Resource {
   /** The list of add-on features to enable in the cluster. */
   addOnFeatures?: AddOnFeatures[];
   /**
@@ -925,19 +925,19 @@ export type Cluster = Resource & {
   waveUpgradePaused?: boolean;
   /** Indicates a list of notification channels for cluster events. */
   notifications?: Notification[];
-};
+}
 
 /** The application type name resource */
-export type ApplicationTypeResource = ProxyResource & {
+export interface ApplicationTypeResource extends ProxyResource {
   /**
    * The current deployment or provisioning state, which only appears in the response.
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly provisioningState?: string;
-};
+}
 
 /** An application type version resource for the specified application type name resource. */
-export type ApplicationTypeVersionResource = ProxyResource & {
+export interface ApplicationTypeVersionResource extends ProxyResource {
   /**
    * The current deployment or provisioning state, which only appears in the response
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -950,10 +950,10 @@ export type ApplicationTypeVersionResource = ProxyResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly defaultParameterList?: { [propertyName: string]: string };
-};
+}
 
 /** The application resource. */
-export type ApplicationResource = ProxyResource & {
+export interface ApplicationResource extends ProxyResource {
   /** Describes the managed identities for an Azure resource. */
   identity?: ManagedIdentity;
   /** The version of the application type as defined in the application manifest. */
@@ -979,10 +979,10 @@ export type ApplicationResource = ProxyResource & {
   readonly provisioningState?: string;
   /** The application type name as defined in the application manifest. */
   typeName?: string;
-};
+}
 
 /** The application resource for patch operations. */
-export type ApplicationResourceUpdate = ProxyResource & {
+export interface ApplicationResourceUpdate extends ProxyResource {
   /** The version of the application type as defined in the application manifest. */
   typeVersion?: string;
   /** List of application parameters with overridden values from their default values specified in the application manifest. */
@@ -999,10 +999,10 @@ export type ApplicationResourceUpdate = ProxyResource & {
   metrics?: ApplicationMetricDescription[];
   /** List of user assigned identities for the application, each mapped to a friendly name. */
   managedIdentities?: ApplicationUserAssignedIdentity[];
-};
+}
 
 /** The service resource. */
-export type ServiceResource = ProxyResource & {
+export interface ServiceResource extends ProxyResource {
   /** The placement constraints as a string. Placement constraints are boolean expressions on node properties and allow for restricting a service to particular nodes based on the service requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". */
   placementConstraints?: string;
   /** A list that describes the correlation of the service with other services. */
@@ -1028,10 +1028,10 @@ export type ServiceResource = ProxyResource & {
   servicePackageActivationMode?: ArmServicePackageActivationMode;
   /** Dns name used for the service. If this is specified, then the service can be accessed via its DNS name instead of service name. */
   serviceDnsName?: string;
-};
+}
 
 /** The service resource for patch operations. */
-export type ServiceResourceUpdate = ProxyResource & {
+export interface ServiceResourceUpdate extends ProxyResource {
   /** The placement constraints as a string. Placement constraints are boolean expressions on node properties and allow for restricting a service to particular nodes based on the service requirements. For example, to place a service on nodes where NodeType is blue specify the following: "NodeColor == blue)". */
   placementConstraints?: string;
   /** A list that describes the correlation of the service with other services. */
@@ -1044,10 +1044,11 @@ export type ServiceResourceUpdate = ProxyResource & {
   defaultMoveCost?: MoveCost;
   /** The kind of service (Stateless or Stateful). */
   serviceKind?: ServiceKind;
-};
+}
 
 /** The application resource properties. */
-export type ApplicationResourceProperties = ApplicationResourceUpdateProperties & {
+export interface ApplicationResourceProperties
+  extends ApplicationResourceUpdateProperties {
   /**
    * The current deployment or provisioning state, which only appears in the response
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -1055,26 +1056,29 @@ export type ApplicationResourceProperties = ApplicationResourceUpdateProperties
   readonly provisioningState?: string;
   /** The application type name as defined in the application manifest. */
   typeName?: string;
-};
+}
 
 /** Describes the named partition scheme of the service. */
-export type NamedPartitionSchemeDescription = PartitionSchemeDescription & {
+export interface NamedPartitionSchemeDescription
+  extends PartitionSchemeDescription {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   partitionScheme: "Named";
   /** The number of partitions. */
   count: number;
   /** Array of size specified by the ‘count’ parameter, for the names of the partitions. */
   names: string[];
-};
+}
 
 /** SingletonPartitionSchemeDescription */
-export type SingletonPartitionSchemeDescription = PartitionSchemeDescription & {
+export interface SingletonPartitionSchemeDescription
+  extends PartitionSchemeDescription {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   partitionScheme: "Singleton";
-};
+}
 
 /** Describes a partitioning scheme where an integer range is allocated evenly across a number of partitions. */
-export type UniformInt64RangePartitionSchemeDescription = PartitionSchemeDescription & {
+export interface UniformInt64RangePartitionSchemeDescription
+  extends PartitionSchemeDescription {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   partitionScheme: "UniformInt64Range";
   /** The number of partitions. */
@@ -1091,10 +1095,11 @@ export type UniformInt64RangePartitionSchemeDescription = PartitionSchemeDescrip
    *
    */
   highKey: string;
-};
+}
 
 /** The service resource properties. */
-export type ServiceResourceProperties = ServiceResourcePropertiesBase & {
+export interface ServiceResourceProperties
+  extends ServiceResourcePropertiesBase {
   /**
    * The current deployment or provisioning state, which only appears in the response
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -1110,16 +1115,19 @@ export type ServiceResourceProperties = ServiceResourcePropertiesBase & {
   servicePackageActivationMode?: ArmServicePackageActivationMode;
   /** Dns name used for the service. If this is specified, then the service can be accessed via its DNS name instead of service name. */
   serviceDnsName?: string;
-};
+}
 
 /** The service resource properties for patch operations. */
-export type ServiceResourceUpdateProperties = ServiceResourcePropertiesBase & {
+export interface ServiceResourceUpdateProperties
+  extends ServiceResourcePropertiesBase {
   /** The kind of service (Stateless or Stateful). */
   serviceKind: ServiceKind;
-};
+}
 
 /** The properties of a stateful service resource. */
-export type StatefulServiceProperties = ServiceResourceProperties & {
+export interface StatefulServiceProperties extends ServiceResourceProperties {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  serviceKind: "Stateful";
   /** A flag indicating whether this is a persistent service which stores states on the local disk. If it is then the value of this property is true, if not it is false. */
   hasPersistedState?: boolean;
   /** The target replica set size as a number. */
@@ -1132,18 +1140,23 @@ export type StatefulServiceProperties = ServiceResourceProperties & {
   quorumLossWaitDuration?: Date;
   /** The definition on how long StandBy replicas should be maintained before being removed, represented in ISO 8601 format (hh:mm:ss.s). */
   standByReplicaKeepDuration?: Date;
-};
+}
 
 /** The properties of a stateless service resource. */
-export type StatelessServiceProperties = ServiceResourceProperties & {
+export interface StatelessServiceProperties extends ServiceResourceProperties {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  serviceKind: "Stateless";
   /** The instance count. */
   instanceCount?: number;
-  /** Delay duration for RequestDrain feature to ensures that the endpoint advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay enables existing requests to drain gracefully before the instance actually goes down (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview). It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a number representing the total number of milliseconds. */
+  /** Delay duration for RequestDrain feature to ensures that the endpoint advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay enables existing requests to drain gracefully before the instance actually goes down (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview). It is represented in ISO 8601 format (hh:mm:ss.s). */
   instanceCloseDelayDuration?: string;
-};
+}
 
 /** The properties of a stateful service resource for patch operations. */
-export type StatefulServiceUpdateProperties = ServiceResourceUpdateProperties & {
+export interface StatefulServiceUpdateProperties
+  extends ServiceResourceUpdateProperties {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  serviceKind: "Stateful";
   /** The target replica set size as a number. */
   targetReplicaSetSize?: number;
   /** The minimum replica set size as a number. */
@@ -1154,21 +1167,28 @@ export type StatefulServiceUpdateProperties = ServiceResourceUpdateProperties &
   quorumLossWaitDuration?: Date;
   /** The definition on how long StandBy replicas should be maintained before being removed, represented in ISO 8601 format (hh:mm:ss.s). */
   standByReplicaKeepDuration?: Date;
-};
+}
 
 /** The properties of a stateless service resource for patch operations. */
-export type StatelessServiceUpdateProperties = ServiceResourceUpdateProperties & {
+export interface StatelessServiceUpdateProperties
+  extends ServiceResourceUpdateProperties {
+  /** Polymorphic discriminator, which specifies the different types this object can be */
+  serviceKind: "Stateless";
   /** The instance count. */
   instanceCount?: number;
-  /** Delay duration for RequestDrain feature to ensures that the endpoint advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay enables existing requests to drain gracefully before the instance actually goes down (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview). It is first interpreted as a string representing an ISO 8601 duration. If that fails, then it is interpreted as a number representing the total number of milliseconds. */
+  /** Delay duration for RequestDrain feature to ensures that the endpoint advertised by the stateless instance is removed before the delay starts prior to closing the instance. This delay enables existing requests to drain gracefully before the instance actually goes down (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-application-upgrade-advanced#avoid-connection-drops-during-stateless-service-planned-downtime-preview). It is first interpreted as a string representing an ISO 8601 duration. It is represented in ISO 8601 format (hh:mm:ss.s). */
   instanceCloseDelayDuration?: string;
-};
+}
 
 /** Known values of {@link AddOnFeatures} that the service accepts. */
 export enum KnownAddOnFeatures {
+  /** RepairManager */
   RepairManager = "RepairManager",
+  /** DnsService */
   DnsService = "DnsService",
+  /** BackupRestoreService */
   BackupRestoreService = "BackupRestoreService",
+  /** ResourceMonitorService */
   ResourceMonitorService = "ResourceMonitorService"
 }
 
@@ -1186,7 +1206,9 @@ export type AddOnFeatures = string;
 
 /** Known values of {@link ClusterEnvironment} that the service accepts. */
 export enum KnownClusterEnvironment {
+  /** Windows */
   Windows = "Windows",
+  /** Linux */
   Linux = "Linux"
 }
 
@@ -1202,13 +1224,21 @@ export type ClusterEnvironment = string;
 
 /** Known values of {@link StoreName} that the service accepts. */
 export enum KnownStoreName {
+  /** AddressBook */
   AddressBook = "AddressBook",
+  /** AuthRoot */
   AuthRoot = "AuthRoot",
+  /** CertificateAuthority */
   CertificateAuthority = "CertificateAuthority",
+  /** Disallowed */
   Disallowed = "Disallowed",
+  /** My */
   My = "My",
+  /** Root */
   Root = "Root",
+  /** TrustedPeople */
   TrustedPeople = "TrustedPeople",
+  /** TrustedPublisher */
   TrustedPublisher = "TrustedPublisher"
 }
 
@@ -1230,15 +1260,25 @@ export type StoreName = string;
 
 /** Known values of {@link ClusterState} that the service accepts. */
 export enum KnownClusterState {
+  /** WaitingForNodes */
   WaitingForNodes = "WaitingForNodes",
+  /** Deploying */
   Deploying = "Deploying",
+  /** BaselineUpgrade */
   BaselineUpgrade = "BaselineUpgrade",
+  /** UpdatingUserConfiguration */
   UpdatingUserConfiguration = "UpdatingUserConfiguration",
+  /** UpdatingUserCertificate */
   UpdatingUserCertificate = "UpdatingUserCertificate",
+  /** UpdatingInfrastructure */
   UpdatingInfrastructure = "UpdatingInfrastructure",
+  /** EnforcingClusterVersion */
   EnforcingClusterVersion = "EnforcingClusterVersion",
+  /** UpgradeServiceUnreachable */
   UpgradeServiceUnreachable = "UpgradeServiceUnreachable",
+  /** AutoScale */
   AutoScale = "AutoScale",
+  /** Ready */
   Ready = "Ready"
 }
 
@@ -1262,8 +1302,11 @@ export type ClusterState = string;
 
 /** Known values of {@link DurabilityLevel} that the service accepts. */
 export enum KnownDurabilityLevel {
+  /** Bronze */
   Bronze = "Bronze",
+  /** Silver */
   Silver = "Silver",
+  /** Gold */
   Gold = "Gold"
 }
 
@@ -1280,9 +1323,13 @@ export type DurabilityLevel = string;
 
 /** Known values of {@link ProvisioningState} that the service accepts. */
 export enum KnownProvisioningState {
+  /** Updating */
   Updating = "Updating",
+  /** Succeeded */
   Succeeded = "Succeeded",
+  /** Failed */
   Failed = "Failed",
+  /** Canceled */
   Canceled = "Canceled"
 }
 
@@ -1300,10 +1347,15 @@ export type ProvisioningState = string;
 
 /** Known values of {@link ReliabilityLevel} that the service accepts. */
 export enum KnownReliabilityLevel {
+  /** None */
   None = "None",
+  /** Bronze */
   Bronze = "Bronze",
+  /** Silver */
   Silver = "Silver",
+  /** Gold */
   Gold = "Gold",
+  /** Platinum */
   Platinum = "Platinum"
 }
 
@@ -1448,7 +1500,9 @@ export type NotificationChannel = string;
 
 /** Known values of {@link Enum14} that the service accepts. */
 export enum KnownEnum14 {
+  /** Windows */
   Windows = "Windows",
+  /** Linux */
   Linux = "Linux"
 }
 

package/src/models/mappers.ts

@@ -1995,6 +1995,7 @@ export const ServiceLoadMetricDescription: coreClient.CompositeMapper = {
 };
 
 export const ServicePlacementPolicyDescription: coreClient.CompositeMapper = {
+  serializedName: "ServicePlacementPolicyDescription",
   type: {
     name: "Composite",
     className: "ServicePlacementPolicyDescription",
@@ -2874,9 +2875,9 @@ export const StatefulServiceProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StatefulServiceProperties",
-    uberParent: "ServiceResourcePropertiesBase",
+    uberParent: "ServiceResourceProperties",
     polymorphicDiscriminator:
-      ServiceResourcePropertiesBase.type.polymorphicDiscriminator,
+      ServiceResourceProperties.type.polymorphicDiscriminator,
     modelProperties: {
       ...ServiceResourceProperties.type.modelProperties,
       hasPersistedState: {
@@ -2930,9 +2931,9 @@ export const StatelessServiceProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StatelessServiceProperties",
-    uberParent: "ServiceResourcePropertiesBase",
+    uberParent: "ServiceResourceProperties",
     polymorphicDiscriminator:
-      ServiceResourcePropertiesBase.type.polymorphicDiscriminator,
+      ServiceResourceProperties.type.polymorphicDiscriminator,
     modelProperties: {
       ...ServiceResourceProperties.type.modelProperties,
       instanceCount: {
@@ -2959,9 +2960,9 @@ export const StatefulServiceUpdateProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StatefulServiceUpdateProperties",
-    uberParent: "ServiceResourcePropertiesBase",
+    uberParent: "ServiceResourceUpdateProperties",
     polymorphicDiscriminator:
-      ServiceResourcePropertiesBase.type.polymorphicDiscriminator,
+      ServiceResourceUpdateProperties.type.polymorphicDiscriminator,
     modelProperties: {
       ...ServiceResourceUpdateProperties.type.modelProperties,
       targetReplicaSetSize: {
@@ -3009,9 +3010,9 @@ export const StatelessServiceUpdateProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StatelessServiceUpdateProperties",
-    uberParent: "ServiceResourcePropertiesBase",
+    uberParent: "ServiceResourceUpdateProperties",
     polymorphicDiscriminator:
-      ServiceResourcePropertiesBase.type.polymorphicDiscriminator,
+      ServiceResourceUpdateProperties.type.polymorphicDiscriminator,
     modelProperties: {
       ...ServiceResourceUpdateProperties.type.modelProperties,
       instanceCount: {
@@ -3035,12 +3036,14 @@ export const StatelessServiceUpdateProperties: coreClient.CompositeMapper = {
 
 export let discriminators = {
   PartitionSchemeDescription: PartitionSchemeDescription,
-  "ServicePlacementPolicyDescription.undefined": ServicePlacementPolicyDescription,
+  "ServicePlacementPolicyDescription.ServicePlacementPolicyDescription": ServicePlacementPolicyDescription,
   "PartitionSchemeDescription.Named": NamedPartitionSchemeDescription,
   "PartitionSchemeDescription.Singleton": SingletonPartitionSchemeDescription,
   "PartitionSchemeDescription.UniformInt64Range": UniformInt64RangePartitionSchemeDescription,
   "ServiceResourcePropertiesBase.ServiceResourceProperties": ServiceResourceProperties,
   "ServiceResourcePropertiesBase.ServiceResourceUpdateProperties": ServiceResourceUpdateProperties,
-  "ServiceResourcePropertiesBase.Stateful": StatefulServiceUpdateProperties,
-  "ServiceResourcePropertiesBase.Stateless": StatelessServiceUpdateProperties
+  "ServiceResourceProperties.Stateful": StatefulServiceProperties,
+  "ServiceResourceProperties.Stateless": StatelessServiceProperties,
+  "ServiceResourceUpdateProperties.Stateful": StatefulServiceUpdateProperties,
+  "ServiceResourceUpdateProperties.Stateless": StatelessServiceUpdateProperties
 };

package/src/operations/operations.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { Operations } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -48,22 +49,34 @@ export class OperationsImpl implements Operations {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(options, settings);
       }
     };
   }
 
   private async *listPagingPage(
-    options?: OperationsListOptionalParams
+    options?: OperationsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<OperationResult[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: OperationsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -130,7 +143,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ErrorModel
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer

package/src/pagingHelper.ts

@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+
+export interface PageInfo {
+  continuationToken?: string;
+}
+
+const pageMap = new WeakMap<object, PageInfo>();
+
+/**
+ * Given the last `.value` produced by the `byPage` iterator,
+ * returns a continuation token that can be used to begin paging from
+ * that point later.
+ * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator.
+ * @returns The continuation token that can be passed into byPage() during future calls.
+ */
+export function getContinuationToken(page: unknown): string | undefined {
+  if (typeof page !== "object" || page === null) {
+    return undefined;
+  }
+  return pageMap.get(page)?.continuationToken;
+}
+
+export function setContinuationToken(
+  page: unknown,
+  continuationToken: string | undefined
+): void {
+  if (typeof page !== "object" || page === null || !continuationToken) {
+    return;
+  }
+  const pageInfo = pageMap.get(page) ?? {};
+  pageInfo.continuationToken = continuationToken;
+  pageMap.set(page, pageInfo);
+}

package/src/serviceFabricManagementClient.ts

@@ -8,6 +8,11 @@
 
 import * as coreClient from "@azure/core-client";
 import * as coreRestPipeline from "@azure/core-rest-pipeline";
+import {
+  PipelineRequest,
+  PipelineResponse,
+  SendRequest
+} from "@azure/core-rest-pipeline";
 import * as coreAuth from "@azure/core-auth";
 import {
   ClustersImpl,
@@ -61,47 +66,53 @@ export class ServiceFabricManagementClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-servicefabric/2.0.2`;
+    const packageDetails = `azsdk-js-arm-servicefabric/2.1.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
         : `${packageDetails}`;
 
-    if (!options.credentialScopes) {
-      options.credentialScopes = ["https://management.azure.com/.default"];
-    }
     const optionsWithDefaults = {
       ...defaults,
       ...options,
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri:
+      endpoint:
         options.endpoint ?? options.baseUri ?? "https://management.azure.com"
     };
     super(optionsWithDefaults);
 
+    let bearerTokenAuthenticationPolicyFound: boolean = false;
     if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
       const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
-      const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
+      bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
         (pipelinePolicy) =>
           pipelinePolicy.name ===
           coreRestPipeline.bearerTokenAuthenticationPolicyName
       );
-      if (!bearerTokenAuthenticationPolicyFound) {
-        this.pipeline.removePolicy({
-          name: coreRestPipeline.bearerTokenAuthenticationPolicyName
-        });
-        this.pipeline.addPolicy(
-          coreRestPipeline.bearerTokenAuthenticationPolicy({
-            scopes: `${optionsWithDefaults.baseUri}/.default`,
-            challengeCallbacks: {
-              authorizeRequestOnChallenge:
-                coreClient.authorizeRequestOnClaimChallenge
-            }
-          })
-        );
-      }
+    }
+    if (
+      !options ||
+      !options.pipeline ||
+      options.pipeline.getOrderedPolicies().length == 0 ||
+      !bearerTokenAuthenticationPolicyFound
+    ) {
+      this.pipeline.removePolicy({
+        name: coreRestPipeline.bearerTokenAuthenticationPolicyName
+      });
+      this.pipeline.addPolicy(
+        coreRestPipeline.bearerTokenAuthenticationPolicy({
+          credential: credentials,
+          scopes:
+            optionsWithDefaults.credentialScopes ??
+            `${optionsWithDefaults.endpoint}/.default`,
+          challengeCallbacks: {
+            authorizeRequestOnChallenge:
+              coreClient.authorizeRequestOnClaimChallenge
+          }
+        })
+      );
     }
     // Parameter assignments
     this.subscriptionId = subscriptionId;
@@ -116,6 +127,35 @@ export class ServiceFabricManagementClient extends coreClient.ServiceClient {
     this.applicationTypeVersions = new ApplicationTypeVersionsImpl(this);
     this.applications = new ApplicationsImpl(this);
     this.services = new ServicesImpl(this);
+    this.addCustomApiVersionPolicy(options.apiVersion);
+  }
+
+  /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+  private addCustomApiVersionPolicy(apiVersion?: string) {
+    if (!apiVersion) {
+      return;
+    }
+    const apiVersionPolicy = {
+      name: "CustomApiVersionPolicy",
+      async sendRequest(
+        request: PipelineRequest,
+        next: SendRequest
+      ): Promise<PipelineResponse> {
+        const param = request.url.split("?");
+        if (param.length > 1) {
+          const newParams = param[1].split("&").map((item) => {
+            if (item.indexOf("api-version") > -1) {
+              return "api-version=" + apiVersion;
+            } else {
+              return item;
+            }
+          });
+          request.url = param[0] + "?" + newParams.join("&");
+        }
+        return next(request);
+      }
+    };
+    this.pipeline.addPolicy(apiVersionPolicy);
   }
 
   clusters: Clusters;