@azure/arm-appcontainers 2.0.0-beta.1 → 2.0.0-beta.3

package/src/operations/containerApps.ts

@@ -6,21 +6,26 @@
  * 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 { ContainerApps } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
 import { ContainerAppsAPIClient } from "../containerAppsAPIClient";
-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 {
   ContainerApp,
   ContainerAppsListBySubscriptionNextOptionalParams,
   ContainerAppsListBySubscriptionOptionalParams,
+  ContainerAppsListBySubscriptionResponse,
   ContainerAppsListByResourceGroupNextOptionalParams,
   ContainerAppsListByResourceGroupOptionalParams,
-  ContainerAppsListBySubscriptionResponse,
   ContainerAppsListByResourceGroupResponse,
   ContainerAppsGetOptionalParams,
   ContainerAppsGetResponse,
@@ -28,6 +33,7 @@ import {
   ContainerAppsCreateOrUpdateResponse,
   ContainerAppsDeleteOptionalParams,
   ContainerAppsUpdateOptionalParams,
+  ContainerAppsUpdateResponse,
   ContainerAppsListCustomHostNameAnalysisOptionalParams,
   ContainerAppsListCustomHostNameAnalysisResponse,
   ContainerAppsListSecretsOptionalParams,
@@ -66,22 +72,34 @@ export class ContainerAppsImpl implements ContainerApps {
       [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?: ContainerAppsListBySubscriptionOptionalParams
+    options?: ContainerAppsListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ContainerApp[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ContainerAppsListBySubscriptionResponse;
+    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;
     }
   }
 
@@ -110,19 +128,33 @@ export class ContainerAppsImpl implements ContainerApps {
       [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?: ContainerAppsListByResourceGroupOptionalParams
+    options?: ContainerAppsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ContainerApp[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ContainerAppsListByResourceGroupResponse;
+    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,
@@ -130,7 +162,9 @@ export class ContainerAppsImpl implements ContainerApps {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -204,8 +238,8 @@ export class ContainerAppsImpl implements ContainerApps {
     containerAppEnvelope: ContainerApp,
     options?: ContainerAppsCreateOrUpdateOptionalParams
   ): Promise<
-    PollerLike<
-      PollOperationState<ContainerAppsCreateOrUpdateResponse>,
+    SimplePollerLike<
+      OperationState<ContainerAppsCreateOrUpdateResponse>,
       ContainerAppsCreateOrUpdateResponse
     >
   > {
@@ -215,7 +249,7 @@ export class ContainerAppsImpl implements ContainerApps {
     ): Promise<ContainerAppsCreateOrUpdateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -248,14 +282,23 @@ export class ContainerAppsImpl implements ContainerApps {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, containerAppName, containerAppEnvelope, options },
-      createOrUpdateOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
+        resourceGroupName,
+        containerAppName,
+        containerAppEnvelope,
+        options
+      },
+      spec: createOrUpdateOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ContainerAppsCreateOrUpdateResponse,
+      OperationState<ContainerAppsCreateOrUpdateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
+      intervalInMs: options?.updateIntervalInMs,
+      resourceLocationConfig: "azure-async-operation"
     });
     await poller.poll();
     return poller;
@@ -293,14 +336,14 @@ export class ContainerAppsImpl implements ContainerApps {
     resourceGroupName: string,
     containerAppName: string,
     options?: ContainerAppsDeleteOptionalParams
-  ): 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
     ) => {
@@ -333,14 +376,15 @@ export class ContainerAppsImpl implements ContainerApps {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, containerAppName, options },
-      deleteOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: { resourceGroupName, containerAppName, options },
+      spec: deleteOperationSpec
+    });
+    const poller = await createHttpPoller<void, OperationState<void>>(lro, {
+      restoreFrom: options?.resumeFrom,
+      intervalInMs: options?.updateIntervalInMs,
+      resourceLocationConfig: "location"
     });
     await poller.poll();
     return poller;
@@ -377,14 +421,19 @@ export class ContainerAppsImpl implements ContainerApps {
     containerAppName: string,
     containerAppEnvelope: ContainerApp,
     options?: ContainerAppsUpdateOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
+  ): Promise<
+    SimplePollerLike<
+      OperationState<ContainerAppsUpdateResponse>,
+      ContainerAppsUpdateResponse
+    >
+  > {
     const directSendOperation = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
-    ): Promise<void> => {
+    ): Promise<ContainerAppsUpdateResponse> => {
       return this.client.sendOperationRequest(args, spec);
     };
-    const sendOperation = async (
+    const sendOperationFn = async (
       args: coreClient.OperationArguments,
       spec: coreClient.OperationSpec
     ) => {
@@ -417,13 +466,21 @@ export class ContainerAppsImpl implements ContainerApps {
       };
     };
 
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, containerAppName, containerAppEnvelope, options },
-      updateOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
+    const lro = createLroSpec({
+      sendOperationFn,
+      args: {
+        resourceGroupName,
+        containerAppName,
+        containerAppEnvelope,
+        options
+      },
+      spec: updateOperationSpec
+    });
+    const poller = await createHttpPoller<
+      ContainerAppsUpdateResponse,
+      OperationState<ContainerAppsUpdateResponse>
+    >(lro, {
+      restoreFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
     await poller.poll();
@@ -442,7 +499,7 @@ export class ContainerAppsImpl implements ContainerApps {
     containerAppName: string,
     containerAppEnvelope: ContainerApp,
     options?: ContainerAppsUpdateOptionalParams
-  ): Promise<void> {
+  ): Promise<ContainerAppsUpdateResponse> {
     const poller = await this.beginUpdate(
       resourceGroupName,
       containerAppName,
@@ -661,10 +718,18 @@ const updateOperationSpec: coreClient.OperationSpec = {
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.App/containerApps/{containerAppName}",
   httpMethod: "PATCH",
   responses: {
-    200: {},
-    201: {},
-    202: {},
-    204: {},
+    200: {
+      bodyMapper: Mappers.ContainerApp
+    },
+    201: {
+      bodyMapper: Mappers.ContainerApp
+    },
+    202: {
+      bodyMapper: Mappers.ContainerApp
+    },
+    204: {
+      bodyMapper: Mappers.ContainerApp
+    },
     default: {
       bodyMapper: Mappers.DefaultErrorResponse
     }
@@ -761,7 +826,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.DefaultErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -781,7 +845,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.DefaultErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/containerAppsAuthConfigs.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 { ContainerAppsAuthConfigs } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -61,11 +62,15 @@ export class ContainerAppsAuthConfigsImpl implements ContainerAppsAuthConfigs {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByContainerAppPagingPage(
           resourceGroupName,
           containerAppName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -74,15 +79,22 @@ export class ContainerAppsAuthConfigsImpl implements ContainerAppsAuthConfigs {
   private async *listByContainerAppPagingPage(
     resourceGroupName: string,
     containerAppName: string,
-    options?: ContainerAppsAuthConfigsListByContainerAppOptionalParams
+    options?: ContainerAppsAuthConfigsListByContainerAppOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<AuthConfig[]> {
-    let result = await this._listByContainerApp(
-      resourceGroupName,
-      containerAppName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ContainerAppsAuthConfigsListByContainerAppResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByContainerApp(
+        resourceGroupName,
+        containerAppName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByContainerAppNext(
         resourceGroupName,
@@ -91,7 +103,9 @@ export class ContainerAppsAuthConfigsImpl implements ContainerAppsAuthConfigs {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -316,7 +330,6 @@ const listByContainerAppNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.DefaultErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/containerAppsDiagnostics.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 { ContainerAppsDiagnostics } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,13 +17,13 @@ import {
   Diagnostics,
   ContainerAppsDiagnosticsListDetectorsNextOptionalParams,
   ContainerAppsDiagnosticsListDetectorsOptionalParams,
+  ContainerAppsDiagnosticsListDetectorsResponse,
   Revision,
   ContainerAppsDiagnosticsListRevisionsNextOptionalParams,
   ContainerAppsDiagnosticsListRevisionsOptionalParams,
-  ContainerAppsDiagnosticsListDetectorsResponse,
+  ContainerAppsDiagnosticsListRevisionsResponse,
   ContainerAppsDiagnosticsGetDetectorOptionalParams,
   ContainerAppsDiagnosticsGetDetectorResponse,
-  ContainerAppsDiagnosticsListRevisionsResponse,
   ContainerAppsDiagnosticsGetRevisionOptionalParams,
   ContainerAppsDiagnosticsGetRevisionResponse,
   ContainerAppsDiagnosticsGetRootOptionalParams,
@@ -67,11 +68,15 @@ export class ContainerAppsDiagnosticsImpl implements ContainerAppsDiagnostics {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listDetectorsPagingPage(
           resourceGroupName,
           containerAppName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -80,15 +85,22 @@ export class ContainerAppsDiagnosticsImpl implements ContainerAppsDiagnostics {
   private async *listDetectorsPagingPage(
     resourceGroupName: string,
     containerAppName: string,
-    options?: ContainerAppsDiagnosticsListDetectorsOptionalParams
+    options?: ContainerAppsDiagnosticsListDetectorsOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Diagnostics[]> {
-    let result = await this._listDetectors(
-      resourceGroupName,
-      containerAppName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ContainerAppsDiagnosticsListDetectorsResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listDetectors(
+        resourceGroupName,
+        containerAppName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listDetectorsNext(
         resourceGroupName,
@@ -97,7 +109,9 @@ export class ContainerAppsDiagnosticsImpl implements ContainerAppsDiagnostics {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -138,11 +152,15 @@ export class ContainerAppsDiagnosticsImpl implements ContainerAppsDiagnostics {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listRevisionsPagingPage(
           resourceGroupName,
           containerAppName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -151,15 +169,22 @@ export class ContainerAppsDiagnosticsImpl implements ContainerAppsDiagnostics {
   private async *listRevisionsPagingPage(
     resourceGroupName: string,
     containerAppName: string,
-    options?: ContainerAppsDiagnosticsListRevisionsOptionalParams
+    options?: ContainerAppsDiagnosticsListRevisionsOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Revision[]> {
-    let result = await this._listRevisions(
-      resourceGroupName,
-      containerAppName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ContainerAppsDiagnosticsListRevisionsResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listRevisions(
+        resourceGroupName,
+        containerAppName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listRevisionsNext(
         resourceGroupName,
@@ -168,7 +193,9 @@ export class ContainerAppsDiagnosticsImpl implements ContainerAppsDiagnostics {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -442,7 +469,6 @@ const listDetectorsNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.DefaultErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -464,7 +490,6 @@ const listRevisionsNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.DefaultErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.filter],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/containerAppsRevisions.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 { ContainerAppsRevisions } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -61,11 +62,15 @@ export class ContainerAppsRevisionsImpl implements ContainerAppsRevisions {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listRevisionsPagingPage(
           resourceGroupName,
           containerAppName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -74,15 +79,22 @@ export class ContainerAppsRevisionsImpl implements ContainerAppsRevisions {
   private async *listRevisionsPagingPage(
     resourceGroupName: string,
     containerAppName: string,
-    options?: ContainerAppsRevisionsListRevisionsOptionalParams
+    options?: ContainerAppsRevisionsListRevisionsOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<Revision[]> {
-    let result = await this._listRevisions(
-      resourceGroupName,
-      containerAppName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ContainerAppsRevisionsListRevisionsResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listRevisions(
+        resourceGroupName,
+        containerAppName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listRevisionsNext(
         resourceGroupName,
@@ -91,7 +103,9 @@ export class ContainerAppsRevisionsImpl implements ContainerAppsRevisions {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -343,7 +357,6 @@ const listRevisionsNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.DefaultErrorResponse
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.filter],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,