@azure/arm-operations 4.0.0-beta.2 → 4.0.0-beta.4

package/src/operations/solutions.ts

@@ -103,10 +103,12 @@ export class SolutionsImpl implements Solutions {
       { resourceGroupName, solutionName, parameters, options },
       createOrUpdateOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**
@@ -193,10 +195,12 @@ export class SolutionsImpl implements Solutions {
       { resourceGroupName, solutionName, parameters, options },
       updateOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**
@@ -276,10 +280,12 @@ export class SolutionsImpl implements Solutions {
       { resourceGroupName, solutionName, options },
       deleteOperationSpec
     );
-    return new LroEngine(lro, {
+    const poller = new LroEngine(lro, {
       resumeFrom: options?.resumeFrom,
       intervalInMs: options?.updateIntervalInMs
     });
+    await poller.poll();
+    return poller;
   }
 
   /**

package/src/operationsInterfaces/managementAssociations.ts

@@ -29,12 +29,18 @@ export interface ManagementAssociations {
   /**
    * Creates or updates the ManagementAssociation.
    * @param resourceGroupName The name of the resource group to get. The name is case insensitive.
+   * @param providerName Provider name for the parent resource.
+   * @param resourceType Resource type for the parent resource
+   * @param resourceName Parent resource name.
    * @param managementAssociationName User ManagementAssociation Name.
    * @param parameters The parameters required to create ManagementAssociation extension.
    * @param options The options parameters.
    */
   createOrUpdate(
     resourceGroupName: string,
+    providerName: string,
+    resourceType: string,
+    resourceName: string,
     managementAssociationName: string,
     parameters: ManagementAssociation,
     options?: ManagementAssociationsCreateOrUpdateOptionalParams
@@ -42,22 +48,34 @@ export interface ManagementAssociations {
   /**
    * Deletes the ManagementAssociation in the subscription.
    * @param resourceGroupName The name of the resource group to get. The name is case insensitive.
+   * @param providerName Provider name for the parent resource.
+   * @param resourceType Resource type for the parent resource
+   * @param resourceName Parent resource name.
    * @param managementAssociationName User ManagementAssociation Name.
    * @param options The options parameters.
    */
   delete(
     resourceGroupName: string,
+    providerName: string,
+    resourceType: string,
+    resourceName: string,
     managementAssociationName: string,
     options?: ManagementAssociationsDeleteOptionalParams
   ): Promise<void>;
   /**
    * Retrieves the user ManagementAssociation.
    * @param resourceGroupName The name of the resource group to get. The name is case insensitive.
+   * @param providerName Provider name for the parent resource.
+   * @param resourceType Resource type for the parent resource
+   * @param resourceName Parent resource name.
    * @param managementAssociationName User ManagementAssociation Name.
    * @param options The options parameters.
    */
   get(
     resourceGroupName: string,
+    providerName: string,
+    resourceType: string,
+    resourceName: string,
     managementAssociationName: string,
     options?: ManagementAssociationsGetOptionalParams
   ): Promise<ManagementAssociationsGetResponse>;

package/src/operationsManagementClient.ts

@@ -7,6 +7,12 @@
  */
 
 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 {
   SolutionsImpl,
@@ -26,26 +32,17 @@ export class OperationsManagementClient extends coreClient.ServiceClient {
   $host: string;
   subscriptionId: string;
   apiVersion: string;
-  providerName: string;
-  resourceType: string;
-  resourceName: string;
 
   /**
    * Initializes a new instance of the OperationsManagementClient class.
    * @param credentials Subscription credentials which uniquely identify client subscription.
    * @param subscriptionId Gets subscription credentials which uniquely identify Microsoft Azure
    *                       subscription. The subscription ID forms part of the URI for every service call.
-   * @param providerName Provider name for the parent resource.
-   * @param resourceType Resource type for the parent resource
-   * @param resourceName Parent resource name.
    * @param options The parameter options
    */
   constructor(
     credentials: coreAuth.TokenCredential,
     subscriptionId: string,
-    providerName: string,
-    resourceType: string,
-    resourceName: string,
     options?: OperationsManagementClientOptionalParams
   ) {
     if (credentials === undefined) {
@@ -54,15 +51,6 @@ export class OperationsManagementClient extends coreClient.ServiceClient {
     if (subscriptionId === undefined) {
       throw new Error("'subscriptionId' cannot be null");
     }
-    if (providerName === undefined) {
-      throw new Error("'providerName' cannot be null");
-    }
-    if (resourceType === undefined) {
-      throw new Error("'resourceType' cannot be null");
-    }
-    if (resourceName === undefined) {
-      throw new Error("'resourceName' cannot be null");
-    }
 
     // Initializing default values for options
     if (!options) {
@@ -73,29 +61,56 @@ export class OperationsManagementClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-operations/4.0.0-beta.2`;
+    const packageDetails = `azsdk-js-arm-operations/4.0.0-beta.4`;
     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: options.endpoint || "https://management.azure.com"
+      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();
+      bearerTokenAuthenticationPolicyFound = pipelinePolicies.some(
+        (pipelinePolicy) =>
+          pipelinePolicy.name ===
+          coreRestPipeline.bearerTokenAuthenticationPolicyName
+      );
+    }
+    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;
-    this.providerName = providerName;
-    this.resourceType = resourceType;
-    this.resourceName = resourceName;
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
@@ -104,6 +119,35 @@ export class OperationsManagementClient extends coreClient.ServiceClient {
     this.managementAssociations = new ManagementAssociationsImpl(this);
     this.managementConfigurations = new ManagementConfigurationsImpl(this);
     this.operations = new OperationsImpl(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);
   }
 
   solutions: Solutions;

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-operations": [
+        "./src/index"
+      ]
+    }
   },
-  "include": ["./src/**/*.ts", "./test/**/*.ts"],
-  "exclude": ["node_modules"]
-}
+  "include": [
+    "./src/**/*.ts",
+    "./test/**/*.ts",
+    "samples-dev/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}

package/types/arm-operations.d.ts

@@ -26,6 +26,15 @@ export declare interface CodeMessageErrorError {
     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;
+
 /** The container for solution. */
 export declare interface ManagementAssociation {
     /**
@@ -71,25 +80,34 @@ export declare interface ManagementAssociations {
     /**
      * Creates or updates the ManagementAssociation.
      * @param resourceGroupName The name of the resource group to get. The name is case insensitive.
+     * @param providerName Provider name for the parent resource.
+     * @param resourceType Resource type for the parent resource
+     * @param resourceName Parent resource name.
      * @param managementAssociationName User ManagementAssociation Name.
      * @param parameters The parameters required to create ManagementAssociation extension.
      * @param options The options parameters.
      */
-    createOrUpdate(resourceGroupName: string, managementAssociationName: string, parameters: ManagementAssociation, options?: ManagementAssociationsCreateOrUpdateOptionalParams): Promise<ManagementAssociationsCreateOrUpdateResponse>;
+    createOrUpdate(resourceGroupName: string, providerName: string, resourceType: string, resourceName: string, managementAssociationName: string, parameters: ManagementAssociation, options?: ManagementAssociationsCreateOrUpdateOptionalParams): Promise<ManagementAssociationsCreateOrUpdateResponse>;
     /**
      * Deletes the ManagementAssociation in the subscription.
      * @param resourceGroupName The name of the resource group to get. The name is case insensitive.
+     * @param providerName Provider name for the parent resource.
+     * @param resourceType Resource type for the parent resource
+     * @param resourceName Parent resource name.
      * @param managementAssociationName User ManagementAssociation Name.
      * @param options The options parameters.
      */
-    delete(resourceGroupName: string, managementAssociationName: string, options?: ManagementAssociationsDeleteOptionalParams): Promise<void>;
+    delete(resourceGroupName: string, providerName: string, resourceType: string, resourceName: string, managementAssociationName: string, options?: ManagementAssociationsDeleteOptionalParams): Promise<void>;
     /**
      * Retrieves the user ManagementAssociation.
      * @param resourceGroupName The name of the resource group to get. The name is case insensitive.
+     * @param providerName Provider name for the parent resource.
+     * @param resourceType Resource type for the parent resource
+     * @param resourceName Parent resource name.
      * @param managementAssociationName User ManagementAssociation Name.
      * @param options The options parameters.
      */
-    get(resourceGroupName: string, managementAssociationName: string, options?: ManagementAssociationsGetOptionalParams): Promise<ManagementAssociationsGetResponse>;
+    get(resourceGroupName: string, providerName: string, resourceType: string, resourceName: string, managementAssociationName: string, options?: ManagementAssociationsGetOptionalParams): Promise<ManagementAssociationsGetResponse>;
 }
 
 /** Optional parameters. */
@@ -263,20 +281,16 @@ export declare class OperationsManagementClient extends coreClient.ServiceClient
     $host: string;
     subscriptionId: string;
     apiVersion: string;
-    providerName: string;
-    resourceType: string;
-    resourceName: string;
     /**
      * Initializes a new instance of the OperationsManagementClient class.
      * @param credentials Subscription credentials which uniquely identify client subscription.
      * @param subscriptionId Gets subscription credentials which uniquely identify Microsoft Azure
      *                       subscription. The subscription ID forms part of the URI for every service call.
-     * @param providerName Provider name for the parent resource.
-     * @param resourceType Resource type for the parent resource
-     * @param resourceName Parent resource name.
      * @param options The parameter options
      */
-    constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, providerName: string, resourceType: string, resourceName: string, options?: OperationsManagementClientOptionalParams);
+    constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: OperationsManagementClientOptionalParams);
+    /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+    private addCustomApiVersionPolicy;
     solutions: Solutions;
     managementAssociations: ManagementAssociations;
     managementConfigurations: ManagementConfigurations;

package/types/tsdoc-metadata.json

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