From 84ed740e941ae3cdd914522b33794797936097da Mon Sep 17 00:00:00 2001
From: SDKAuto <sdkautomation@microsoft.com>
Date: Wed, 11 May 2022 05:46:48 +0000
Subject: [PATCH] CodeGen from PR 19017 in Azure/azure-rest-api-specs Merge
 86de8459dea42a7afb3c30cbcf17cf9f7a125847 into
 ac286e05bedd69d301e1dc94ec70f66e8536686b

---
 common/config/rush/pnpm-lock.yaml             |  7 +--
 .../arm-servicelinker/CHANGELOG.md            | 12 ++++
 sdk/servicelinker/arm-servicelinker/README.md |  5 +-
 .../arm-servicelinker/_meta.json              |  8 +--
 .../arm-servicelinker/package.json            | 22 +++-----
 .../review/arm-servicelinker.api.md           |  8 ++-
 .../arm-servicelinker/src/models/index.ts     | 14 +++--
 .../arm-servicelinker/src/models/mappers.ts   | 56 +++++++++++++++----
 .../src/operations/linker.ts                  |  8 +--
 .../src/serviceLinkerManagementClient.ts      | 36 +++++++++++-
 .../arm-servicelinker/test/sampleTest.ts      | 39 ++++++-------
 .../arm-servicelinker/tsconfig.json           | 10 +---
 12 files changed, 148 insertions(+), 77 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 3df37c100915..99bb3649d951 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -13245,13 +13245,13 @@ packages:
     dev: false
 
   file:projects/arm-servicelinker.tgz:
-    resolution: {integrity: sha512-9uRGegk2PugMoa2TF31FkZMpzlh2u4pRzGCDfVyIefc27kr58nfoH0LYEBJj89oGBYjVNOc6uUZu8dagKX0/nQ==, tarball: file:projects/arm-servicelinker.tgz}
+    resolution: {integrity: sha512-ar2TBw2ATcUFG2+pr1wiygiwJq5h7/Q5OLsapP8Hm7XjAVHbxbQrarKTSUWnD5xypzCVsqoOHCXdsYt/aePhAQ==, tarball: file:projects/arm-servicelinker.tgz}
     name: '@rush-temp/arm-servicelinker'
     version: 0.0.0
     dependencies:
       '@azure-tools/test-recorder': 1.0.2
       '@azure/identity': 2.0.4
-      '@microsoft/api-extractor': 7.23.1
+      '@microsoft/api-extractor': 7.18.11
       '@rollup/plugin-commonjs': 21.1.0_rollup@2.72.0
       '@rollup/plugin-json': 4.1.0_rollup@2.72.0
       '@rollup/plugin-multi-entry': 4.1.0_rollup@2.72.0
@@ -13268,7 +13268,6 @@ packages:
     transitivePeerDependencies:
       - '@types/node'
       - debug
-      - encoding
       - supports-color
     dev: false
 
@@ -15864,7 +15863,7 @@ packages:
     dev: false
 
   file:projects/logger.tgz:
-    resolution: {integrity: sha512-4oFLfXF58h4vd0ye9yIrJqV8ICk41YWvs7BAp3qJK08zbvY4hS3bdm5DmsuW313e61nlxd+eTEebgd1lWzIOpA==, tarball: file:projects/logger.tgz}
+    resolution: {integrity: sha512-KR3Qu673FyXbtGvsdldXeuWMlXPYtnDYHo9nuPbVSOxPBZATFR+JF6pM+2hH5Vrk5gW50qb72p8Ns7QMkScRwA==, tarball: file:projects/logger.tgz}
     name: '@rush-temp/logger'
     version: 0.0.0
     dependencies:
diff --git a/sdk/servicelinker/arm-servicelinker/CHANGELOG.md b/sdk/servicelinker/arm-servicelinker/CHANGELOG.md
index eaaabc6f424e..2a5fe7ab824e 100644
--- a/sdk/servicelinker/arm-servicelinker/CHANGELOG.md
+++ b/sdk/servicelinker/arm-servicelinker/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Release History
     
+## 2.0.0 (2022-05-11)
+    
+**Features**
+
+  - Added Interface ValidateOperationResult
+  - Enum KnownValidationResultStatus has a new value Failure
+
+**Breaking Changes**
+
+  - Enum KnownValidationResultStatus no longer has value Failed
+    
+    
 ## 1.0.0 (2022-04-27)
 
 The package of @azure/arm-servicelinker is using our next generation design principles. To learn more, please refer to our documentation [Quick Start](https://aka.ms/js-track2-quickstart).
diff --git a/sdk/servicelinker/arm-servicelinker/README.md b/sdk/servicelinker/arm-servicelinker/README.md
index 4033c2a67a69..e94ebc7dc1cb 100644
--- a/sdk/servicelinker/arm-servicelinker/README.md
+++ b/sdk/servicelinker/arm-servicelinker/README.md
@@ -53,14 +53,15 @@ const { ServiceLinkerManagementClient } = require("@azure/arm-servicelinker");
 const { DefaultAzureCredential } = require("@azure/identity");
 // For client-side applications running in the browser, use InteractiveBrowserCredential instead of DefaultAzureCredential. See https://aka.ms/azsdk/js/identity/examples for more details.
 
-const client = new ServiceLinkerManagementClient(new DefaultAzureCredential());
+const subscriptionId = "00000000-0000-0000-0000-000000000000";
+const client = new ServiceLinkerManagementClient(new DefaultAzureCredential(), subscriptionId);
 
 // For client-side applications running in the browser, use this code instead:
 // const credential = new InteractiveBrowserCredential({
 //   tenantId: "<YOUR_TENANT_ID>",
 //   clientId: "<YOUR_CLIENT_ID>"
 // });
-// const client = new ServiceLinkerManagementClient(credential);
+// const client = new ServiceLinkerManagementClient(credential, subscriptionId);
 ```
 
 
diff --git a/sdk/servicelinker/arm-servicelinker/_meta.json b/sdk/servicelinker/arm-servicelinker/_meta.json
index 5985ff176e8d..f05e27da03ba 100644
--- a/sdk/servicelinker/arm-servicelinker/_meta.json
+++ b/sdk/servicelinker/arm-servicelinker/_meta.json
@@ -1,8 +1,8 @@
 {
-  "commit": "af53c06807f579062e88531c0b292ac5414af0dd",
+  "commit": "680ecbfdfd63702f400eb646da9374d46c118b47",
   "readme": "specification/servicelinker/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\servicelinker\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220408.1 --generate-sample=true",
+  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/servicelinker/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220425.1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.2.6",
-  "use": "@autorest/typescript@6.0.0-alpha.19.20220408.1"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.3.0",
+  "use": "@autorest/typescript@6.0.0-alpha.19.20220425.1"
 }
\ No newline at end of file
diff --git a/sdk/servicelinker/arm-servicelinker/package.json b/sdk/servicelinker/arm-servicelinker/package.json
index c79e0f6774a1..e9b775d14d3b 100644
--- a/sdk/servicelinker/arm-servicelinker/package.json
+++ b/sdk/servicelinker/arm-servicelinker/package.json
@@ -3,7 +3,7 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for ServiceLinkerManagementClient.",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -28,7 +28,7 @@
   "module": "./dist-esm/src/index.js",
   "types": "./types/arm-servicelinker.d.ts",
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.18.11",
+    "@microsoft/api-extractor": "7.18.11",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-multi-entry": "^4.1.0",
@@ -40,9 +40,11 @@
     "uglify-js": "^3.4.9",
     "rimraf": "^3.0.0",
     "@azure/identity": "^2.0.1",
-    "@azure-tools/test-recorder": "^1.0.0",
+    "@azure-tools/test-recorder": "^2.0.0",
+    "@azure-tools/test-credential": "^1.0.0",
     "mocha": "^7.1.1",
-    "cross-env": "^7.0.2"
+    "cross-env": "^7.0.2",
+    "@azure/dev-tool": "^1.0.0"
   },
   "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/servicelinker/arm-servicelinker",
   "repository": {
@@ -93,7 +95,7 @@
     "unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
     "unit-test:browser": "echo skipped",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
-    "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
+    "integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
     "integration-test:browser": "echo skipped",
     "docs": "echo skipped"
   },
@@ -106,13 +108,5 @@
       }
     ]
   },
-  "autoPublish": true,
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-servicelinker?view=azure-node-preview"
-  }
+  "autoPublish": true
 }
\ No newline at end of file
diff --git a/sdk/servicelinker/arm-servicelinker/review/arm-servicelinker.api.md b/sdk/servicelinker/arm-servicelinker/review/arm-servicelinker.api.md
index 657fa177fc68..63e159d68ee5 100644
--- a/sdk/servicelinker/arm-servicelinker/review/arm-servicelinker.api.md
+++ b/sdk/servicelinker/arm-servicelinker/review/arm-servicelinker.api.md
@@ -194,7 +194,7 @@ export enum KnownTargetServiceType {
 // @public
 export enum KnownValidationResultStatus {
     // (undocumented)
-    Failed = "failed",
+    Failure = "failure",
     // (undocumented)
     Success = "success",
     // (undocumented)
@@ -312,7 +312,7 @@ export interface LinkerValidateOptionalParams extends coreClient.OperationOption
 }
 
 // @public
-export type LinkerValidateResponse = ValidateResult;
+export type LinkerValidateResponse = ValidateOperationResult;
 
 // @public
 export interface Operation {
@@ -473,13 +473,15 @@ export type UserAssignedIdentityAuthInfo = AuthInfoBase & {
 };
 
 // @public
-export interface ValidateResult {
+export interface ValidateOperationResult {
     authType?: AuthType;
     isConnectionAvailable?: boolean;
     linkerName?: string;
     reportEndTimeUtc?: Date;
     reportStartTimeUtc?: Date;
+    resourceId?: string;
     sourceId?: string;
+    status?: string;
     targetId?: string;
     validationDetail?: ValidationResultItem[];
 }
diff --git a/sdk/servicelinker/arm-servicelinker/src/models/index.ts b/sdk/servicelinker/arm-servicelinker/src/models/index.ts
index e0e8b440ba47..356845f6f275 100644
--- a/sdk/servicelinker/arm-servicelinker/src/models/index.ts
+++ b/sdk/servicelinker/arm-servicelinker/src/models/index.ts
@@ -174,8 +174,12 @@ export interface LinkerPatch {
   scope?: string;
 }
 
-/** The validation result for a linker. */
-export interface ValidateResult {
+/** The validation operation result for a linker. */
+export interface ValidateOperationResult {
+  /** Validated linker id. */
+  resourceId?: string;
+  /** Validation operation status. */
+  status?: string;
   /** The linker name. */
   linkerName?: string;
   /** A boolean value indicating whether the connection is available or not */
@@ -548,7 +552,7 @@ export type CreatedByType = string;
 /** Known values of {@link ValidationResultStatus} that the service accepts. */
 export enum KnownValidationResultStatus {
   Success = "success",
-  Failed = "failed",
+  Failure = "failure",
   Warning = "warning"
 }
 
@@ -558,7 +562,7 @@ export enum KnownValidationResultStatus {
  *  this enum contains the known values that the service supports.
  * ### Known values supported by the service
  * **success** \
- * **failed** \
+ * **failure** \
  * **warning**
  */
 export type ValidationResultStatus = string;
@@ -682,7 +686,7 @@ export interface LinkerValidateOptionalParams
 }
 
 /** Contains response data for the validate operation. */
-export type LinkerValidateResponse = ValidateResult;
+export type LinkerValidateResponse = ValidateOperationResult;
 
 /** Optional parameters. */
 export interface LinkerListConfigurationsOptionalParams
diff --git a/sdk/servicelinker/arm-servicelinker/src/models/mappers.ts b/sdk/servicelinker/arm-servicelinker/src/models/mappers.ts
index e7c8a77b86fb..606d95ae720c 100644
--- a/sdk/servicelinker/arm-servicelinker/src/models/mappers.ts
+++ b/sdk/servicelinker/arm-servicelinker/src/models/mappers.ts
@@ -15,6 +15,7 @@ export const LinkerList: coreClient.CompositeMapper = {
     modelProperties: {
       nextLink: {
         serializedName: "nextLink",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -84,6 +85,7 @@ export const VNetSolution: coreClient.CompositeMapper = {
     modelProperties: {
       type: {
         serializedName: "type",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -99,6 +101,7 @@ export const SecretStore: coreClient.CompositeMapper = {
     modelProperties: {
       keyVaultId: {
         serializedName: "keyVaultId",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -326,6 +329,7 @@ export const LinkerPatch: coreClient.CompositeMapper = {
       },
       scope: {
         serializedName: "properties.scope",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -334,55 +338,77 @@ export const LinkerPatch: coreClient.CompositeMapper = {
   }
 };
 
-export const ValidateResult: coreClient.CompositeMapper = {
+export const ValidateOperationResult: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
-    className: "ValidateResult",
+    className: "ValidateOperationResult",
     modelProperties: {
+      resourceId: {
+        serializedName: "resourceId",
+        nullable: true,
+        type: {
+          name: "String"
+        }
+      },
+      status: {
+        serializedName: "status",
+        nullable: true,
+        type: {
+          name: "String"
+        }
+      },
       linkerName: {
-        serializedName: "linkerName",
+        serializedName: "properties.linkerName",
+        nullable: true,
         type: {
           name: "String"
         }
       },
       isConnectionAvailable: {
-        serializedName: "isConnectionAvailable",
+        serializedName: "properties.isConnectionAvailable",
+        nullable: true,
         type: {
           name: "Boolean"
         }
       },
       reportStartTimeUtc: {
-        serializedName: "reportStartTimeUtc",
+        serializedName: "properties.reportStartTimeUtc",
+        nullable: true,
         type: {
           name: "DateTime"
         }
       },
       reportEndTimeUtc: {
-        serializedName: "reportEndTimeUtc",
+        serializedName: "properties.reportEndTimeUtc",
+        nullable: true,
         type: {
           name: "DateTime"
         }
       },
       sourceId: {
-        serializedName: "sourceId",
+        serializedName: "properties.sourceId",
+        nullable: true,
         type: {
           name: "String"
         }
       },
       targetId: {
-        serializedName: "targetId",
+        serializedName: "properties.targetId",
+        nullable: true,
         type: {
           name: "String"
         }
       },
       authType: {
-        serializedName: "authType",
+        serializedName: "properties.authType",
+        nullable: true,
         type: {
           name: "String"
         }
       },
       validationDetail: {
-        serializedName: "validationDetail",
+        serializedName: "properties.validationDetail",
+        nullable: true,
         type: {
           name: "Sequence",
           element: {
@@ -410,24 +436,28 @@ export const ValidationResultItem: coreClient.CompositeMapper = {
       },
       description: {
         serializedName: "description",
+        nullable: true,
         type: {
           name: "String"
         }
       },
       result: {
         serializedName: "result",
+        nullable: true,
         type: {
           name: "String"
         }
       },
       errorMessage: {
         serializedName: "errorMessage",
+        nullable: true,
         type: {
           name: "String"
         }
       },
       errorCode: {
         serializedName: "errorCode",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -470,6 +500,7 @@ export const SourceConfiguration: coreClient.CompositeMapper = {
       },
       value: {
         serializedName: "value",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -705,6 +736,7 @@ export const SecretAuthInfo: coreClient.CompositeMapper = {
       ...AuthInfoBase.type.modelProperties,
       name: {
         serializedName: "name",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -848,6 +880,7 @@ export const AzureKeyVaultProperties: coreClient.CompositeMapper = {
       ...AzureResourcePropertiesBase.type.modelProperties,
       connectAsKubernetesCsiDriver: {
         serializedName: "connectAsKubernetesCsiDriver",
+        nullable: true,
         type: {
           name: "Boolean"
         }
@@ -867,6 +900,7 @@ export const ValueSecretInfo: coreClient.CompositeMapper = {
       ...SecretInfoBase.type.modelProperties,
       value: {
         serializedName: "value",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -892,6 +926,7 @@ export const KeyVaultSecretReferenceSecretInfo: coreClient.CompositeMapper = {
       },
       version: {
         serializedName: "version",
+        nullable: true,
         type: {
           name: "String"
         }
@@ -975,6 +1010,7 @@ export const LinkerResource: coreClient.CompositeMapper = {
       },
       scope: {
         serializedName: "properties.scope",
+        nullable: true,
         type: {
           name: "String"
         }
diff --git a/sdk/servicelinker/arm-servicelinker/src/operations/linker.ts b/sdk/servicelinker/arm-servicelinker/src/operations/linker.ts
index 91ff8f990e05..7f0e33c6099c 100644
--- a/sdk/servicelinker/arm-servicelinker/src/operations/linker.ts
+++ b/sdk/servicelinker/arm-servicelinker/src/operations/linker.ts
@@ -646,16 +646,16 @@ const validateOperationSpec: coreClient.OperationSpec = {
   httpMethod: "POST",
   responses: {
     200: {
-      bodyMapper: Mappers.ValidateResult
+      bodyMapper: Mappers.ValidateOperationResult
     },
     201: {
-      bodyMapper: Mappers.ValidateResult
+      bodyMapper: Mappers.ValidateOperationResult
     },
     202: {
-      bodyMapper: Mappers.ValidateResult
+      bodyMapper: Mappers.ValidateOperationResult
     },
     204: {
-      bodyMapper: Mappers.ValidateResult
+      bodyMapper: Mappers.ValidateOperationResult
     },
     default: {
       bodyMapper: Mappers.ErrorResponse
diff --git a/sdk/servicelinker/arm-servicelinker/src/serviceLinkerManagementClient.ts b/sdk/servicelinker/arm-servicelinker/src/serviceLinkerManagementClient.ts
index aa950da20d7a..8d0c576d5195 100644
--- a/sdk/servicelinker/arm-servicelinker/src/serviceLinkerManagementClient.ts
+++ b/sdk/servicelinker/arm-servicelinker/src/serviceLinkerManagementClient.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 { LinkerImpl, OperationsImpl } from "./operations";
 import { Linker, Operations } from "./operationsInterfaces";
@@ -39,7 +44,7 @@ export class ServiceLinkerManagementClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-servicelinker/1.0.0`;
+    const packageDetails = `azsdk-js-arm-servicelinker/2.0.0`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -87,6 +92,35 @@ export class ServiceLinkerManagementClient extends coreClient.ServiceClient {
     this.apiVersion = options.apiVersion || "2022-05-01";
     this.linker = new LinkerImpl(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 item.replace(/(?<==).*$/, apiVersion);
+            } else {
+              return item;
+            }
+          });
+          request.url = param[0] + "?" + newParams.join("&");
+        }
+        return next(request);
+      }
+    };
+    this.pipeline.addPolicy(apiVersionPolicy);
   }
 
   linker: Linker;
diff --git a/sdk/servicelinker/arm-servicelinker/test/sampleTest.ts b/sdk/servicelinker/arm-servicelinker/test/sampleTest.ts
index 7ed89b043e1b..25aeb3ebcc36 100644
--- a/sdk/servicelinker/arm-servicelinker/test/sampleTest.ts
+++ b/sdk/servicelinker/arm-servicelinker/test/sampleTest.ts
@@ -7,35 +7,30 @@
  */
 
 import {
-  env,
-  record,
-  RecorderEnvironmentSetup,
-  Recorder
+  Recorder,
+  RecorderStartOptions,
+  env
 } from "@azure-tools/test-recorder";
-import * as assert from "assert";
+import { assert } from "chai";
+import { Context } from "mocha";
 
-const recorderEnvSetup: RecorderEnvironmentSetup = {
-  replaceableVariables: {
-    AZURE_CLIENT_ID: "azure_client_id",
-    AZURE_CLIENT_SECRET: "azure_client_secret",
-    AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
-    SUBSCRIPTION_ID: "azure_subscription_id"
-  },
-  customizationsOnRecordings: [
-    (recording: any): any =>
-      recording.replace(
-        /"access_token":"[^"]*"/g,
-        `"access_token":"access_token"`
-      )
-  ],
-  queryParametersToSkip: []
+const replaceableVariables: Record<string, string> = {
+  AZURE_CLIENT_ID: "azure_client_id",
+  AZURE_CLIENT_SECRET: "azure_client_secret",
+  AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
+  SUBSCRIPTION_ID: "azure_subscription_id"
+};
+
+const recorderOptions: RecorderStartOptions = {
+  envSetupForPlayback: replaceableVariables
 };
 
 describe("My test", () => {
   let recorder: Recorder;
 
-  beforeEach(async function() {
-    recorder = record(this, recorderEnvSetup);
+  beforeEach(async function(this: Context) {
+    recorder = new Recorder(this.currentTest);
+    await recorder.start(recorderOptions);
   });
 
   afterEach(async function() {
diff --git a/sdk/servicelinker/arm-servicelinker/tsconfig.json b/sdk/servicelinker/arm-servicelinker/tsconfig.json
index 5c861ab691f6..3e6ae96443f3 100644
--- a/sdk/servicelinker/arm-servicelinker/tsconfig.json
+++ b/sdk/servicelinker/arm-servicelinker/tsconfig.json
@@ -15,17 +15,11 @@
     ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true,
-    "paths": {
-      "@azure/arm-servicelinker": [
-        "./src/index"
-      ]
-    }
+    "importHelpers": true
   },
   "include": [
     "./src/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts"
+    "./test/**/*.ts"
   ],
   "exclude": [
     "node_modules"