@azure/arm-azurestack 3.0.0-beta.4 → 3.0.0-beta.5

package/src/azureStackManagementClient.ts

@@ -7,6 +7,12 @@
  */
 
 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 {
   OperationsImpl,
@@ -59,25 +65,54 @@ export class AzureStackManagementClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-azurestack/3.0.0-beta.4`;
+    const packageDetails = `azsdk-js-arm-azurestack/3.0.0-beta.5`;
     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();
+      bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
+        (pipelinePolicy) =>
+          pipelinePolicy.name ===
+          coreRestPipeline.bearerTokenAuthenticationPolicyName
+      );
+    }
+    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;
 
@@ -90,6 +125,35 @@ export class AzureStackManagementClient extends coreClient.ServiceClient {
     this.products = new ProductsImpl(this);
     this.registrations = new RegistrationsImpl(this);
     this.linkedSubscriptions = new LinkedSubscriptionsImpl(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);
   }
 
   operations: Operations;

package/src/index.ts

@@ -7,6 +7,7 @@
  */
 
 /// <reference lib="esnext.asynciterable" />
+export { getContinuationToken } from "./pagingHelper";
 export * from "./models";
 export { AzureStackManagementClient } from "./azureStackManagementClient";
 export * from "./operationsInterfaces";

package/src/models/index.ts

@@ -499,13 +499,13 @@ export interface LinkedSubscriptionParameter {
 }
 
 /** Cloud specific manifest GET response. */
-export type CloudManifestFileResponse = Resource & {
+export interface CloudManifestFileResponse extends Resource {
   /** Cloud specific manifest data. */
   properties?: CloudManifestFileProperties;
-};
+}
 
 /** Customer subscription. */
-export type CustomerSubscription = Resource & {
+export interface CustomerSubscription extends Resource {
   /**
    * Metadata pertaining to creation and last modification of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -513,10 +513,10 @@ export type CustomerSubscription = Resource & {
   readonly systemData?: SystemData;
   /** Tenant Id. */
   tenantId?: string;
-};
+}
 
 /** Product information. */
-export type Product = Resource & {
+export interface Product extends Resource {
   /**
    * Metadata pertaining to creation and last modification of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -558,24 +558,25 @@ export type Product = Resource & {
   productProperties?: ProductProperties;
   /** Product compatibility with current device. */
   compatibility?: Compatibility;
-};
+}
 
 /** Product information. */
-export type ExtendedProductProperties = VirtualMachineExtensionProductProperties &
-  VirtualMachineProductProperties & {};
+export interface ExtendedProductProperties
+  extends VirtualMachineExtensionProductProperties,
+    VirtualMachineProductProperties {}
 
 /** Registration information. */
-export type Registration = TrackedResource & {
+export interface Registration extends TrackedResource {
   /** The object identifier associated with the Azure Stack connecting to Azure. */
   objectId?: string;
   /** The identifier of the registered Azure Stack. */
   cloudId?: string;
   /** Specifies the billing mode for the Azure Stack registration. */
   billingModel?: string;
-};
+}
 
 /** Linked Subscription information. */
-export type LinkedSubscription = TrackedResource & {
+export interface LinkedSubscription extends TrackedResource {
   /** The identifier associated with the device subscription. */
   linkedSubscriptionId?: string;
   /** The identifier associated with the device registration. */
@@ -605,13 +606,17 @@ export type LinkedSubscription = TrackedResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly deviceConnectionStatus?: string;
-};
+}
 
 /** Known values of {@link CreatedByType} that the service accepts. */
 export enum KnownCreatedByType {
+  /** User */
   User = "User",
+  /** Application */
   Application = "Application",
+  /** ManagedIdentity */
   ManagedIdentity = "ManagedIdentity",
+  /** Key */
   Key = "Key"
 }
 
@@ -629,15 +634,25 @@ export type CreatedByType = string;
 
 /** Known values of {@link CompatibilityIssue} that the service accepts. */
 export enum KnownCompatibilityIssue {
+  /** HigherDeviceVersionRequired */
   HigherDeviceVersionRequired = "HigherDeviceVersionRequired",
+  /** LowerDeviceVersionRequired */
   LowerDeviceVersionRequired = "LowerDeviceVersionRequired",
+  /** CapacityBillingModelRequired */
   CapacityBillingModelRequired = "CapacityBillingModelRequired",
+  /** PayAsYouGoBillingModelRequired */
   PayAsYouGoBillingModelRequired = "PayAsYouGoBillingModelRequired",
+  /** DevelopmentBillingModelRequired */
   DevelopmentBillingModelRequired = "DevelopmentBillingModelRequired",
+  /** AzureADIdentitySystemRequired */
   AzureADIdentitySystemRequired = "AzureADIdentitySystemRequired",
+  /** AdfsIdentitySystemRequired */
   AdfsIdentitySystemRequired = "ADFSIdentitySystemRequired",
+  /** ConnectionToInternetRequired */
   ConnectionToInternetRequired = "ConnectionToInternetRequired",
+  /** ConnectionToAzureRequired */
   ConnectionToAzureRequired = "ConnectionToAzureRequired",
+  /** DisconnectedEnvironmentRequired */
   DisconnectedEnvironmentRequired = "DisconnectedEnvironmentRequired"
 }
 
@@ -661,8 +676,11 @@ export type CompatibilityIssue = string;
 
 /** Known values of {@link ComputeRole} that the service accepts. */
 export enum KnownComputeRole {
+  /** None */
   None = "None",
+  /** IaaS */
   IaaS = "IaaS",
+  /** PaaS */
   PaaS = "PaaS"
 }
 
@@ -679,8 +697,11 @@ export type ComputeRole = string;
 
 /** Known values of {@link OperatingSystem} that the service accepts. */
 export enum KnownOperatingSystem {
+  /** None */
   None = "None",
+  /** Windows */
   Windows = "Windows",
+  /** Linux */
   Linux = "Linux"
 }
 
@@ -697,7 +718,9 @@ export type OperatingSystem = string;
 
 /** Known values of {@link Category} that the service accepts. */
 export enum KnownCategory {
+  /** AzureAD */
   AzureAD = "AzureAD",
+  /** Adfs */
   Adfs = "ADFS"
 }
 
@@ -713,6 +736,7 @@ export type Category = string;
 
 /** Known values of {@link Location} that the service accepts. */
 export enum KnownLocation {
+  /** Global */
   Global = "global"
 }
 

package/src/operations/customerSubscriptions.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 { CustomerSubscriptions } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -57,8 +58,16 @@ export class CustomerSubscriptionsImpl implements CustomerSubscriptions {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroup, registrationName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(
+          resourceGroup,
+          registrationName,
+          options,
+          settings
+        );
       }
     };
   }
@@ -66,11 +75,18 @@ export class CustomerSubscriptionsImpl implements CustomerSubscriptions {
   private async *listPagingPage(
     resourceGroup: string,
     registrationName: string,
-    options?: CustomerSubscriptionsListOptionalParams
+    options?: CustomerSubscriptionsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<CustomerSubscription[]> {
-    let result = await this._list(resourceGroup, registrationName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: CustomerSubscriptionsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceGroup, registrationName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         resourceGroup,
@@ -79,7 +95,9 @@ export class CustomerSubscriptionsImpl implements CustomerSubscriptions {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/linkedSubscriptions.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 { LinkedSubscriptions } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,9 +17,9 @@ import {
   LinkedSubscription,
   LinkedSubscriptionsListByResourceGroupNextOptionalParams,
   LinkedSubscriptionsListByResourceGroupOptionalParams,
+  LinkedSubscriptionsListByResourceGroupResponse,
   LinkedSubscriptionsListBySubscriptionNextOptionalParams,
   LinkedSubscriptionsListBySubscriptionOptionalParams,
-  LinkedSubscriptionsListByResourceGroupResponse,
   LinkedSubscriptionsListBySubscriptionResponse,
   LinkedSubscriptionsGetOptionalParams,
   LinkedSubscriptionsGetResponse,
@@ -62,19 +63,33 @@ export class LinkedSubscriptionsImpl implements LinkedSubscriptions {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByResourceGroupPagingPage(resourceGroup, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByResourceGroupPagingPage(
+          resourceGroup,
+          options,
+          settings
+        );
       }
     };
   }
 
   private async *listByResourceGroupPagingPage(
     resourceGroup: string,
-    options?: LinkedSubscriptionsListByResourceGroupOptionalParams
+    options?: LinkedSubscriptionsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<LinkedSubscription[]> {
-    let result = await this._listByResourceGroup(resourceGroup, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: LinkedSubscriptionsListByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByResourceGroup(resourceGroup, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByResourceGroupNext(
         resourceGroup,
@@ -82,7 +97,9 @@ export class LinkedSubscriptionsImpl implements LinkedSubscriptions {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -113,22 +130,34 @@ export class LinkedSubscriptionsImpl implements LinkedSubscriptions {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionPagingPage(options, settings);
       }
     };
   }
 
   private async *listBySubscriptionPagingPage(
-    options?: LinkedSubscriptionsListBySubscriptionOptionalParams
+    options?: LinkedSubscriptionsListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<LinkedSubscription[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: LinkedSubscriptionsListBySubscriptionResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listBySubscription(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listBySubscriptionNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

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<Operation[]> {
-    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;
     }
   }
 

package/src/operations/products.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 { Products } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -62,8 +63,16 @@ export class ProductsImpl implements Products {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroup, registrationName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(
+          resourceGroup,
+          registrationName,
+          options,
+          settings
+        );
       }
     };
   }
@@ -71,11 +80,18 @@ export class ProductsImpl implements Products {
   private async *listPagingPage(
     resourceGroup: string,
     registrationName: string,
-    options?: ProductsListOptionalParams
+    options?: ProductsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Product[]> {
-    let result = await this._list(resourceGroup, registrationName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ProductsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceGroup, registrationName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         resourceGroup,
@@ -84,7 +100,9 @@ export class ProductsImpl implements Products {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/registrations.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 { Registrations } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,9 +17,9 @@ import {
   Registration,
   RegistrationsListNextOptionalParams,
   RegistrationsListOptionalParams,
+  RegistrationsListResponse,
   RegistrationsListBySubscriptionNextOptionalParams,
   RegistrationsListBySubscriptionOptionalParams,
-  RegistrationsListResponse,
   RegistrationsListBySubscriptionResponse,
   RegistrationsGetOptionalParams,
   RegistrationsGetResponse,
@@ -65,23 +66,35 @@ export class RegistrationsImpl implements Registrations {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroup, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(resourceGroup, options, settings);
       }
     };
   }
 
   private async *listPagingPage(
     resourceGroup: string,
-    options?: RegistrationsListOptionalParams
+    options?: RegistrationsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Registration[]> {
-    let result = await this._list(resourceGroup, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: RegistrationsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceGroup, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(resourceGroup, continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -109,22 +122,34 @@ export class RegistrationsImpl implements Registrations {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionPagingPage(options, settings);
       }
     };
   }
 
   private async *listBySubscriptionPagingPage(
-    options?: RegistrationsListBySubscriptionOptionalParams
+    options?: RegistrationsListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Registration[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: RegistrationsListBySubscriptionResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listBySubscription(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listBySubscriptionNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }