@azure/arm-msi 2.1.0-alpha.20230126.1 → 2.1.0-alpha.20230202.1

package/src/operations/userAssignedIdentities.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 { UserAssignedIdentities } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,13 +17,13 @@ import {
   Identity,
   UserAssignedIdentitiesListBySubscriptionNextOptionalParams,
   UserAssignedIdentitiesListBySubscriptionOptionalParams,
+  UserAssignedIdentitiesListBySubscriptionResponse,
   UserAssignedIdentitiesListByResourceGroupNextOptionalParams,
   UserAssignedIdentitiesListByResourceGroupOptionalParams,
+  UserAssignedIdentitiesListByResourceGroupResponse,
   AzureResource,
   UserAssignedIdentitiesListAssociatedResourcesNextOptionalParams,
   UserAssignedIdentitiesListAssociatedResourcesOptionalParams,
-  UserAssignedIdentitiesListBySubscriptionResponse,
-  UserAssignedIdentitiesListByResourceGroupResponse,
   UserAssignedIdentitiesListAssociatedResourcesResponse,
   UserAssignedIdentitiesCreateOrUpdateOptionalParams,
   UserAssignedIdentitiesCreateOrUpdateResponse,
@@ -65,22 +66,34 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
       [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?: UserAssignedIdentitiesListBySubscriptionOptionalParams
+    options?: UserAssignedIdentitiesListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Identity[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: UserAssignedIdentitiesListBySubscriptionResponse;
+    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;
     }
   }
 
@@ -109,19 +122,33 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
       [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?: UserAssignedIdentitiesListByResourceGroupOptionalParams
+    options?: UserAssignedIdentitiesListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Identity[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: UserAssignedIdentitiesListByResourceGroupResponse;
+    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,
@@ -129,7 +156,9 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -168,11 +197,15 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listAssociatedResourcesPagingPage(
           resourceGroupName,
           resourceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -181,15 +214,22 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
   private async *listAssociatedResourcesPagingPage(
     resourceGroupName: string,
     resourceName: string,
-    options?: UserAssignedIdentitiesListAssociatedResourcesOptionalParams
+    options?: UserAssignedIdentitiesListAssociatedResourcesOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<AzureResource[]> {
-    let result = await this._listAssociatedResources(
-      resourceGroupName,
-      resourceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: UserAssignedIdentitiesListAssociatedResourcesResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listAssociatedResources(
+        resourceGroupName,
+        resourceName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listAssociatedResourcesNext(
         resourceGroupName,
@@ -198,7 +238,9 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -560,7 +602,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,
@@ -580,7 +621,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,
@@ -601,14 +641,6 @@ const listAssociatedResourcesNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [
-    Parameters.apiVersion,
-    Parameters.filter,
-    Parameters.orderby,
-    Parameters.top,
-    Parameters.skip,
-    Parameters.skiptoken
-  ],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,

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/types/arm-msi.d.ts

@@ -142,10 +142,6 @@ export declare type FederatedIdentityCredentialsGetResponse = FederatedIdentityC
 
 /** Optional parameters. */
 export declare interface FederatedIdentityCredentialsListNextOptionalParams extends coreClient.OperationOptions {
-    /** Number of records to return. */
-    top?: number;
-    /** A skip token is used to continue retrieving items after an operation returns a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skipToken parameter that specifies a starting point to use for subsequent calls. */
-    skiptoken?: string;
 }
 
 /** Contains response data for the listNext operation. */
@@ -170,6 +166,15 @@ export declare interface FederatedIdentityCredentialsListResult {
     nextLink?: string;
 }
 
+/**
+ * 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 declare function getContinuationToken(page: unknown): string | undefined;
+
 /** Describes an identity resource. */
 export declare interface Identity extends TrackedResource {
     /**
@@ -447,16 +452,6 @@ export declare type UserAssignedIdentitiesGetResponse = Identity;
 
 /** Optional parameters. */
 export declare interface UserAssignedIdentitiesListAssociatedResourcesNextOptionalParams extends coreClient.OperationOptions {
-    /** OData filter expression to apply to the query. */
-    filter?: string;
-    /** OData orderBy expression to apply to the query. */
-    orderby?: string;
-    /** Number of records to return. */
-    top?: number;
-    /** Number of records to skip. */
-    skip?: number;
-    /** A skip token is used to continue retrieving items after an operation returns a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skipToken parameter that specifies a starting point to use for subsequent calls. */
-    skiptoken?: string;
 }
 
 /** Contains response data for the listAssociatedResourcesNext operation. */

package/types/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.33.5"
+      "packageVersion": "7.34.2"
     }
   ]
 }