@azure/arm-msi 2.1.0-beta.1 → 2.1.0

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.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [Parameters.$host, Parameters.nextLink],
   headerParameters: [Parameters.accept],
   serializer

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,14 +17,10 @@ import {
   Identity,
   UserAssignedIdentitiesListBySubscriptionNextOptionalParams,
   UserAssignedIdentitiesListBySubscriptionOptionalParams,
+  UserAssignedIdentitiesListBySubscriptionResponse,
   UserAssignedIdentitiesListByResourceGroupNextOptionalParams,
   UserAssignedIdentitiesListByResourceGroupOptionalParams,
-  AzureResource,
-  UserAssignedIdentitiesListAssociatedResourcesNextOptionalParams,
-  UserAssignedIdentitiesListAssociatedResourcesOptionalParams,
-  UserAssignedIdentitiesListBySubscriptionResponse,
   UserAssignedIdentitiesListByResourceGroupResponse,
-  UserAssignedIdentitiesListAssociatedResourcesResponse,
   UserAssignedIdentitiesCreateOrUpdateOptionalParams,
   UserAssignedIdentitiesCreateOrUpdateResponse,
   IdentityUpdate,
@@ -33,8 +30,7 @@ import {
   UserAssignedIdentitiesGetResponse,
   UserAssignedIdentitiesDeleteOptionalParams,
   UserAssignedIdentitiesListBySubscriptionNextResponse,
-  UserAssignedIdentitiesListByResourceGroupNextResponse,
-  UserAssignedIdentitiesListAssociatedResourcesNextResponse
+  UserAssignedIdentitiesListByResourceGroupNextResponse
 } from "../models";
 
 /// <reference lib="esnext.asynciterable" />
@@ -65,22 +61,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 +117,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 +151,9 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -145,77 +169,6 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
     }
   }
 
-  /**
-   * Lists the associated resources for this identity.
-   * @param resourceGroupName The name of the Resource Group to which the identity belongs.
-   * @param resourceName The name of the identity resource.
-   * @param options The options parameters.
-   */
-  public listAssociatedResources(
-    resourceGroupName: string,
-    resourceName: string,
-    options?: UserAssignedIdentitiesListAssociatedResourcesOptionalParams
-  ): PagedAsyncIterableIterator<AzureResource> {
-    const iter = this.listAssociatedResourcesPagingAll(
-      resourceGroupName,
-      resourceName,
-      options
-    );
-    return {
-      next() {
-        return iter.next();
-      },
-      [Symbol.asyncIterator]() {
-        return this;
-      },
-      byPage: () => {
-        return this.listAssociatedResourcesPagingPage(
-          resourceGroupName,
-          resourceName,
-          options
-        );
-      }
-    };
-  }
-
-  private async *listAssociatedResourcesPagingPage(
-    resourceGroupName: string,
-    resourceName: string,
-    options?: UserAssignedIdentitiesListAssociatedResourcesOptionalParams
-  ): AsyncIterableIterator<AzureResource[]> {
-    let result = await this._listAssociatedResources(
-      resourceGroupName,
-      resourceName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
-    while (continuationToken) {
-      result = await this._listAssociatedResourcesNext(
-        resourceGroupName,
-        resourceName,
-        continuationToken,
-        options
-      );
-      continuationToken = result.nextLink;
-      yield result.value || [];
-    }
-  }
-
-  private async *listAssociatedResourcesPagingAll(
-    resourceGroupName: string,
-    resourceName: string,
-    options?: UserAssignedIdentitiesListAssociatedResourcesOptionalParams
-  ): AsyncIterableIterator<AzureResource> {
-    for await (const page of this.listAssociatedResourcesPagingPage(
-      resourceGroupName,
-      resourceName,
-      options
-    )) {
-      yield* page;
-    }
-  }
-
   /**
    * Lists all the userAssignedIdentities available under the specified subscription.
    * @param options The options parameters.
@@ -244,23 +197,6 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
     );
   }
 
-  /**
-   * Lists the associated resources for this identity.
-   * @param resourceGroupName The name of the Resource Group to which the identity belongs.
-   * @param resourceName The name of the identity resource.
-   * @param options The options parameters.
-   */
-  private _listAssociatedResources(
-    resourceGroupName: string,
-    resourceName: string,
-    options?: UserAssignedIdentitiesListAssociatedResourcesOptionalParams
-  ): Promise<UserAssignedIdentitiesListAssociatedResourcesResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, resourceName, options },
-      listAssociatedResourcesOperationSpec
-    );
-  }
-
   /**
    * Create or update an identity in the specified subscription and resource group.
    * @param resourceGroupName The name of the Resource Group to which the identity belongs.
@@ -364,26 +300,6 @@ export class UserAssignedIdentitiesImpl implements UserAssignedIdentities {
       listByResourceGroupNextOperationSpec
     );
   }
-
-  /**
-   * ListAssociatedResourcesNext
-   * @param resourceGroupName The name of the Resource Group to which the identity belongs.
-   * @param resourceName The name of the identity resource.
-   * @param nextLink The nextLink from the previous successful call to the ListAssociatedResources
-   *                 method.
-   * @param options The options parameters.
-   */
-  private _listAssociatedResourcesNext(
-    resourceGroupName: string,
-    resourceName: string,
-    nextLink: string,
-    options?: UserAssignedIdentitiesListAssociatedResourcesNextOptionalParams
-  ): Promise<UserAssignedIdentitiesListAssociatedResourcesNextResponse> {
-    return this.client.sendOperationRequest(
-      { resourceGroupName, resourceName, nextLink, options },
-      listAssociatedResourcesNextOperationSpec
-    );
-  }
 }
 // Operation Specifications
 const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
@@ -426,35 +342,6 @@ const listByResourceGroupOperationSpec: coreClient.OperationSpec = {
   headerParameters: [Parameters.accept],
   serializer
 };
-const listAssociatedResourcesOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}/listAssociatedResources",
-  httpMethod: "POST",
-  responses: {
-    200: {
-      bodyMapper: Mappers.AssociatedResourcesListResult
-    },
-    default: {
-      bodyMapper: Mappers.CloudError
-    }
-  },
-  queryParameters: [
-    Parameters.apiVersion,
-    Parameters.filter,
-    Parameters.orderby,
-    Parameters.top,
-    Parameters.skip,
-    Parameters.skiptoken
-  ],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.resourceName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};
 const createOrUpdateOperationSpec: coreClient.OperationSpec = {
   path:
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{resourceName}",
@@ -560,7 +447,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,
@@ -580,7 +466,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.nextLink,
@@ -590,32 +475,3 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
   headerParameters: [Parameters.accept],
   serializer
 };
-const listAssociatedResourcesNextOperationSpec: coreClient.OperationSpec = {
-  path: "{nextLink}",
-  httpMethod: "GET",
-  responses: {
-    200: {
-      bodyMapper: Mappers.AssociatedResourcesListResult
-    },
-    default: {
-      bodyMapper: Mappers.CloudError
-    }
-  },
-  queryParameters: [
-    Parameters.apiVersion,
-    Parameters.filter,
-    Parameters.orderby,
-    Parameters.top,
-    Parameters.skip,
-    Parameters.skiptoken
-  ],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.nextLink,
-    Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.resourceName
-  ],
-  headerParameters: [Parameters.accept],
-  serializer
-};

package/src/operationsInterfaces/federatedIdentityCredentials.ts

@@ -0,0 +1,78 @@
+/*
+ * 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.
+ */
+
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import {
+  FederatedIdentityCredential,
+  FederatedIdentityCredentialsListOptionalParams,
+  FederatedIdentityCredentialsCreateOrUpdateOptionalParams,
+  FederatedIdentityCredentialsCreateOrUpdateResponse,
+  FederatedIdentityCredentialsGetOptionalParams,
+  FederatedIdentityCredentialsGetResponse,
+  FederatedIdentityCredentialsDeleteOptionalParams
+} from "../models";
+
+/// <reference lib="esnext.asynciterable" />
+/** Interface representing a FederatedIdentityCredentials. */
+export interface FederatedIdentityCredentials {
+  /**
+   * Lists all the federated identity credentials under the specified user assigned identity.
+   * @param resourceGroupName The name of the resource group. The name is case insensitive.
+   * @param resourceName The name of the identity resource.
+   * @param options The options parameters.
+   */
+  list(
+    resourceGroupName: string,
+    resourceName: string,
+    options?: FederatedIdentityCredentialsListOptionalParams
+  ): PagedAsyncIterableIterator<FederatedIdentityCredential>;
+  /**
+   * Create or update a federated identity credential under the specified user assigned identity.
+   * @param resourceGroupName The name of the resource group. The name is case insensitive.
+   * @param resourceName The name of the identity resource.
+   * @param federatedIdentityCredentialResourceName The name of the federated identity credential
+   *                                                resource.
+   * @param parameters Parameters to create or update the federated identity credential.
+   * @param options The options parameters.
+   */
+  createOrUpdate(
+    resourceGroupName: string,
+    resourceName: string,
+    federatedIdentityCredentialResourceName: string,
+    parameters: FederatedIdentityCredential,
+    options?: FederatedIdentityCredentialsCreateOrUpdateOptionalParams
+  ): Promise<FederatedIdentityCredentialsCreateOrUpdateResponse>;
+  /**
+   * Gets the federated identity credential.
+   * @param resourceGroupName The name of the resource group. The name is case insensitive.
+   * @param resourceName The name of the identity resource.
+   * @param federatedIdentityCredentialResourceName The name of the federated identity credential
+   *                                                resource.
+   * @param options The options parameters.
+   */
+  get(
+    resourceGroupName: string,
+    resourceName: string,
+    federatedIdentityCredentialResourceName: string,
+    options?: FederatedIdentityCredentialsGetOptionalParams
+  ): Promise<FederatedIdentityCredentialsGetResponse>;
+  /**
+   * Deletes the federated identity credential.
+   * @param resourceGroupName The name of the resource group. The name is case insensitive.
+   * @param resourceName The name of the identity resource.
+   * @param federatedIdentityCredentialResourceName The name of the federated identity credential
+   *                                                resource.
+   * @param options The options parameters.
+   */
+  delete(
+    resourceGroupName: string,
+    resourceName: string,
+    federatedIdentityCredentialResourceName: string,
+    options?: FederatedIdentityCredentialsDeleteOptionalParams
+  ): Promise<void>;
+}

package/src/operationsInterfaces/index.ts

@@ -9,3 +9,4 @@
 export * from "./systemAssignedIdentities";
 export * from "./operations";
 export * from "./userAssignedIdentities";
+export * from "./federatedIdentityCredentials";

package/src/operationsInterfaces/userAssignedIdentities.ts

@@ -11,8 +11,6 @@ import {
   Identity,
   UserAssignedIdentitiesListBySubscriptionOptionalParams,
   UserAssignedIdentitiesListByResourceGroupOptionalParams,
-  AzureResource,
-  UserAssignedIdentitiesListAssociatedResourcesOptionalParams,
   UserAssignedIdentitiesCreateOrUpdateOptionalParams,
   UserAssignedIdentitiesCreateOrUpdateResponse,
   IdentityUpdate,
@@ -42,17 +40,6 @@ export interface UserAssignedIdentities {
     resourceGroupName: string,
     options?: UserAssignedIdentitiesListByResourceGroupOptionalParams
   ): PagedAsyncIterableIterator<Identity>;
-  /**
-   * Lists the associated resources for this identity.
-   * @param resourceGroupName The name of the Resource Group to which the identity belongs.
-   * @param resourceName The name of the identity resource.
-   * @param options The options parameters.
-   */
-  listAssociatedResources(
-    resourceGroupName: string,
-    resourceName: string,
-    options?: UserAssignedIdentitiesListAssociatedResourcesOptionalParams
-  ): PagedAsyncIterableIterator<AzureResource>;
   /**
    * Create or update an identity in the specified subscription and resource group.
    * @param resourceGroupName The name of the Resource Group to which the identity belongs.

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