@azure/arm-sqlvirtualmachine 5.0.0-beta.5 → 5.0.0-beta.6

package/src/operations/sqlVirtualMachines.ts

@@ -24,6 +24,7 @@ import {
   SqlVirtualMachinesListByResourceGroupOptionalParams,
   SqlVirtualMachinesListBySqlVmGroupResponse,
   SqlVirtualMachinesListResponse,
+  SqlVirtualMachinesStartAssessmentOptionalParams,
   SqlVirtualMachinesRedeployOptionalParams,
   SqlVirtualMachinesGetOptionalParams,
   SqlVirtualMachinesGetResponse,
@@ -34,7 +35,6 @@ import {
   SqlVirtualMachinesUpdateOptionalParams,
   SqlVirtualMachinesUpdateResponse,
   SqlVirtualMachinesListByResourceGroupResponse,
-  SqlVirtualMachinesStartAssessmentOptionalParams,
   SqlVirtualMachinesListBySqlVmGroupNextResponse,
   SqlVirtualMachinesListNextResponse,
   SqlVirtualMachinesListByResourceGroupNextResponse
@@ -249,6 +249,90 @@ export class SqlVirtualMachinesImpl implements SqlVirtualMachines {
     return this.client.sendOperationRequest({ options }, listOperationSpec);
   }
 
+  /**
+   * Starts Assessment on SQL virtual machine.
+   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
+   *                          value from the Azure Resource Manager API or the portal.
+   * @param sqlVirtualMachineName Name of the SQL virtual machine.
+   * @param options The options parameters.
+   */
+  async beginStartAssessment(
+    resourceGroupName: string,
+    sqlVirtualMachineName: string,
+    options?: SqlVirtualMachinesStartAssessmentOptionalParams
+  ): Promise<PollerLike<PollOperationState<void>, void>> {
+    const directSendOperation = async (
+      args: coreClient.OperationArguments,
+      spec: coreClient.OperationSpec
+    ): Promise<void> => {
+      return this.client.sendOperationRequest(args, spec);
+    };
+    const sendOperation = async (
+      args: coreClient.OperationArguments,
+      spec: coreClient.OperationSpec
+    ) => {
+      let currentRawResponse:
+        | coreClient.FullOperationResponse
+        | undefined = undefined;
+      const providedCallback = args.options?.onResponse;
+      const callback: coreClient.RawResponseCallback = (
+        rawResponse: coreClient.FullOperationResponse,
+        flatResponse: unknown
+      ) => {
+        currentRawResponse = rawResponse;
+        providedCallback?.(rawResponse, flatResponse);
+      };
+      const updatedArgs = {
+        ...args,
+        options: {
+          ...args.options,
+          onResponse: callback
+        }
+      };
+      const flatResponse = await directSendOperation(updatedArgs, spec);
+      return {
+        flatResponse,
+        rawResponse: {
+          statusCode: currentRawResponse!.status,
+          body: currentRawResponse!.parsedBody,
+          headers: currentRawResponse!.headers.toJSON()
+        }
+      };
+    };
+
+    const lro = new LroImpl(
+      sendOperation,
+      { resourceGroupName, sqlVirtualMachineName, options },
+      startAssessmentOperationSpec
+    );
+    const poller = new LroEngine(lro, {
+      resumeFrom: options?.resumeFrom,
+      intervalInMs: options?.updateIntervalInMs
+    });
+    await poller.poll();
+    return poller;
+  }
+
+  /**
+   * Starts Assessment on SQL virtual machine.
+   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
+   *                          value from the Azure Resource Manager API or the portal.
+   * @param sqlVirtualMachineName Name of the SQL virtual machine.
+   * @param options The options parameters.
+   */
+  async beginStartAssessmentAndWait(
+    resourceGroupName: string,
+    sqlVirtualMachineName: string,
+    options?: SqlVirtualMachinesStartAssessmentOptionalParams
+  ): Promise<void> {
+    const poller = await this.beginStartAssessment(
+      resourceGroupName,
+      sqlVirtualMachineName,
+      options
+    );
+    return poller.pollUntilDone();
+  }
+
   /**
    * Uninstalls and reinstalls the SQL Iaas Extension.
    * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
@@ -639,90 +723,6 @@ export class SqlVirtualMachinesImpl implements SqlVirtualMachines {
     );
   }
 
-  /**
-   * Starts Assessment on SQL virtual machine.
-   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
-   *                          value from the Azure Resource Manager API or the portal.
-   * @param sqlVirtualMachineName Name of the SQL virtual machine.
-   * @param options The options parameters.
-   */
-  async beginStartAssessment(
-    resourceGroupName: string,
-    sqlVirtualMachineName: string,
-    options?: SqlVirtualMachinesStartAssessmentOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>> {
-    const directSendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ): Promise<void> => {
-      return this.client.sendOperationRequest(args, spec);
-    };
-    const sendOperation = async (
-      args: coreClient.OperationArguments,
-      spec: coreClient.OperationSpec
-    ) => {
-      let currentRawResponse:
-        | coreClient.FullOperationResponse
-        | undefined = undefined;
-      const providedCallback = args.options?.onResponse;
-      const callback: coreClient.RawResponseCallback = (
-        rawResponse: coreClient.FullOperationResponse,
-        flatResponse: unknown
-      ) => {
-        currentRawResponse = rawResponse;
-        providedCallback?.(rawResponse, flatResponse);
-      };
-      const updatedArgs = {
-        ...args,
-        options: {
-          ...args.options,
-          onResponse: callback
-        }
-      };
-      const flatResponse = await directSendOperation(updatedArgs, spec);
-      return {
-        flatResponse,
-        rawResponse: {
-          statusCode: currentRawResponse!.status,
-          body: currentRawResponse!.parsedBody,
-          headers: currentRawResponse!.headers.toJSON()
-        }
-      };
-    };
-
-    const lro = new LroImpl(
-      sendOperation,
-      { resourceGroupName, sqlVirtualMachineName, options },
-      startAssessmentOperationSpec
-    );
-    const poller = new LroEngine(lro, {
-      resumeFrom: options?.resumeFrom,
-      intervalInMs: options?.updateIntervalInMs
-    });
-    await poller.poll();
-    return poller;
-  }
-
-  /**
-   * Starts Assessment on SQL virtual machine.
-   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
-   *                          value from the Azure Resource Manager API or the portal.
-   * @param sqlVirtualMachineName Name of the SQL virtual machine.
-   * @param options The options parameters.
-   */
-  async beginStartAssessmentAndWait(
-    resourceGroupName: string,
-    sqlVirtualMachineName: string,
-    options?: SqlVirtualMachinesStartAssessmentOptionalParams
-  ): Promise<void> {
-    const poller = await this.beginStartAssessment(
-      resourceGroupName,
-      sqlVirtualMachineName,
-      options
-    );
-    return poller.pollUntilDone();
-  }
-
   /**
    * ListBySqlVmGroupNext
    * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
@@ -814,6 +814,20 @@ const listOperationSpec: coreClient.OperationSpec = {
   headerParameters: [Parameters.accept],
   serializer
 };
+const startAssessmentOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/{sqlVirtualMachineName}/startAssessment",
+  httpMethod: "POST",
+  responses: { 200: {}, 201: {}, 202: {}, 204: {}, default: {} },
+  queryParameters: [Parameters.apiVersion],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.resourceGroupName,
+    Parameters.subscriptionId,
+    Parameters.sqlVirtualMachineName
+  ],
+  serializer
+};
 const redeployOperationSpec: coreClient.OperationSpec = {
   path:
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/{sqlVirtualMachineName}/redeploy",
@@ -943,20 +957,6 @@ const listByResourceGroupOperationSpec: coreClient.OperationSpec = {
   headerParameters: [Parameters.accept],
   serializer
 };
-const startAssessmentOperationSpec: coreClient.OperationSpec = {
-  path:
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/{sqlVirtualMachineName}/startAssessment",
-  httpMethod: "POST",
-  responses: { 200: {}, 201: {}, 202: {}, 204: {}, default: {} },
-  queryParameters: [Parameters.apiVersion],
-  urlParameters: [
-    Parameters.$host,
-    Parameters.resourceGroupName,
-    Parameters.subscriptionId,
-    Parameters.sqlVirtualMachineName
-  ],
-  serializer
-};
 const listBySqlVmGroupNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
   httpMethod: "GET",

package/src/operationsInterfaces/sqlVirtualMachines.ts

@@ -13,6 +13,7 @@ import {
   SqlVirtualMachinesListBySqlVmGroupOptionalParams,
   SqlVirtualMachinesListOptionalParams,
   SqlVirtualMachinesListByResourceGroupOptionalParams,
+  SqlVirtualMachinesStartAssessmentOptionalParams,
   SqlVirtualMachinesRedeployOptionalParams,
   SqlVirtualMachinesGetOptionalParams,
   SqlVirtualMachinesGetResponse,
@@ -21,8 +22,7 @@ import {
   SqlVirtualMachinesDeleteOptionalParams,
   SqlVirtualMachineUpdate,
   SqlVirtualMachinesUpdateOptionalParams,
-  SqlVirtualMachinesUpdateResponse,
-  SqlVirtualMachinesStartAssessmentOptionalParams
+  SqlVirtualMachinesUpdateResponse
 } from "../models";
 
 /// <reference lib="esnext.asynciterable" />
@@ -57,6 +57,30 @@ export interface SqlVirtualMachines {
     resourceGroupName: string,
     options?: SqlVirtualMachinesListByResourceGroupOptionalParams
   ): PagedAsyncIterableIterator<SqlVirtualMachine>;
+  /**
+   * Starts Assessment on SQL virtual machine.
+   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
+   *                          value from the Azure Resource Manager API or the portal.
+   * @param sqlVirtualMachineName Name of the SQL virtual machine.
+   * @param options The options parameters.
+   */
+  beginStartAssessment(
+    resourceGroupName: string,
+    sqlVirtualMachineName: string,
+    options?: SqlVirtualMachinesStartAssessmentOptionalParams
+  ): Promise<PollerLike<PollOperationState<void>, void>>;
+  /**
+   * Starts Assessment on SQL virtual machine.
+   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
+   *                          value from the Azure Resource Manager API or the portal.
+   * @param sqlVirtualMachineName Name of the SQL virtual machine.
+   * @param options The options parameters.
+   */
+  beginStartAssessmentAndWait(
+    resourceGroupName: string,
+    sqlVirtualMachineName: string,
+    options?: SqlVirtualMachinesStartAssessmentOptionalParams
+  ): Promise<void>;
   /**
    * Uninstalls and reinstalls the SQL Iaas Extension.
    * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
@@ -183,28 +207,4 @@ export interface SqlVirtualMachines {
     parameters: SqlVirtualMachineUpdate,
     options?: SqlVirtualMachinesUpdateOptionalParams
   ): Promise<SqlVirtualMachinesUpdateResponse>;
-  /**
-   * Starts Assessment on SQL virtual machine.
-   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
-   *                          value from the Azure Resource Manager API or the portal.
-   * @param sqlVirtualMachineName Name of the SQL virtual machine.
-   * @param options The options parameters.
-   */
-  beginStartAssessment(
-    resourceGroupName: string,
-    sqlVirtualMachineName: string,
-    options?: SqlVirtualMachinesStartAssessmentOptionalParams
-  ): Promise<PollerLike<PollOperationState<void>, void>>;
-  /**
-   * Starts Assessment on SQL virtual machine.
-   * @param resourceGroupName Name of the resource group that contains the resource. You can obtain this
-   *                          value from the Azure Resource Manager API or the portal.
-   * @param sqlVirtualMachineName Name of the SQL virtual machine.
-   * @param options The options parameters.
-   */
-  beginStartAssessmentAndWait(
-    resourceGroupName: string,
-    sqlVirtualMachineName: string,
-    options?: SqlVirtualMachinesStartAssessmentOptionalParams
-  ): Promise<void>;
 }

package/src/sqlVirtualMachineManagementClient.ts

@@ -60,7 +60,7 @@ export class SqlVirtualMachineManagementClient extends coreClient.ServiceClient
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-sqlvirtualmachine/5.0.0-beta.5`;
+    const packageDetails = `azsdk-js-arm-sqlvirtualmachine/5.0.0-beta.6`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -80,34 +80,41 @@ export class SqlVirtualMachineManagementClient extends coreClient.ServiceClient
     };
     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}`,
+          challengeCallbacks: {
+            authorizeRequestOnChallenge:
+              coreClient.authorizeRequestOnClaimChallenge
+          }
+        })
+      );
     }
     // Parameter assignments
     this.subscriptionId = subscriptionId;
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2021-11-01-preview";
+    this.apiVersion = options.apiVersion || "2022-07-01-preview";
     this.availabilityGroupListeners = new AvailabilityGroupListenersImpl(this);
     this.operations = new OperationsImpl(this);
     this.sqlVirtualMachineGroups = new SqlVirtualMachineGroupsImpl(this);
@@ -130,7 +137,7 @@ export class SqlVirtualMachineManagementClient extends coreClient.ServiceClient
         if (param.length > 1) {
           const newParams = param[1].split("&").map((item) => {
             if (item.indexOf("api-version") > -1) {
-              return item.replace(/(?<==).*$/, apiVersion);
+              return "api-version=" + apiVersion;
             } else {
               return item;
             }

package/tsconfig.json

@@ -15,17 +15,11 @@
     ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true,
-    "paths": {
-      "@azure/arm-sqlvirtualmachine": [
-        "./src/index"
-      ]
-    }
+    "importHelpers": true
   },
   "include": [
     "./src/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts"
+    "./test/**/*.ts"
   ],
   "exclude": [
     "node_modules"