@azure/arm-recoveryservicesbackup 9.0.1-alpha.20221101.1 → 10.0.0-alpha.20221212.2

package/src/operations/protectableContainers.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 { ProtectableContainers } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -60,12 +61,16 @@ export class ProtectableContainersImpl implements ProtectableContainers {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listPagingPage(
           vaultName,
           resourceGroupName,
           fabricName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -75,16 +80,23 @@ export class ProtectableContainersImpl implements ProtectableContainers {
     vaultName: string,
     resourceGroupName: string,
     fabricName: string,
-    options?: ProtectableContainersListOptionalParams
+    options?: ProtectableContainersListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ProtectableContainerResource[]> {
-    let result = await this._list(
-      vaultName,
-      resourceGroupName,
-      fabricName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ProtectableContainersListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(
+        vaultName,
+        resourceGroupName,
+        fabricName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         vaultName,
@@ -94,7 +106,9 @@ export class ProtectableContainersImpl implements ProtectableContainers {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -193,7 +207,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.filter],
   urlParameters: [
     Parameters.$host,
     Parameters.vaultName,

package/src/operations/recoveryPoints.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 { RecoveryPoints } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -68,14 +69,18 @@ export class RecoveryPointsImpl implements RecoveryPoints {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listPagingPage(
           vaultName,
           resourceGroupName,
           fabricName,
           containerName,
           protectedItemName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -87,18 +92,25 @@ export class RecoveryPointsImpl implements RecoveryPoints {
     fabricName: string,
     containerName: string,
     protectedItemName: string,
-    options?: RecoveryPointsListOptionalParams
+    options?: RecoveryPointsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<RecoveryPointResource[]> {
-    let result = await this._list(
-      vaultName,
-      resourceGroupName,
-      fabricName,
-      containerName,
-      protectedItemName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: RecoveryPointsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(
+        vaultName,
+        resourceGroupName,
+        fabricName,
+        containerName,
+        protectedItemName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         vaultName,
@@ -110,7 +122,9 @@ export class RecoveryPointsImpl implements RecoveryPoints {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -300,7 +314,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.filter],
   urlParameters: [
     Parameters.$host,
     Parameters.vaultName,

package/src/operations/recoveryPointsRecommendedForMove.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 { RecoveryPointsRecommendedForMove } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -71,7 +72,10 @@ export class RecoveryPointsRecommendedForMoveImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listPagingPage(
           vaultName,
           resourceGroupName,
@@ -79,7 +83,8 @@ export class RecoveryPointsRecommendedForMoveImpl
           containerName,
           protectedItemName,
           parameters,
-          options
+          options,
+          settings
         );
       }
     };
@@ -92,19 +97,26 @@ export class RecoveryPointsRecommendedForMoveImpl
     containerName: string,
     protectedItemName: string,
     parameters: ListRecoveryPointsRecommendedForMoveRequest,
-    options?: RecoveryPointsRecommendedForMoveListOptionalParams
+    options?: RecoveryPointsRecommendedForMoveListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<RecoveryPointResource[]> {
-    let result = await this._list(
-      vaultName,
-      resourceGroupName,
-      fabricName,
-      containerName,
-      protectedItemName,
-      parameters,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: RecoveryPointsRecommendedForMoveListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(
+        vaultName,
+        resourceGroupName,
+        fabricName,
+        containerName,
+        protectedItemName,
+        parameters,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         vaultName,
@@ -117,7 +129,9 @@ export class RecoveryPointsRecommendedForMoveImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -255,7 +269,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.vaultName,

package/src/operations/resourceGuardProxies.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 { ResourceGuardProxies } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -53,8 +54,16 @@ export class ResourceGuardProxiesImpl implements ResourceGuardProxies {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.getPagingPage(vaultName, resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.getPagingPage(
+          vaultName,
+          resourceGroupName,
+          options,
+          settings
+        );
       }
     };
   }
@@ -62,11 +71,18 @@ export class ResourceGuardProxiesImpl implements ResourceGuardProxies {
   private async *getPagingPage(
     vaultName: string,
     resourceGroupName: string,
-    options?: ResourceGuardProxiesGetOptionalParams
+    options?: ResourceGuardProxiesGetOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ResourceGuardProxyBaseResource[]> {
-    let result = await this._get(vaultName, resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ResourceGuardProxiesGetResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._get(vaultName, resourceGroupName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._getNext(
         vaultName,
@@ -75,7 +91,9 @@ export class ResourceGuardProxiesImpl implements ResourceGuardProxies {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -167,7 +185,6 @@ const getNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.vaultName,

package/src/operations/resourceGuardProxy.ts

@@ -14,6 +14,7 @@ import { RecoveryServicesBackupClient } from "../recoveryServicesBackupClient";
 import {
   ResourceGuardProxyGetOptionalParams,
   ResourceGuardProxyGetResponse,
+  ResourceGuardProxyBaseResource,
   ResourceGuardProxyPutOptionalParams,
   ResourceGuardProxyPutResponse,
   ResourceGuardProxyDeleteOptionalParams,
@@ -61,16 +62,24 @@ export class ResourceGuardProxyImpl implements ResourceGuardProxy {
    * @param resourceGroupName The name of the resource group where the recovery services vault is
    *                          present.
    * @param resourceGuardProxyName
+   * @param parameters Request body for operation
    * @param options The options parameters.
    */
   put(
     vaultName: string,
     resourceGroupName: string,
     resourceGuardProxyName: string,
+    parameters: ResourceGuardProxyBaseResource,
     options?: ResourceGuardProxyPutOptionalParams
   ): Promise<ResourceGuardProxyPutResponse> {
     return this.client.sendOperationRequest(
-      { vaultName, resourceGroupName, resourceGuardProxyName, options },
+      {
+        vaultName,
+        resourceGroupName,
+        resourceGuardProxyName,
+        parameters,
+        options
+      },
       putOperationSpec
     );
   }
@@ -161,6 +170,7 @@ const putOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
+  requestBody: Parameters.parameters20,
   queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
@@ -169,7 +179,8 @@ const putOperationSpec: coreClient.OperationSpec = {
     Parameters.subscriptionId,
     Parameters.resourceGuardProxyName
   ],
-  headerParameters: [Parameters.accept],
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
   serializer
 };
 const deleteOperationSpec: coreClient.OperationSpec = {
@@ -206,7 +217,7 @@ const unlockDeleteOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  requestBody: Parameters.parameters20,
+  requestBody: Parameters.parameters21,
   queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,

package/src/operationsInterfaces/resourceGuardProxy.ts

@@ -9,6 +9,7 @@
 import {
   ResourceGuardProxyGetOptionalParams,
   ResourceGuardProxyGetResponse,
+  ResourceGuardProxyBaseResource,
   ResourceGuardProxyPutOptionalParams,
   ResourceGuardProxyPutResponse,
   ResourceGuardProxyDeleteOptionalParams,
@@ -40,12 +41,14 @@ export interface ResourceGuardProxy {
    * @param resourceGroupName The name of the resource group where the recovery services vault is
    *                          present.
    * @param resourceGuardProxyName
+   * @param parameters Request body for operation
    * @param options The options parameters.
    */
   put(
     vaultName: string,
     resourceGroupName: string,
     resourceGuardProxyName: string,
+    parameters: ResourceGuardProxyBaseResource,
     options?: ResourceGuardProxyPutOptionalParams
   ): Promise<ResourceGuardProxyPutResponse>;
   /**

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/recoveryServicesBackupClient.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 { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "./lroImpl";
@@ -157,47 +162,53 @@ export class RecoveryServicesBackupClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-recoveryservicesbackup/9.0.1`;
+    const packageDetails = `azsdk-js-arm-recoveryservicesbackup/10.0.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;
@@ -277,6 +288,35 @@ export class RecoveryServicesBackupClient extends coreClient.ServiceClient {
     );
     this.resourceGuardProxies = new ResourceGuardProxiesImpl(this);
     this.resourceGuardProxy = new ResourceGuardProxyImpl(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);
   }
 
   /**