@azure/arm-timeseriesinsights 2.1.0-beta.1 → 2.1.0-beta.2

package/src/models/mappers.ts

@@ -1532,9 +1532,9 @@ export const Gen1EnvironmentCreateOrUpdateParameters: coreClient.CompositeMapper
   type: {
     name: "Composite",
     className: "Gen1EnvironmentCreateOrUpdateParameters",
-    uberParent: "CreateOrUpdateTrackedResourceProperties",
+    uberParent: "EnvironmentCreateOrUpdateParameters",
     polymorphicDiscriminator:
-      CreateOrUpdateTrackedResourceProperties.type.polymorphicDiscriminator,
+      EnvironmentCreateOrUpdateParameters.type.polymorphicDiscriminator,
     modelProperties: {
       ...EnvironmentCreateOrUpdateParameters.type.modelProperties,
       dataRetentionTime: {
@@ -1571,9 +1571,9 @@ export const Gen2EnvironmentCreateOrUpdateParameters: coreClient.CompositeMapper
   type: {
     name: "Composite",
     className: "Gen2EnvironmentCreateOrUpdateParameters",
-    uberParent: "CreateOrUpdateTrackedResourceProperties",
+    uberParent: "EnvironmentCreateOrUpdateParameters",
     polymorphicDiscriminator:
-      CreateOrUpdateTrackedResourceProperties.type.polymorphicDiscriminator,
+      EnvironmentCreateOrUpdateParameters.type.polymorphicDiscriminator,
     modelProperties: {
       ...EnvironmentCreateOrUpdateParameters.type.modelProperties,
       timeSeriesIdProperties: {
@@ -1631,9 +1631,9 @@ export const EventHubEventSourceCreateOrUpdateParameters: coreClient.CompositeMa
   type: {
     name: "Composite",
     className: "EventHubEventSourceCreateOrUpdateParameters",
-    uberParent: "CreateOrUpdateTrackedResourceProperties",
+    uberParent: "EventSourceCreateOrUpdateParameters",
     polymorphicDiscriminator:
-      CreateOrUpdateTrackedResourceProperties.type.polymorphicDiscriminator,
+      EventSourceCreateOrUpdateParameters.type.polymorphicDiscriminator,
     modelProperties: {
       ...EventSourceCreateOrUpdateParameters.type.modelProperties,
       provisioningState: {
@@ -1726,9 +1726,9 @@ export const IoTHubEventSourceCreateOrUpdateParameters: coreClient.CompositeMapp
   type: {
     name: "Composite",
     className: "IoTHubEventSourceCreateOrUpdateParameters",
-    uberParent: "CreateOrUpdateTrackedResourceProperties",
+    uberParent: "EventSourceCreateOrUpdateParameters",
     polymorphicDiscriminator:
-      CreateOrUpdateTrackedResourceProperties.type.polymorphicDiscriminator,
+      EventSourceCreateOrUpdateParameters.type.polymorphicDiscriminator,
     modelProperties: {
       ...EventSourceCreateOrUpdateParameters.type.modelProperties,
       provisioningState: {
@@ -1814,7 +1814,7 @@ export const EnvironmentResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "EnvironmentResource",
-    uberParent: "Resource",
+    uberParent: "TrackedResource",
     polymorphicDiscriminator: {
       serializedName: "kind",
       clientName: "kind"
@@ -1844,7 +1844,7 @@ export const EventSourceResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "EventSourceResource",
-    uberParent: "Resource",
+    uberParent: "TrackedResource",
     polymorphicDiscriminator: {
       serializedName: "kind",
       clientName: "kind"
@@ -1982,8 +1982,8 @@ export const Gen1EnvironmentResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "Gen1EnvironmentResource",
-    uberParent: "Resource",
-    polymorphicDiscriminator: Resource.type.polymorphicDiscriminator,
+    uberParent: "EnvironmentResource",
+    polymorphicDiscriminator: EnvironmentResource.type.polymorphicDiscriminator,
     modelProperties: {
       ...EnvironmentResource.type.modelProperties,
       dataRetentionTime: {
@@ -2055,8 +2055,8 @@ export const Gen2EnvironmentResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "Gen2EnvironmentResource",
-    uberParent: "Resource",
-    polymorphicDiscriminator: Resource.type.polymorphicDiscriminator,
+    uberParent: "EnvironmentResource",
+    polymorphicDiscriminator: EnvironmentResource.type.polymorphicDiscriminator,
     modelProperties: {
       ...EnvironmentResource.type.modelProperties,
       provisioningState: {
@@ -2149,8 +2149,8 @@ export const EventHubEventSourceResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "EventHubEventSourceResource",
-    uberParent: "Resource",
-    polymorphicDiscriminator: Resource.type.polymorphicDiscriminator,
+    uberParent: "EventSourceResource",
+    polymorphicDiscriminator: EventSourceResource.type.polymorphicDiscriminator,
     modelProperties: {
       ...EventSourceResource.type.modelProperties,
       provisioningState: {
@@ -2236,8 +2236,8 @@ export const IoTHubEventSourceResource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "IoTHubEventSourceResource",
-    uberParent: "Resource",
-    polymorphicDiscriminator: Resource.type.polymorphicDiscriminator,
+    uberParent: "EventSourceResource",
+    polymorphicDiscriminator: EventSourceResource.type.polymorphicDiscriminator,
     modelProperties: {
       ...EventSourceResource.type.modelProperties,
       provisioningState: {
@@ -2443,14 +2443,14 @@ export let discriminators = {
   "EnvironmentUpdateParameters.Gen2": Gen2EnvironmentUpdateParameters,
   "EventSourceUpdateParameters.Microsoft.EventHub": EventHubEventSourceUpdateParameters,
   "EventSourceUpdateParameters.Microsoft.IoTHub": IoTHubEventSourceUpdateParameters,
-  "CreateOrUpdateTrackedResourceProperties.Gen1": Gen1EnvironmentCreateOrUpdateParameters,
-  "CreateOrUpdateTrackedResourceProperties.Gen2": Gen2EnvironmentCreateOrUpdateParameters,
-  "CreateOrUpdateTrackedResourceProperties.Microsoft.EventHub": EventHubEventSourceCreateOrUpdateParameters,
-  "CreateOrUpdateTrackedResourceProperties.Microsoft.IoTHub": IoTHubEventSourceCreateOrUpdateParameters,
-  "Resource.EnvironmentResource": EnvironmentResource,
-  "Resource.EventSourceResource": EventSourceResource,
-  "Resource.Gen1": Gen1EnvironmentResource,
-  "Resource.Gen2": Gen2EnvironmentResource,
-  "Resource.Microsoft.EventHub": EventHubEventSourceResource,
-  "Resource.Microsoft.IoTHub": IoTHubEventSourceResource
+  "EnvironmentCreateOrUpdateParameters.Gen1": Gen1EnvironmentCreateOrUpdateParameters,
+  "EnvironmentCreateOrUpdateParameters.Gen2": Gen2EnvironmentCreateOrUpdateParameters,
+  "EventSourceCreateOrUpdateParameters.Microsoft.EventHub": EventHubEventSourceCreateOrUpdateParameters,
+  "EventSourceCreateOrUpdateParameters.Microsoft.IoTHub": IoTHubEventSourceCreateOrUpdateParameters,
+  "TrackedResource.EnvironmentResource": EnvironmentResource,
+  "TrackedResource.EventSourceResource": EventSourceResource,
+  "EnvironmentResource.Gen1": Gen1EnvironmentResource,
+  "EnvironmentResource.Gen2": Gen2EnvironmentResource,
+  "EventSourceResource.Microsoft.EventHub": EventHubEventSourceResource,
+  "EventSourceResource.Microsoft.IoTHub": IoTHubEventSourceResource
 };

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/privateLinkResources.ts

@@ -6,7 +6,7 @@
  * 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 { PrivateLinkResources } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -55,11 +55,15 @@ export class PrivateLinkResourcesImpl implements PrivateLinkResources {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listSupportedPagingPage(
           resourceGroupName,
           environmentName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -68,9 +72,11 @@ export class PrivateLinkResourcesImpl implements PrivateLinkResources {
   private async *listSupportedPagingPage(
     resourceGroupName: string,
     environmentName: string,
-    options?: PrivateLinkResourcesListSupportedOptionalParams
+    options?: PrivateLinkResourcesListSupportedOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<PrivateLinkResource[]> {
-    let result = await this._listSupported(
+    let result: PrivateLinkResourcesListSupportedResponse;
+    result = await this._listSupported(
       resourceGroupName,
       environmentName,
       options

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/src/timeSeriesInsightsClient.ts

@@ -8,6 +8,11 @@
 
 import * as coreClient from "@azure/core-client";
 import * as coreRestPipeline from "@azure/core-rest-pipeline";
+import {
+  PipelineRequest,
+  PipelineResponse,
+  SendRequest
+} from "@azure/core-rest-pipeline";
 import * as coreAuth from "@azure/core-auth";
 import {
   OperationsImpl,
@@ -61,47 +66,53 @@ export class TimeSeriesInsightsClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-timeseriesinsights/2.1.0-beta.1`;
+    const packageDetails = `azsdk-js-arm-timeseriesinsights/2.1.0-beta.2`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
         : `${packageDetails}`;
 
-    if (!options.credentialScopes) {
-      options.credentialScopes = ["https://management.azure.com/.default"];
-    }
     const optionsWithDefaults = {
       ...defaults,
       ...options,
       userAgentOptions: {
         userAgentPrefix
       },
-      baseUri:
+      endpoint:
         options.endpoint ?? options.baseUri ?? "https://management.azure.com"
     };
     super(optionsWithDefaults);
 
+    let bearerTokenAuthenticationPolicyFound: boolean = false;
     if (options?.pipeline && options.pipeline.getOrderedPolicies().length > 0) {
       const pipelinePolicies: coreRestPipeline.PipelinePolicy[] = options.pipeline.getOrderedPolicies();
-      const bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
+      bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
         (pipelinePolicy) =>
           pipelinePolicy.name ===
           coreRestPipeline.bearerTokenAuthenticationPolicyName
       );
-      if (!bearerTokenAuthenticationPolicyFound) {
-        this.pipeline.removePolicy({
-          name: coreRestPipeline.bearerTokenAuthenticationPolicyName
-        });
-        this.pipeline.addPolicy(
-          coreRestPipeline.bearerTokenAuthenticationPolicy({
-            scopes: `${optionsWithDefaults.baseUri}/.default`,
-            challengeCallbacks: {
-              authorizeRequestOnChallenge:
-                coreClient.authorizeRequestOnClaimChallenge
-            }
-          })
-        );
-      }
+    }
+    if (
+      !options ||
+      !options.pipeline ||
+      options.pipeline.getOrderedPolicies().length == 0 ||
+      !bearerTokenAuthenticationPolicyFound
+    ) {
+      this.pipeline.removePolicy({
+        name: coreRestPipeline.bearerTokenAuthenticationPolicyName
+      });
+      this.pipeline.addPolicy(
+        coreRestPipeline.bearerTokenAuthenticationPolicy({
+          credential: credentials,
+          scopes:
+            optionsWithDefaults.credentialScopes ??
+            `${optionsWithDefaults.endpoint}/.default`,
+          challengeCallbacks: {
+            authorizeRequestOnChallenge:
+              coreClient.authorizeRequestOnClaimChallenge
+          }
+        })
+      );
     }
     // Parameter assignments
     this.subscriptionId = subscriptionId;
@@ -116,6 +127,35 @@ export class TimeSeriesInsightsClient extends coreClient.ServiceClient {
     this.accessPolicies = new AccessPoliciesImpl(this);
     this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this);
     this.privateLinkResources = new PrivateLinkResourcesImpl(this);
+    this.addCustomApiVersionPolicy(options.apiVersion);
+  }
+
+  /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+  private addCustomApiVersionPolicy(apiVersion?: string) {
+    if (!apiVersion) {
+      return;
+    }
+    const apiVersionPolicy = {
+      name: "CustomApiVersionPolicy",
+      async sendRequest(
+        request: PipelineRequest,
+        next: SendRequest
+      ): Promise<PipelineResponse> {
+        const param = request.url.split("?");
+        if (param.length > 1) {
+          const newParams = param[1].split("&").map((item) => {
+            if (item.indexOf("api-version") > -1) {
+              return "api-version=" + apiVersion;
+            } else {
+              return item;
+            }
+          });
+          request.url = param[0] + "?" + newParams.join("&");
+        }
+        return next(request);
+      }
+    };
+    this.pipeline.addPolicy(apiVersionPolicy);
   }
 
   operations: Operations;