@azure/arm-datalake-analytics 2.0.0-beta.3 → 2.0.0-beta.4

package/src/dataLakeAnalyticsAccountManagementClient.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 {
   AccountsImpl,
@@ -62,47 +67,53 @@ export class DataLakeAnalyticsAccountManagementClient extends coreClient.Service
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-datalake-analytics/2.0.0-beta.3`;
+    const packageDetails = `azsdk-js-arm-datalake-analytics/2.0.0-beta.4`;
     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;
@@ -117,6 +128,35 @@ export class DataLakeAnalyticsAccountManagementClient extends coreClient.Service
     this.firewallRules = new FirewallRulesImpl(this);
     this.operations = new OperationsImpl(this);
     this.locations = new LocationsImpl(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);
   }
 
   accounts: Accounts;

package/src/index.ts

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

package/src/models/index.ts

@@ -651,7 +651,8 @@ export interface HiveMetastoreListResult {
 }
 
 /** The account specific properties that are associated with an underlying Data Lake Analytics account. Returned only when retrieving a specific account. */
-export type DataLakeAnalyticsAccountProperties = DataLakeAnalyticsAccountPropertiesBasic & {
+export interface DataLakeAnalyticsAccountProperties
+  extends DataLakeAnalyticsAccountPropertiesBasic {
   /**
    * The type of the default Data Lake Store account associated with this account.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -748,10 +749,10 @@ export type DataLakeAnalyticsAccountProperties = DataLakeAnalyticsAccountPropert
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly debugDataAccessLevel?: DebugDataAccessLevel;
-};
+}
 
 /** A Data Lake Analytics account object, containing all information associated with the named Data Lake Analytics account. */
-export type DataLakeAnalyticsAccountBasic = Resource & {
+export interface DataLakeAnalyticsAccountBasic extends Resource {
   /**
    * The unique identifier associated with this Data Lake Analytics account.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -782,10 +783,10 @@ export type DataLakeAnalyticsAccountBasic = Resource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly endpoint?: string;
-};
+}
 
 /** A Data Lake Analytics account object, containing all information associated with the named Data Lake Analytics account. */
-export type DataLakeAnalyticsAccount = Resource & {
+export interface DataLakeAnalyticsAccount extends Resource {
   /**
    * The unique identifier associated with this Data Lake Analytics account.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -912,28 +913,28 @@ export type DataLakeAnalyticsAccount = Resource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly debugDataAccessLevel?: DebugDataAccessLevel;
-};
+}
 
 /** Data Lake Store account information. */
-export type DataLakeStoreAccountInformation = SubResource & {
+export interface DataLakeStoreAccountInformation extends SubResource {
   /**
    * The optional suffix for the Data Lake Store account.
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly suffix?: string;
-};
+}
 
 /** Azure Storage account information. */
-export type StorageAccountInformation = SubResource & {
+export interface StorageAccountInformation extends SubResource {
   /**
    * The optional suffix for the storage account.
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly suffix?: string;
-};
+}
 
 /** Data Lake Analytics compute policy information. */
-export type ComputePolicy = SubResource & {
+export interface ComputePolicy extends SubResource {
   /**
    * The AAD object identifier for the entity to create a policy for.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -954,9 +955,9 @@ export type ComputePolicy = SubResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly minPriorityPerJob?: number;
-};
+}
 
-export type HiveMetastore = SubResource & {
+export interface HiveMetastore extends SubResource {
   /**
    * The serverUri for the Hive MetaStore
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -987,10 +988,10 @@ export type HiveMetastore = SubResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly nestedResourceProvisioningState?: NestedResourceProvisioningState;
-};
+}
 
 /** Data Lake Analytics  VirtualNetwork Rule information. */
-export type VirtualNetworkRule = SubResource & {
+export interface VirtualNetworkRule extends SubResource {
   /**
    * The resource identifier for the subnet
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -1001,10 +1002,10 @@ export type VirtualNetworkRule = SubResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly virtualNetworkRuleState?: VirtualNetworkRuleState;
-};
+}
 
 /** Data Lake Analytics firewall rule information. */
-export type FirewallRule = SubResource & {
+export interface FirewallRule extends SubResource {
   /**
    * The start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -1015,21 +1016,24 @@ export type FirewallRule = SubResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly endIpAddress?: string;
-};
+}
 
 /** Azure Storage blob container information. */
-export type StorageContainer = SubResource & {
+export interface StorageContainer extends SubResource {
   /**
    * The last modified time of the blob container.
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly lastModifiedTime?: Date;
-};
+}
 
 /** Known values of {@link AADObjectType} that the service accepts. */
 export enum KnownAADObjectType {
+  /** User */
   User = "User",
+  /** Group */
   Group = "Group",
+  /** ServicePrincipal */
   ServicePrincipal = "ServicePrincipal"
 }
 
@@ -1046,8 +1050,11 @@ export type AADObjectType = string;
 
 /** Known values of {@link OperationOrigin} that the service accepts. */
 export enum KnownOperationOrigin {
+  /** User */
   User = "user",
+  /** System */
   System = "system",
+  /** UserSystem */
   UserSystem = "user,system"
 }
 
@@ -1064,10 +1071,15 @@ export type OperationOrigin = string;
 
 /** Known values of {@link SubscriptionState} that the service accepts. */
 export enum KnownSubscriptionState {
+  /** Registered */
   Registered = "Registered",
+  /** Suspended */
   Suspended = "Suspended",
+  /** Deleted */
   Deleted = "Deleted",
+  /** Unregistered */
   Unregistered = "Unregistered",
+  /** Warned */
   Warned = "Warned"
 }
 

package/src/operations/accounts.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 { Accounts } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,9 +19,9 @@ import {
   DataLakeAnalyticsAccountBasic,
   AccountsListNextOptionalParams,
   AccountsListOptionalParams,
+  AccountsListResponse,
   AccountsListByResourceGroupNextOptionalParams,
   AccountsListByResourceGroupOptionalParams,
-  AccountsListResponse,
   AccountsListByResourceGroupResponse,
   CreateDataLakeAnalyticsAccountParameters,
   AccountsCreateOptionalParams,
@@ -66,22 +67,34 @@ export class AccountsImpl implements Accounts {
       [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?: AccountsListOptionalParams
+    options?: AccountsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<DataLakeAnalyticsAccountBasic[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: AccountsListResponse;
+    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;
     }
   }
 
@@ -111,19 +124,33 @@ export class AccountsImpl implements Accounts {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByResourceGroupPagingPage(resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByResourceGroupPagingPage(
+          resourceGroupName,
+          options,
+          settings
+        );
       }
     };
   }
 
   private async *listByResourceGroupPagingPage(
     resourceGroupName: string,
-    options?: AccountsListByResourceGroupOptionalParams
+    options?: AccountsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<DataLakeAnalyticsAccountBasic[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: AccountsListByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByResourceGroup(resourceGroupName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByResourceGroupNext(
         resourceGroupName,
@@ -131,7 +158,9 @@ export class AccountsImpl implements Accounts {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/computePolicies.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 { ComputePolicies } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -65,11 +66,15 @@ export class ComputePoliciesImpl implements ComputePolicies {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByAccountPagingPage(
           resourceGroupName,
           accountName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -78,15 +83,22 @@ export class ComputePoliciesImpl implements ComputePolicies {
   private async *listByAccountPagingPage(
     resourceGroupName: string,
     accountName: string,
-    options?: ComputePoliciesListByAccountOptionalParams
+    options?: ComputePoliciesListByAccountOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ComputePolicy[]> {
-    let result = await this._listByAccount(
-      resourceGroupName,
-      accountName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ComputePoliciesListByAccountResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByAccount(
+        resourceGroupName,
+        accountName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByAccountNext(
         resourceGroupName,
@@ -95,7 +107,9 @@ export class ComputePoliciesImpl implements ComputePolicies {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/dataLakeStoreAccounts.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 { DataLakeStoreAccounts } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -61,11 +62,15 @@ export class DataLakeStoreAccountsImpl implements DataLakeStoreAccounts {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByAccountPagingPage(
           resourceGroupName,
           accountName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -74,15 +79,22 @@ export class DataLakeStoreAccountsImpl implements DataLakeStoreAccounts {
   private async *listByAccountPagingPage(
     resourceGroupName: string,
     accountName: string,
-    options?: DataLakeStoreAccountsListByAccountOptionalParams
+    options?: DataLakeStoreAccountsListByAccountOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<DataLakeStoreAccountInformation[]> {
-    let result = await this._listByAccount(
-      resourceGroupName,
-      accountName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: DataLakeStoreAccountsListByAccountResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByAccount(
+        resourceGroupName,
+        accountName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByAccountNext(
         resourceGroupName,
@@ -91,7 +103,9 @@ export class DataLakeStoreAccountsImpl implements DataLakeStoreAccounts {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 

package/src/operations/firewallRules.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 { FirewallRules } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -64,11 +65,15 @@ export class FirewallRulesImpl implements FirewallRules {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByAccountPagingPage(
           resourceGroupName,
           accountName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -77,15 +82,22 @@ export class FirewallRulesImpl implements FirewallRules {
   private async *listByAccountPagingPage(
     resourceGroupName: string,
     accountName: string,
-    options?: FirewallRulesListByAccountOptionalParams
+    options?: FirewallRulesListByAccountOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<FirewallRule[]> {
-    let result = await this._listByAccount(
-      resourceGroupName,
-      accountName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: FirewallRulesListByAccountResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByAccount(
+        resourceGroupName,
+        accountName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByAccountNext(
         resourceGroupName,
@@ -94,7 +106,9 @@ export class FirewallRulesImpl implements FirewallRules {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }