@azure/arm-databox 5.0.0-beta.2 → 5.0.0

package/src/models/parameters.ts

@@ -51,7 +51,7 @@ export const $host: OperationURLParameter = {
 export const apiVersion: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2021-08-01-preview",
+    defaultValue: "2022-12-01",
     isConstant: true,
     serializedName: "api-version",
     type: {

package/src/operations/jobs.ts

@@ -6,26 +6,32 @@
  * 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 { Jobs } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { DataBoxManagementClient } from "../dataBoxManagementClient";
-import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
-import { LroImpl } from "../lroImpl";
+import {
+  SimplePollerLike,
+  OperationState,
+  createHttpPoller
+} from "@azure/core-lro";
+import { createLroSpec } from "../lroImpl";
 import {
   JobResource,
   JobsListNextOptionalParams,
   JobsListOptionalParams,
+  JobsListResponse,
   JobsListByResourceGroupNextOptionalParams,
   JobsListByResourceGroupOptionalParams,
+  JobsListByResourceGroupResponse,
   UnencryptedCredentials,
   JobsListCredentialsOptionalParams,
-  JobsListResponse,
+  JobsListCredentialsResponse,
   MarkDevicesShippedRequest,
   JobsMarkDevicesShippedOptionalParams,
-  JobsListByResourceGroupResponse,
   JobsGetOptionalParams,
   JobsGetResponse,
   JobsCreateOptionalParams,
@@ -39,7 +45,6 @@ import {
   JobsBookShipmentPickUpResponse,
   CancellationReason,
   JobsCancelOptionalParams,
-  JobsListCredentialsResponse,
   JobsListNextResponse,
   JobsListByResourceGroupNextResponse
 } from "../models";
@@ -72,22 +77,34 @@ export class JobsImpl implements Jobs {
       [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?: JobsListOptionalParams
+    options?: JobsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<JobResource[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: JobsListResponse;
+    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;
     }
   }
 
@@ -116,19 +133,33 @@ export class JobsImpl implements Jobs {
       [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?: JobsListByResourceGroupOptionalParams
+    options?: JobsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<JobResource[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: JobsListByResourceGroupResponse;
+    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,
@@ -136,7 +167,9 @@ export class JobsImpl implements Jobs {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -176,11 +209,15 @@ export class JobsImpl implements Jobs {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listCredentialsPagingPage(
           resourceGroupName,
           jobName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -189,13 +226,11 @@ export class JobsImpl implements Jobs {
   private async *listCredentialsPagingPage(
     resourceGroupName: string,
     jobName: string,
-    options?: JobsListCredentialsOptionalParams
+    options?: JobsListCredentialsOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<UnencryptedCredentials[]> {
-    let result = await this._listCredentials(
-      resourceGroupName,
-      jobName,
-      options
-    );
+    let result: JobsListCredentialsResponse;
+    result = await this._listCredentials(resourceGroupName, jobName, options);
     yield result.value || [];
   }
 
@@ -289,7 +324,7 @@ export class JobsImpl implements Jobs {
     jobResource: JobResource,
     options?: JobsCreateOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<JobsCreateResponse>, JobsCreateResponse>
+    SimplePollerLike<OperationState<JobsCreateResponse>, JobsCreateResponse>
   > {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
@@ -297,7 +332,7 @@ export class JobsImpl implements Jobs {
     ): Promise<JobsCreateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -330,13 +365,16 @@ export class JobsImpl implements Jobs {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, jobName, jobResource, options },
-      createOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, jobName, jobResource, options },
+      spec: createOperationSpec
+    });
+    const poller = await createHttpPoller<
+      JobsCreateResponse,
+      OperationState<JobsCreateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
     await poller.poll();
@@ -378,14 +416,14 @@ export class JobsImpl implements Jobs {
     resourceGroupName: string,
     jobName: string,
     options?: JobsDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
+  ): Promise<SimplePollerLike<OperationState<void>, void>> {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ): Promise<void> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -418,13 +456,13 @@ export class JobsImpl implements Jobs {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, jobName, options },
-      deleteOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, jobName, options },
+      spec: deleteOperationSpec
+    });
+    const poller = await createHttpPoller<void, OperationState<void>>(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
     await poller.poll();
@@ -461,7 +499,7 @@ export class JobsImpl implements Jobs {
     jobResourceUpdateParameter: JobResourceUpdateParameter,
     options?: JobsUpdateOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<JobsUpdateResponse>, JobsUpdateResponse>
+    SimplePollerLike<OperationState<JobsUpdateResponse>, JobsUpdateResponse>
   > {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
@@ -469,7 +507,7 @@ export class JobsImpl implements Jobs {
     ): Promise<JobsUpdateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -502,13 +540,16 @@ export class JobsImpl implements Jobs {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, jobName, jobResourceUpdateParameter, options },
-      updateOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, jobName, jobResourceUpdateParameter, options },
+      spec: updateOperationSpec
+    });
+    const poller = await createHttpPoller<
+      JobsUpdateResponse,
+      OperationState<JobsUpdateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
     await poller.poll();
@@ -884,7 +925,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ApiError
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.skipToken],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,
@@ -904,7 +944,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ApiError
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.skipToken],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,

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;
     }
   }
 
@@ -130,7 +143,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.ApiError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer

package/src/operations/service.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 { Service } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -74,12 +75,16 @@ export class ServiceImpl implements Service {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listAvailableSkusByResourceGroupPagingPage(
           resourceGroupName,
           location,
           availableSkuRequest,
-          options
+          options,
+          settings
         );
       }
     };
@@ -89,16 +94,23 @@ export class ServiceImpl implements Service {
     resourceGroupName: string,
     location: string,
     availableSkuRequest: AvailableSkuRequest,
-    options?: ServiceListAvailableSkusByResourceGroupOptionalParams
+    options?: ServiceListAvailableSkusByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SkuInformation[]> {
-    let result = await this._listAvailableSkusByResourceGroup(
-      resourceGroupName,
-      location,
-      availableSkuRequest,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ServiceListAvailableSkusByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listAvailableSkusByResourceGroup(
+        resourceGroupName,
+        location,
+        availableSkuRequest,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listAvailableSkusByResourceGroupNext(
         resourceGroupName,
@@ -108,7 +120,9 @@ export class ServiceImpl implements Service {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -416,7 +430,6 @@ const listAvailableSkusByResourceGroupNextOperationSpec: coreClient.OperationSpe
       bodyMapper: Mappers.ApiError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,

package/src/operationsInterfaces/jobs.ts

@@ -7,7 +7,7 @@
  */
 
 import { PagedAsyncIterableIterator } from "@azure/core-paging";
-import { PollerLike, PollOperationState } from "@azure/core-lro";
+import { SimplePollerLike, OperationState } from "@azure/core-lro";
 import {
   JobResource,
   JobsListOptionalParams,
@@ -103,7 +103,7 @@ export interface Jobs {
     jobResource: JobResource,
     options?: JobsCreateOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<JobsCreateResponse>, JobsCreateResponse>
+    SimplePollerLike<OperationState<JobsCreateResponse>, JobsCreateResponse>
   >;
   /**
    * Creates a new job with the specified parameters. Existing job cannot be updated with this API and
@@ -131,7 +131,7 @@ export interface Jobs {
     resourceGroupName: string,
     jobName: string,
     options?: JobsDeleteOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
+  ): Promise<SimplePollerLike<OperationState<void>, void>>;
   /**
    * Deletes a job.
    * @param resourceGroupName The Resource Group Name
@@ -158,7 +158,7 @@ export interface Jobs {
     jobResourceUpdateParameter: JobResourceUpdateParameter,
     options?: JobsUpdateOptionalParams
   ): Promise<
-    PollerLike<PollOperationState<JobsUpdateResponse>, JobsUpdateResponse>
+    SimplePollerLike<OperationState<JobsUpdateResponse>, JobsUpdateResponse>
   >;
   /**
    * Updates the properties of an existing job.

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);
+}