@azure/arm-hanaonazure 4.0.0-beta.1 → 4.0.0-beta.3

package/src/operations/providerInstances.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 { ProviderInstances } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -60,8 +61,16 @@ export class ProviderInstancesImpl implements ProviderInstances {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, sapMonitorName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(
+          resourceGroupName,
+          sapMonitorName,
+          options,
+          settings
+        );
       }
     };
   }
@@ -69,11 +78,18 @@ export class ProviderInstancesImpl implements ProviderInstances {
   private async *listPagingPage(
     resourceGroupName: string,
     sapMonitorName: string,
-    options?: ProviderInstancesListOptionalParams
+    options?: ProviderInstancesListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<ProviderInstance[]> {
-    let result = await this._list(resourceGroupName, sapMonitorName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: ProviderInstancesListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceGroupName, sapMonitorName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         resourceGroupName,
@@ -82,7 +98,9 @@ export class ProviderInstancesImpl implements ProviderInstances {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -209,10 +227,12 @@ export class ProviderInstancesImpl implements ProviderInstances {
       },
       createOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**
@@ -299,10 +319,12 @@ export class ProviderInstancesImpl implements ProviderInstances {
       { resourceGroupName, sapMonitorName, providerInstanceName, options },
       deleteOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**

package/src/operations/sapMonitors.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 { SapMonitors } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -59,22 +60,34 @@ export class SapMonitorsImpl implements SapMonitors {
       [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?: SapMonitorsListOptionalParams
+    options?: SapMonitorsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<SapMonitor[]> {
-    let result = await this._list(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: SapMonitorsListResponse;
+    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;
     }
   }
 
@@ -176,10 +189,12 @@ export class SapMonitorsImpl implements SapMonitors {
       { resourceGroupName, sapMonitorName, sapMonitorParameter, options },
       createOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**
@@ -259,10 +274,12 @@ export class SapMonitorsImpl implements SapMonitors {
       { resourceGroupName, sapMonitorName, options },
       deleteOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**

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 a result page from a pageable operation, returns a
+ * continuation token that can be used to begin paging from
+ * that point later.
+ * @param page A result object from calling .byPage() on a paged operation.
+ * @returns The continuation token that can be passed into byPage().
+ */
+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/tsconfig.json

@@ -9,11 +9,25 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
-    "lib": ["es6", "dom"],
+    "lib": [
+      "es6",
+      "dom"
+    ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true
+    "importHelpers": true,
+    "paths": {
+      "@azure/arm-hanaonazure": [
+        "./src/index"
+      ]
+    }
   },
-  "include": ["./src/**/*.ts", "./test/**/*.ts"],
-  "exclude": ["node_modules"]
-}
+  "include": [
+    "./src/**/*.ts",
+    "./test/**/*.ts",
+    "samples-dev/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}

package/types/arm-hanaonazure.d.ts

@@ -53,6 +53,15 @@ export declare interface ErrorResponseError {
     readonly message?: string;
 }
 
+/**
+ * Given a result page from a pageable operation, returns a
+ * continuation token that can be used to begin paging from
+ * that point later.
+ * @param page A result object from calling .byPage() on a paged operation.
+ * @returns The continuation token that can be passed into byPage().
+ */
+export declare function getContinuationToken(page: unknown): string | undefined;
+
 export declare class HanaManagementClient extends coreClient.ServiceClient {
     $host: string;
     apiVersion: string;
@@ -65,6 +74,8 @@ export declare class HanaManagementClient extends coreClient.ServiceClient {
      * @param options The parameter options
      */
     constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: HanaManagementClientOptionalParams);
+    /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+    private addCustomApiVersionPolicy;
     operations: Operations;
     sapMonitors: SapMonitors;
     providerInstances: ProviderInstances;
@@ -97,12 +108,19 @@ export declare type HanaProvisioningStatesEnum = string;
 
 /** Known values of {@link HanaProvisioningStatesEnum} that the service accepts. */
 export declare enum KnownHanaProvisioningStatesEnum {
+    /** Accepted */
     Accepted = "Accepted",
+    /** Creating */
     Creating = "Creating",
+    /** Updating */
     Updating = "Updating",
+    /** Failed */
     Failed = "Failed",
+    /** Succeeded */
     Succeeded = "Succeeded",
+    /** Deleting */
     Deleting = "Deleting",
+    /** Migrating */
     Migrating = "Migrating"
 }
 
@@ -140,7 +158,7 @@ export declare interface OperationsListOptionalParams extends coreClient.Operati
 export declare type OperationsListResponse = OperationList;
 
 /** A provider instance associated with a SAP monitor. */
-export declare type ProviderInstance = ProxyResource & {
+export declare interface ProviderInstance extends ProxyResource {
     /** The type of provider instance. */
     typePropertiesType?: string;
     /** A JSON string containing the properties of the provider instance. */
@@ -152,7 +170,7 @@ export declare type ProviderInstance = ProxyResource & {
      * NOTE: This property will not be serialized. It can only be populated by the server.
      */
     readonly provisioningState?: HanaProvisioningStatesEnum;
-};
+}
 
 /** The response from the List provider instances operation. */
 export declare interface ProviderInstanceListResult {
@@ -262,7 +280,8 @@ export declare interface ProviderInstancesListOptionalParams extends coreClient.
 export declare type ProviderInstancesListResponse = ProviderInstanceListResult;
 
 /** The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location */
-export declare type ProxyResource = Resource & {};
+export declare interface ProxyResource extends Resource {
+}
 
 /** Common fields that are returned in the response for all Azure Resource Manager resources */
 export declare interface Resource {
@@ -284,7 +303,7 @@ export declare interface Resource {
 }
 
 /** SAP monitor info on Azure (ARM properties and SAP monitor properties) */
-export declare type SapMonitor = TrackedResource & {
+export declare interface SapMonitor extends TrackedResource {
     /**
      * State of provisioning of the HanaInstance
      * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -310,7 +329,7 @@ export declare type SapMonitor = TrackedResource & {
     readonly sapMonitorCollectorVersion?: string;
     /** The subnet which the SAP monitor will be deployed in */
     monitorSubnet?: string;
-};
+}
 
 /** The response from the List SAP monitors operation. */
 export declare interface SapMonitorListResult {
@@ -432,13 +451,13 @@ export declare interface Tags {
 }
 
 /** The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location' */
-export declare type TrackedResource = Resource & {
+export declare interface TrackedResource extends Resource {
     /** Resource tags. */
     tags?: {
         [propertyName: string]: string;
     };
     /** The geo-location where the resource lives */
     location: string;
-};
+}
 
 export { }

package/types/tsdoc-metadata.json

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

package/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.