From a39432ca6ce063ba9df1900af7b765f5b22f3753 Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Tue, 26 Oct 2021 15:00:51 +0800
Subject: [PATCH 01/13] make core rest client work with null and add encoding
 options

---
 .../review/core-client.api.md                 |  7 ++++---
 .../core-client-rest/src/pathClientTypes.ts   |  4 ++++
 sdk/core/core-client-rest/src/urlHelpers.ts   | 20 +++++++++++++++++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/sdk/core/core-client-rest/review/core-client.api.md b/sdk/core/core-client-rest/review/core-client.api.md
index 6826ceb5906e..c2c5c32c43e3 100644
--- a/sdk/core/core-client-rest/review/core-client.api.md
+++ b/sdk/core/core-client-rest/review/core-client.api.md
@@ -82,14 +82,15 @@ export type RequestParameters = {
     queryParameters?: Record<string, unknown>;
     contentType?: string;
     allowInsecureConnection?: boolean;
+    enablePathParameterEncoding?: boolean;
+    enableQueryParameterEncoding?: boolean;
 };
 
 // @public
 export type RouteParams<TRoute extends string> = TRoute extends `${infer _Head}/{${infer _Param}}${infer Tail}` ? [
-    pathParam: string,
-    ...pathParams: RouteParams<Tail>
+pathParam: string,
+...pathParams: RouteParams<Tail>
 ] : [
 ];
 
-
 ```
diff --git a/sdk/core/core-client-rest/src/pathClientTypes.ts b/sdk/core/core-client-rest/src/pathClientTypes.ts
index cefd4ecfb0bc..c257cff403c5 100644
--- a/sdk/core/core-client-rest/src/pathClientTypes.ts
+++ b/sdk/core/core-client-rest/src/pathClientTypes.ts
@@ -31,6 +31,10 @@ export type RequestParameters = {
   contentType?: string;
   /** Set to true if the request is sent over HTTP instead of HTTPS */
   allowInsecureConnection?: boolean;
+  /** Set to true if you want to encide the path parameters */
+  enablePathParameterEncoding?: boolean;
+  /** Set to true if you want to encide the query parameters */
+  enableQueryParameterEncoding?: boolean;
 };
 
 /**
diff --git a/sdk/core/core-client-rest/src/urlHelpers.ts b/sdk/core/core-client-rest/src/urlHelpers.ts
index d310737a7f8f..2b1cfb252736 100644
--- a/sdk/core/core-client-rest/src/urlHelpers.ts
+++ b/sdk/core/core-client-rest/src/urlHelpers.ts
@@ -25,7 +25,14 @@ export function buildRequestUrl(
   }
 
   for (const pathParam of pathParameters) {
-    path = path.replace(/{([^/]+)}/, pathParam);
+    if (options.enablePathParameterEncoding) {
+      const encodeParam = encodeURIComponent(pathParam);
+      path = path.replace(/{([^/]+)}/, encodeParam);    
+    } else {
+      path = path.replace(/{([^/]+)}/, pathParam);
+    }
+    
+    
   }
 
   const url = new URL(`${baseUrl}/${path}`);
@@ -34,11 +41,20 @@ export function buildRequestUrl(
     const queryParams = options.queryParameters;
     for (const key of Object.keys(queryParams)) {
       const param = queryParams[key] as any;
+      if (param === undefined || param === null) {
+        continue;
+      }
       if (!param.toString || typeof param.toString !== "function") {
         throw new Error(`Query parameters must be able to be represented as string, ${key} can't`);
       }
       const value = param.toISOString !== undefined ? param.toISOString() : param.toString();
-      url.searchParams.append(key, value);
+      if (options.enableQueryParameterEncoding) {
+        const encodeParam = encodeURIComponent(value);
+        url.searchParams.append(key, encodeParam);
+      } else {
+        url.searchParams.append(key, value);
+      }
+      
     }
   }
 

From 0da2c9cfc9aa1d5b85ff35793241ff64c802d723 Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Wed, 27 Oct 2021 10:06:27 +0800
Subject: [PATCH 02/13] adding test

---
 sdk/core/core-client-rest/CHANGELOG.md            |  4 ++++
 sdk/core/core-client-rest/package.json            |  2 +-
 sdk/core/core-client-rest/test/urlHelpers.spec.ts | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/sdk/core/core-client-rest/CHANGELOG.md b/sdk/core/core-client-rest/CHANGELOG.md
index 58724bfd955e..be57c53c5893 100644
--- a/sdk/core/core-client-rest/CHANGELOG.md
+++ b/sdk/core/core-client-rest/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History
+## 1.0.0-beta.8 (2021-10-27)
 
+### Features Added
+
+- Add options to support enable path parameter encoding and query parameter encoding.
 ## 1.0.0-beta.7 (2021-09-02)
 
 ### Other Changes
diff --git a/sdk/core/core-client-rest/package.json b/sdk/core/core-client-rest/package.json
index 74230f1ad7b4..d6351bcb43be 100644
--- a/sdk/core/core-client-rest/package.json
+++ b/sdk/core/core-client-rest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-rest/core-client",
-  "version": "1.0.0-beta.7",
+  "version": "1.0.0-beta.8",
   "description": "Core library for interfacing with AutoRest rest level generated code",
   "sdk-type": "client",
   "main": "dist/index.js",
diff --git a/sdk/core/core-client-rest/test/urlHelpers.spec.ts b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
index d307944551b5..c1ecb0d838bc 100644
--- a/sdk/core/core-client-rest/test/urlHelpers.spec.ts
+++ b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
@@ -56,4 +56,19 @@ describe("urlHelpers", () => {
 
     assert.equal(result, `https://example2.org`);
   });
+
+  it("should encode url when enable path parameter encoding", () => {
+    const result = buildRequestUrl(mockBaseUrl, "/foo bar", [], {
+      enablePathParameterEncoding: true
+    });
+    assert.equal(result, `https://example.org/foo%20bar`);
+  });
+
+  it("should encode url when enable query parameter encoding", () => {
+    const result = buildRequestUrl(mockBaseUrl, "/foo", [], {
+      queryParameters: { foo: ' aaaa', bar: 'b= ' },
+      enableQueryParameterEncoding: true,
+    });
+    assert.equal(result, `https://example.org/foo?foo=%2520aaaa&bar=b%253D%2520`);
+  });
 });

From 808e7a8d87076e7253171562ad06b19099571117 Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Wed, 27 Oct 2021 10:06:52 +0800
Subject: [PATCH 03/13] adding test

---
 sdk/core/core-client-rest/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/core/core-client-rest/CHANGELOG.md b/sdk/core/core-client-rest/CHANGELOG.md
index be57c53c5893..31b0eaadf7e4 100644
--- a/sdk/core/core-client-rest/CHANGELOG.md
+++ b/sdk/core/core-client-rest/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Features Added
 
 - Add options to support enable path parameter encoding and query parameter encoding.
+
 ## 1.0.0-beta.7 (2021-09-02)
 
 ### Other Changes

From fe1bfb93f7216d1ea72f41d6a0a6b7fafa2d7c60 Mon Sep 17 00:00:00 2001
From: Qiaoqiao Zhang <qiaozha@microsoft.com>
Date: Thu, 28 Oct 2021 10:28:55 +0800
Subject: [PATCH 04/13] use enableUrlEncoding instead

---
 sdk/core/core-client-rest/review/core-client.api.md |  3 +--
 sdk/core/core-client-rest/src/pathClientTypes.ts    |  6 ++----
 sdk/core/core-client-rest/src/urlHelpers.ts         | 12 +++++-------
 sdk/core/core-client-rest/test/urlHelpers.spec.ts   |  4 ++--
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/sdk/core/core-client-rest/review/core-client.api.md b/sdk/core/core-client-rest/review/core-client.api.md
index c2c5c32c43e3..9f5b6c342668 100644
--- a/sdk/core/core-client-rest/review/core-client.api.md
+++ b/sdk/core/core-client-rest/review/core-client.api.md
@@ -82,8 +82,7 @@ export type RequestParameters = {
     queryParameters?: Record<string, unknown>;
     contentType?: string;
     allowInsecureConnection?: boolean;
-    enablePathParameterEncoding?: boolean;
-    enableQueryParameterEncoding?: boolean;
+    enableUrlEncoding?: boolean;
 };
 
 // @public
diff --git a/sdk/core/core-client-rest/src/pathClientTypes.ts b/sdk/core/core-client-rest/src/pathClientTypes.ts
index c257cff403c5..fdf624cd6348 100644
--- a/sdk/core/core-client-rest/src/pathClientTypes.ts
+++ b/sdk/core/core-client-rest/src/pathClientTypes.ts
@@ -31,10 +31,8 @@ export type RequestParameters = {
   contentType?: string;
   /** Set to true if the request is sent over HTTP instead of HTTPS */
   allowInsecureConnection?: boolean;
-  /** Set to true if you want to encide the path parameters */
-  enablePathParameterEncoding?: boolean;
-  /** Set to true if you want to encide the query parameters */
-  enableQueryParameterEncoding?: boolean;
+  /** Set to true if you want to encode the path or query parameters */
+  enableUrlEncoding?: boolean;
 };
 
 /**
diff --git a/sdk/core/core-client-rest/src/urlHelpers.ts b/sdk/core/core-client-rest/src/urlHelpers.ts
index 2b1cfb252736..868354061664 100644
--- a/sdk/core/core-client-rest/src/urlHelpers.ts
+++ b/sdk/core/core-client-rest/src/urlHelpers.ts
@@ -25,14 +25,12 @@ export function buildRequestUrl(
   }
 
   for (const pathParam of pathParameters) {
-    if (options.enablePathParameterEncoding) {
+    if (options.enableUrlEncoding) {
       const encodeParam = encodeURIComponent(pathParam);
-      path = path.replace(/{([^/]+)}/, encodeParam);    
+      path = path.replace(/{([^/]+)}/, encodeParam);   
     } else {
-      path = path.replace(/{([^/]+)}/, pathParam);
-    }
-    
-    
+      path = path.replace(/{([^/]+)}/, pathParam); 
+    }  
   }
 
   const url = new URL(`${baseUrl}/${path}`);
@@ -48,7 +46,7 @@ export function buildRequestUrl(
         throw new Error(`Query parameters must be able to be represented as string, ${key} can't`);
       }
       const value = param.toISOString !== undefined ? param.toISOString() : param.toString();
-      if (options.enableQueryParameterEncoding) {
+      if (options.enableUrlEncoding) {
         const encodeParam = encodeURIComponent(value);
         url.searchParams.append(key, encodeParam);
       } else {
diff --git a/sdk/core/core-client-rest/test/urlHelpers.spec.ts b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
index c1ecb0d838bc..113b332281a6 100644
--- a/sdk/core/core-client-rest/test/urlHelpers.spec.ts
+++ b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
@@ -59,7 +59,7 @@ describe("urlHelpers", () => {
 
   it("should encode url when enable path parameter encoding", () => {
     const result = buildRequestUrl(mockBaseUrl, "/foo bar", [], {
-      enablePathParameterEncoding: true
+      enableUrlEncoding: true
     });
     assert.equal(result, `https://example.org/foo%20bar`);
   });
@@ -67,7 +67,7 @@ describe("urlHelpers", () => {
   it("should encode url when enable query parameter encoding", () => {
     const result = buildRequestUrl(mockBaseUrl, "/foo", [], {
       queryParameters: { foo: ' aaaa', bar: 'b= ' },
-      enableQueryParameterEncoding: true,
+      enableUrlEncoding: true
     });
     assert.equal(result, `https://example.org/foo?foo=%2520aaaa&bar=b%253D%2520`);
   });

From d80200bab9cdcba166fdf26837f5ca9357181de4 Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Fri, 29 Oct 2021 15:13:39 +0800
Subject: [PATCH 05/13] change to skipUrlEncoding

---
 .../review/core-client.api.md                 |  2 +-
 .../core-client-rest/src/pathClientTypes.ts   |  2 +-
 sdk/core/core-client-rest/src/urlHelpers.ts   | 19 +++++++------------
 .../core-client-rest/test/urlHelpers.spec.ts  |  7 ++-----
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/sdk/core/core-client-rest/review/core-client.api.md b/sdk/core/core-client-rest/review/core-client.api.md
index 9f5b6c342668..862e776e2d26 100644
--- a/sdk/core/core-client-rest/review/core-client.api.md
+++ b/sdk/core/core-client-rest/review/core-client.api.md
@@ -82,7 +82,7 @@ export type RequestParameters = {
     queryParameters?: Record<string, unknown>;
     contentType?: string;
     allowInsecureConnection?: boolean;
-    enableUrlEncoding?: boolean;
+    skipUrlEncoding?: boolean;
 };
 
 // @public
diff --git a/sdk/core/core-client-rest/src/pathClientTypes.ts b/sdk/core/core-client-rest/src/pathClientTypes.ts
index fdf624cd6348..babfa680c18f 100644
--- a/sdk/core/core-client-rest/src/pathClientTypes.ts
+++ b/sdk/core/core-client-rest/src/pathClientTypes.ts
@@ -32,7 +32,7 @@ export type RequestParameters = {
   /** Set to true if the request is sent over HTTP instead of HTTPS */
   allowInsecureConnection?: boolean;
   /** Set to true if you want to encode the path or query parameters */
-  enableUrlEncoding?: boolean;
+  skipUrlEncoding?: boolean;
 };
 
 /**
diff --git a/sdk/core/core-client-rest/src/urlHelpers.ts b/sdk/core/core-client-rest/src/urlHelpers.ts
index 868354061664..cf6352cdc0d4 100644
--- a/sdk/core/core-client-rest/src/urlHelpers.ts
+++ b/sdk/core/core-client-rest/src/urlHelpers.ts
@@ -25,12 +25,12 @@ export function buildRequestUrl(
   }
 
   for (const pathParam of pathParameters) {
-    if (options.enableUrlEncoding) {
-      const encodeParam = encodeURIComponent(pathParam);
-      path = path.replace(/{([^/]+)}/, encodeParam);   
-    } else {
-      path = path.replace(/{([^/]+)}/, pathParam); 
-    }  
+    const value = pathParam
+    if (!options.skipUrlEncoding)  {
+      encodeURIComponent(pathParam)
+    }
+
+    path = path.replace(/{([^/]+)}/, value); 
   }
 
   const url = new URL(`${baseUrl}/${path}`);
@@ -46,12 +46,7 @@ export function buildRequestUrl(
         throw new Error(`Query parameters must be able to be represented as string, ${key} can't`);
       }
       const value = param.toISOString !== undefined ? param.toISOString() : param.toString();
-      if (options.enableUrlEncoding) {
-        const encodeParam = encodeURIComponent(value);
-        url.searchParams.append(key, encodeParam);
-      } else {
-        url.searchParams.append(key, value);
-      }
+      url.searchParams.append(key, value);
       
     }
   }
diff --git a/sdk/core/core-client-rest/test/urlHelpers.spec.ts b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
index 113b332281a6..4bca95b20f0f 100644
--- a/sdk/core/core-client-rest/test/urlHelpers.spec.ts
+++ b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
@@ -58,17 +58,14 @@ describe("urlHelpers", () => {
   });
 
   it("should encode url when enable path parameter encoding", () => {
-    const result = buildRequestUrl(mockBaseUrl, "/foo bar", [], {
-      enableUrlEncoding: true
-    });
+    const result = buildRequestUrl(mockBaseUrl, "/foo bar", []);
     assert.equal(result, `https://example.org/foo%20bar`);
   });
 
   it("should encode url when enable query parameter encoding", () => {
     const result = buildRequestUrl(mockBaseUrl, "/foo", [], {
       queryParameters: { foo: ' aaaa', bar: 'b= ' },
-      enableUrlEncoding: true
     });
-    assert.equal(result, `https://example.org/foo?foo=%2520aaaa&bar=b%253D%2520`);
+    assert.equal(result, `https://example.org/foo?foo=+aaaa&bar=b%3D+`);
   });
 });

From 167d5489159793c8c7161b5bedebc8924dbd5a8c Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Fri, 29 Oct 2021 15:15:10 +0800
Subject: [PATCH 06/13] add change log

---
 sdk/core/core-client-rest/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/core/core-client-rest/CHANGELOG.md b/sdk/core/core-client-rest/CHANGELOG.md
index 31b0eaadf7e4..6f862fe82c9f 100644
--- a/sdk/core/core-client-rest/CHANGELOG.md
+++ b/sdk/core/core-client-rest/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ### Features Added
 
-- Add options to support enable path parameter encoding and query parameter encoding.
+- Add options skipUrlEncoding to support skip path parameter encoding.
 
 ## 1.0.0-beta.7 (2021-09-02)
 

From 32d3ad6dcfa028725806ba312c65ac6e9f5e9b7d Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Fri, 29 Oct 2021 15:52:09 +0800
Subject: [PATCH 07/13] update dependencies

---
 common/config/rush/pnpm-lock.yaml             | 34 +++++++++++++------
 .../agrifood-farming-rest/package.json        |  2 +-
 .../confidential-ledger-rest/package.json     |  2 +-
 sdk/core/core-client-lro-rest/package.json    |  2 +-
 sdk/core/core-client-paging-rest/package.json |  2 +-
 .../ai-document-translator-rest/package.json  |  2 +-
 sdk/purview/purview-account-rest/package.json |  2 +-
 .../purview-administration-rest/package.json  |  2 +-
 sdk/purview/purview-catalog-rest/package.json |  2 +-
 .../purview-scanning-rest/package.json        |  2 +-
 10 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 2b7484ac5575..4602451d1625 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -309,6 +309,18 @@ packages:
       - supports-color
     dev: false
 
+  /@azure-rest/core-client/1.0.0-beta.7:
+    resolution: {integrity: sha512-6+HEW4uN4SBGLxgTtIwPc/wawFYBPTSUkZ8k7OqDaz3EsWYXyYC5UHftrUgG7QFkxpjMAFlwqh9tHzXgvxozHQ==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@azure/core-auth': 1.3.2
+      '@azure/core-rest-pipeline': 1.3.1
+      '@azure/core-util': 1.0.0-beta.1
+      tslib: 2.3.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /@azure/abort-controller/1.0.4:
     resolution: {integrity: sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==}
     engines: {node: '>=8.0.0'}
@@ -1583,7 +1595,6 @@ packages:
   /@opentelemetry/node/0.22.0_@opentelemetry+api@1.0.3:
     resolution: {integrity: sha512-+HhGbDruQ7cwejVOIYyxRa28uosnG8W95NiQZ6qE8PXXPsDSyGeftAPbtYpGit0H2f5hrVcMlwmWHeAo9xkSLA==}
     engines: {node: '>=8.0.0'}
-    deprecated: Package renamed to @opentelemetry/sdk-trace-node
     peerDependencies:
       '@opentelemetry/api': ^1.0.0
     dependencies:
@@ -8247,7 +8258,7 @@ packages:
     dev: false
 
   file:projects/agrifood-farming.tgz:
-    resolution: {integrity: sha512-doOPU3+EB1HeT/+wPsN3iRalkIAm97H3z6Qp/3uXpTl73QcnhML7f3rA0If5cwtNAeD21y7lMDeqxA2fHwKjuw==, tarball: file:projects/agrifood-farming.tgz}
+    resolution: {integrity: sha512-1cHqJvKBq/d4QrENstHw3ulu9u8sg4vt70dqM6md/2FKOsH6caqL/ykmDO75qNlPQ0dHwsoi7kJFOZvB65jp0g==, tarball: file:projects/agrifood-farming.tgz}
     name: '@rush-temp/agrifood-farming'
     version: 0.0.0
     dependencies:
@@ -8348,7 +8359,7 @@ packages:
     dev: false
 
   file:projects/ai-document-translator.tgz:
-    resolution: {integrity: sha512-aVjpA7a84YiyFSakcI2FuS2iyTL51HF9S9ZLK1CLW3HB4d4/nU1zZLlj+BG6pyoTFL3lAs9rIkToNWTqRMujsQ==, tarball: file:projects/ai-document-translator.tgz}
+    resolution: {integrity: sha512-Q3mvCE8UPzt4MNyRd101Rf56LBdH3eacpH2PJ232mn9W4lxODksLpWfghRN/6irHfY8VGbknzfPg0e8eVIjSVQ==, tarball: file:projects/ai-document-translator.tgz}
     name: '@rush-temp/ai-document-translator'
     version: 0.0.0
     dependencies:
@@ -9751,7 +9762,7 @@ packages:
     dev: false
 
   file:projects/confidential-ledger.tgz:
-    resolution: {integrity: sha512-tM0C9+IHHB3iahb5JZjv7kBRlZKW7Zhfzffbq7dBK9iG7nJSwN5Lo06gjWU2CqaURKblLAoqaDCtfxd/Jjdq3A==, tarball: file:projects/confidential-ledger.tgz}
+    resolution: {integrity: sha512-OvHMdPe+wTq9LI15zcGW+Z7raltAKlPXKsbkAIsEOzMwE50XfFIEF2ljdpgonDI3Ziag3uUGXuw9He+iPVkACg==, tarball: file:projects/confidential-ledger.tgz}
     name: '@rush-temp/confidential-ledger'
     version: 0.0.0
     dependencies:
@@ -9991,7 +10002,7 @@ packages:
     dev: false
 
   file:projects/core-client-lro.tgz:
-    resolution: {integrity: sha512-KwN4VXaNjq7h7f9ks2/0vkiPronTala/qLwbIxxO5gZjRbmDpUu999lOwD/ynCFzB7hK4tDYwtxgOsOFKMPIcQ==, tarball: file:projects/core-client-lro.tgz}
+    resolution: {integrity: sha512-J/q6yM4oCI551Bm8oIZeZmHcUxEXrZi9Jd+k64tjnL7oBlNFhsnkQxGJP/5p2VHBy3Wz2dSn5qvDaf/6Z7idDg==, tarball: file:projects/core-client-lro.tgz}
     name: '@rush-temp/core-client-lro'
     version: 0.0.0
     dependencies:
@@ -10032,7 +10043,7 @@ packages:
     dev: false
 
   file:projects/core-client-paging.tgz:
-    resolution: {integrity: sha512-knla0zW4914qdG1a6+9Z16YO6LHkdRA5zNU31aE24S2h9GBRwIjqkY2nHzS4ox8BdW+jUQMq1jsglh/ZRCMOfQ==, tarball: file:projects/core-client-paging.tgz}
+    resolution: {integrity: sha512-6N2EJFde9Ar1r01pa3xj3iwnU47DR9khilFuTllI96nixFTbquAx6DZk0wIlkObDBVgMKorUu66Dgf6s1i/g2g==, tarball: file:projects/core-client-paging.tgz}
     name: '@rush-temp/core-client-paging'
     version: 0.0.0
     dependencies:
@@ -12178,7 +12189,7 @@ packages:
     dev: false
 
   file:projects/purview-account.tgz:
-    resolution: {integrity: sha512-KCHH4nNsKIKCXPC8nJ42CiEto01FIZeTJHMPT0mPvuWf9MNBVf87oWMiuyZeKCBvJNaSIct+f2WZlscwn5Aarg==, tarball: file:projects/purview-account.tgz}
+    resolution: {integrity: sha512-t8nn+ZZsiH51WBLKDLdSZei60Pct1ufYVqgB+I1mLXybrXZ3U35jxHmJ2eFc8swYb9vMIdq34ZHsFMBehMHKkw==, tarball: file:projects/purview-account.tgz}
     name: '@rush-temp/purview-account'
     version: 0.0.0
     dependencies:
@@ -12225,10 +12236,11 @@ packages:
     dev: false
 
   file:projects/purview-administration.tgz:
-    resolution: {integrity: sha512-rdQEVy2YorOtxN8HfvBymLYcB+CkH06b/w7Ye5LGRSr4dJ9PbbQgaWb1eLM97x8izbfCvXV5jnPCebNSVVV2ZQ==, tarball: file:projects/purview-administration.tgz}
+    resolution: {integrity: sha512-1UFzNhDP1JW3ZvxfPX9QaovLd6G5vAawXyAE4wdAyqcGS1zq29ZdYypKUuUZXVlkofV3LRCJHs/Bz7Z0Isz2Iw==, tarball: file:projects/purview-administration.tgz}
     name: '@rush-temp/purview-administration'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.16
       '@types/chai': 4.2.22
@@ -12271,10 +12283,11 @@ packages:
     dev: false
 
   file:projects/purview-catalog.tgz:
-    resolution: {integrity: sha512-++7byWbCn/YjRbuaT00dFATWs90UgnA3xgiKHC8IQGGjKVC+5O4RT3TysswIiVmCmUhlhyQE6snwEQyisOCY1A==, tarball: file:projects/purview-catalog.tgz}
+    resolution: {integrity: sha512-OJNZ4UoJRIUpch/cFHpy0ciX774l+xjzUT5ZZO6NTlMSjRhWROVGkTsEVyviZ1mxi3deGcD4rpIrZV52jDkKNw==, tarball: file:projects/purview-catalog.tgz}
     name: '@rush-temp/purview-catalog'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.16
       '@types/chai': 4.2.22
@@ -12317,10 +12330,11 @@ packages:
     dev: false
 
   file:projects/purview-scanning.tgz:
-    resolution: {integrity: sha512-Ns73savuHZDlXxkoUI3odSRrxrB6mbwXy67fg4afkMztZy2X+7wuFy4sI1DcqOdr9piwQ330B5F7DsGjC11Y9A==, tarball: file:projects/purview-scanning.tgz}
+    resolution: {integrity: sha512-Zbz3+Af/2Av7cAFc6zPgXXbQmkTMmjcZA+94P+3Pt+VhI+1Wi24iSO8jlMXpfG3m5fz7WpQelFh7wou2+uF3WA==, tarball: file:projects/purview-scanning.tgz}
     name: '@rush-temp/purview-scanning'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.16
       '@types/chai': 4.2.22
diff --git a/sdk/agrifood/agrifood-farming-rest/package.json b/sdk/agrifood/agrifood-farming-rest/package.json
index a61c71b4b857..34c2335514a6 100644
--- a/sdk/agrifood/agrifood-farming-rest/package.json
+++ b/sdk/agrifood/agrifood-farming-rest/package.json
@@ -85,7 +85,7 @@
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
     "@azure-rest/core-client-paging": "1.0.0-beta.1",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "@azure-rest/core-client-lro": "1.0.0-beta.1",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/confidentialledger/confidential-ledger-rest/package.json b/sdk/confidentialledger/confidential-ledger-rest/package.json
index b903232fab3f..130e58044c84 100644
--- a/sdk/confidentialledger/confidential-ledger-rest/package.json
+++ b/sdk/confidentialledger/confidential-ledger-rest/package.json
@@ -84,7 +84,7 @@
   "autoPublish": false,
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/core/core-client-lro-rest/package.json b/sdk/core/core-client-lro-rest/package.json
index e5691f52506f..ca676fd12a15 100644
--- a/sdk/core/core-client-lro-rest/package.json
+++ b/sdk/core/core-client-lro-rest/package.json
@@ -58,7 +58,7 @@
   "prettier": "@azure/eslint-plugin-azure-sdk/prettier.json",
   "dependencies": {
     "@azure/core-lro": "^2.2.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "tslib": "^2.2.0"
   },
   "devDependencies": {
diff --git a/sdk/core/core-client-paging-rest/package.json b/sdk/core/core-client-paging-rest/package.json
index 8fa4f8f47672..7c48330b9caf 100644
--- a/sdk/core/core-client-paging-rest/package.json
+++ b/sdk/core/core-client-paging-rest/package.json
@@ -62,7 +62,7 @@
   "dependencies": {
     "@azure/core-paging": "^1.2.0",
     "@azure/core-rest-pipeline": "^1.1.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "tslib": "^2.2.0"
   },
   "devDependencies": {
diff --git a/sdk/documenttranslator/ai-document-translator-rest/package.json b/sdk/documenttranslator/ai-document-translator-rest/package.json
index bc2c7f6d2db3..c4b95bfad610 100644
--- a/sdk/documenttranslator/ai-document-translator-rest/package.json
+++ b/sdk/documenttranslator/ai-document-translator-rest/package.json
@@ -89,7 +89,7 @@
   "autoPublish": false,
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-account-rest/package.json b/sdk/purview/purview-account-rest/package.json
index ee8d95e1fde6..57c635b3848c 100644
--- a/sdk/purview/purview-account-rest/package.json
+++ b/sdk/purview/purview-account-rest/package.json
@@ -84,7 +84,7 @@
   "dependencies": {
     "@azure-rest/core-client-paging": "1.0.0-beta.1",
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-administration-rest/package.json b/sdk/purview/purview-administration-rest/package.json
index 22f48f5a0c40..da228f72e0a2 100644
--- a/sdk/purview/purview-administration-rest/package.json
+++ b/sdk/purview/purview-administration-rest/package.json
@@ -86,7 +86,7 @@
   "dependencies": {
     "@azure/core-paging": "^1.1.1",
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-catalog-rest/package.json b/sdk/purview/purview-catalog-rest/package.json
index c92c1f2a9faa..f1b4702c3a88 100644
--- a/sdk/purview/purview-catalog-rest/package.json
+++ b/sdk/purview/purview-catalog-rest/package.json
@@ -86,7 +86,7 @@
   "dependencies": {
     "@azure/core-lro": "^2.2.0",
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-scanning-rest/package.json b/sdk/purview/purview-scanning-rest/package.json
index 67c811e7340c..c0f068492f58 100644
--- a/sdk/purview/purview-scanning-rest/package.json
+++ b/sdk/purview/purview-scanning-rest/package.json
@@ -85,7 +85,7 @@
   "autoPublish": false,
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.7",
+    "@azure-rest/core-client": "1.0.0-beta.8",
     "@azure/core-paging": "^1.1.1",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",

From 9e99b40811c8e8f9e5e59c27df798b1299e22f35 Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Fri, 29 Oct 2021 16:28:38 +0800
Subject: [PATCH 08/13] upate format

---
 sdk/core/core-client-rest/src/urlHelpers.ts       | 9 ++++-----
 sdk/core/core-client-rest/test/urlHelpers.spec.ts | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sdk/core/core-client-rest/src/urlHelpers.ts b/sdk/core/core-client-rest/src/urlHelpers.ts
index cf6352cdc0d4..dc7961b90e79 100644
--- a/sdk/core/core-client-rest/src/urlHelpers.ts
+++ b/sdk/core/core-client-rest/src/urlHelpers.ts
@@ -25,12 +25,12 @@ export function buildRequestUrl(
   }
 
   for (const pathParam of pathParameters) {
-    const value = pathParam
-    if (!options.skipUrlEncoding)  {
-      encodeURIComponent(pathParam)
+    let value = pathParam;
+    if (!options.skipUrlEncoding) {
+      value = encodeURIComponent(pathParam);
     }
 
-    path = path.replace(/{([^/]+)}/, value); 
+    path = path.replace(/{([^/]+)}/, value);
   }
 
   const url = new URL(`${baseUrl}/${path}`);
@@ -47,7 +47,6 @@ export function buildRequestUrl(
       }
       const value = param.toISOString !== undefined ? param.toISOString() : param.toString();
       url.searchParams.append(key, value);
-      
     }
   }
 
diff --git a/sdk/core/core-client-rest/test/urlHelpers.spec.ts b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
index 4bca95b20f0f..680b67671125 100644
--- a/sdk/core/core-client-rest/test/urlHelpers.spec.ts
+++ b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
@@ -64,7 +64,7 @@ describe("urlHelpers", () => {
 
   it("should encode url when enable query parameter encoding", () => {
     const result = buildRequestUrl(mockBaseUrl, "/foo", [], {
-      queryParameters: { foo: ' aaaa', bar: 'b= ' },
+      queryParameters: { foo: " aaaa", bar: "b= " },
     });
     assert.equal(result, `https://example.org/foo?foo=+aaaa&bar=b%3D+`);
   });

From be37ef9142b92ffd751c55686d7fcaf779454504 Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Tue, 2 Nov 2021 10:10:27 +0800
Subject: [PATCH 09/13] update according comments

---
 sdk/core/core-client-rest/CHANGELOG.md            | 2 +-
 sdk/core/core-client-rest/src/pathClientTypes.ts  | 2 +-
 sdk/core/core-client-rest/test/urlHelpers.spec.ts | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sdk/core/core-client-rest/CHANGELOG.md b/sdk/core/core-client-rest/CHANGELOG.md
index 6f862fe82c9f..d7cfbe6fa3cd 100644
--- a/sdk/core/core-client-rest/CHANGELOG.md
+++ b/sdk/core/core-client-rest/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Release History
-## 1.0.0-beta.8 (2021-10-27)
+## 1.0.0-beta.8 (Unreleased)
 
 ### Features Added
 
diff --git a/sdk/core/core-client-rest/src/pathClientTypes.ts b/sdk/core/core-client-rest/src/pathClientTypes.ts
index babfa680c18f..ed4f2f6168a1 100644
--- a/sdk/core/core-client-rest/src/pathClientTypes.ts
+++ b/sdk/core/core-client-rest/src/pathClientTypes.ts
@@ -31,7 +31,7 @@ export type RequestParameters = {
   contentType?: string;
   /** Set to true if the request is sent over HTTP instead of HTTPS */
   allowInsecureConnection?: boolean;
-  /** Set to true if you want to encode the path or query parameters */
+  /** Set to true if you want to skip encoding the path parameters */
   skipUrlEncoding?: boolean;
 };
 
diff --git a/sdk/core/core-client-rest/test/urlHelpers.spec.ts b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
index 680b67671125..a8c4d3ef3bf1 100644
--- a/sdk/core/core-client-rest/test/urlHelpers.spec.ts
+++ b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
@@ -68,4 +68,11 @@ describe("urlHelpers", () => {
     });
     assert.equal(result, `https://example.org/foo?foo=+aaaa&bar=b%3D+`);
   });
+
+  it("should encode url when skip encoding path parameter", () => {
+    const result = buildRequestUrl(mockBaseUrl, "/foo%bar", [], {
+      skipUrlEncoding: true
+    });
+    assert.equal(result, `https://example.org/foo%bar`);
+  });
 });

From 71fcc66e552cc913392e247ae0d11466765efcef Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Tue, 2 Nov 2021 10:17:57 +0800
Subject: [PATCH 10/13] update format

---
 sdk/core/core-client-rest/test/urlHelpers.spec.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sdk/core/core-client-rest/test/urlHelpers.spec.ts b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
index a8c4d3ef3bf1..bff45c4ee0f2 100644
--- a/sdk/core/core-client-rest/test/urlHelpers.spec.ts
+++ b/sdk/core/core-client-rest/test/urlHelpers.spec.ts
@@ -53,7 +53,6 @@ describe("urlHelpers", () => {
 
   it("should handle full urls as path", () => {
     const result = buildRequestUrl(mockBaseUrl, "https://example2.org", []);
-
     assert.equal(result, `https://example2.org`);
   });
 
@@ -71,7 +70,7 @@ describe("urlHelpers", () => {
 
   it("should encode url when skip encoding path parameter", () => {
     const result = buildRequestUrl(mockBaseUrl, "/foo%bar", [], {
-      skipUrlEncoding: true
+      skipUrlEncoding: true,
     });
     assert.equal(result, `https://example.org/foo%bar`);
   });

From 0a74f3994bd0a3b098b4ad99c14df054460d5c09 Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Tue, 2 Nov 2021 11:26:01 +0800
Subject: [PATCH 11/13] change back dependencies

---
 sdk/agrifood/agrifood-farming-rest/package.json                 | 2 +-
 sdk/confidentialledger/confidential-ledger-rest/package.json    | 2 +-
 sdk/core/core-client-lro-rest/package.json                      | 2 +-
 sdk/core/core-client-paging-rest/package.json                   | 2 +-
 sdk/documenttranslator/ai-document-translator-rest/package.json | 2 +-
 sdk/purview/purview-account-rest/package.json                   | 2 +-
 sdk/purview/purview-administration-rest/package.json            | 2 +-
 sdk/purview/purview-catalog-rest/package.json                   | 2 +-
 sdk/purview/purview-scanning-rest/package.json                  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sdk/agrifood/agrifood-farming-rest/package.json b/sdk/agrifood/agrifood-farming-rest/package.json
index 907efd1e749c..064b0f45ceae 100644
--- a/sdk/agrifood/agrifood-farming-rest/package.json
+++ b/sdk/agrifood/agrifood-farming-rest/package.json
@@ -85,7 +85,7 @@
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
     "@azure-rest/core-client-paging": "1.0.0-beta.1",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "@azure-rest/core-client-lro": "1.0.0-beta.1",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/confidentialledger/confidential-ledger-rest/package.json b/sdk/confidentialledger/confidential-ledger-rest/package.json
index 1ef9e245abfd..79d9b76ddb1d 100644
--- a/sdk/confidentialledger/confidential-ledger-rest/package.json
+++ b/sdk/confidentialledger/confidential-ledger-rest/package.json
@@ -84,7 +84,7 @@
   "autoPublish": false,
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/core/core-client-lro-rest/package.json b/sdk/core/core-client-lro-rest/package.json
index ca676fd12a15..e5691f52506f 100644
--- a/sdk/core/core-client-lro-rest/package.json
+++ b/sdk/core/core-client-lro-rest/package.json
@@ -58,7 +58,7 @@
   "prettier": "@azure/eslint-plugin-azure-sdk/prettier.json",
   "dependencies": {
     "@azure/core-lro": "^2.2.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "tslib": "^2.2.0"
   },
   "devDependencies": {
diff --git a/sdk/core/core-client-paging-rest/package.json b/sdk/core/core-client-paging-rest/package.json
index 7c48330b9caf..8fa4f8f47672 100644
--- a/sdk/core/core-client-paging-rest/package.json
+++ b/sdk/core/core-client-paging-rest/package.json
@@ -62,7 +62,7 @@
   "dependencies": {
     "@azure/core-paging": "^1.2.0",
     "@azure/core-rest-pipeline": "^1.1.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "tslib": "^2.2.0"
   },
   "devDependencies": {
diff --git a/sdk/documenttranslator/ai-document-translator-rest/package.json b/sdk/documenttranslator/ai-document-translator-rest/package.json
index ad81a5841138..b2cf65770699 100644
--- a/sdk/documenttranslator/ai-document-translator-rest/package.json
+++ b/sdk/documenttranslator/ai-document-translator-rest/package.json
@@ -89,7 +89,7 @@
   "autoPublish": false,
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-account-rest/package.json b/sdk/purview/purview-account-rest/package.json
index d857315348e5..50e5bd714eab 100644
--- a/sdk/purview/purview-account-rest/package.json
+++ b/sdk/purview/purview-account-rest/package.json
@@ -84,7 +84,7 @@
   "dependencies": {
     "@azure-rest/core-client-paging": "1.0.0-beta.1",
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-administration-rest/package.json b/sdk/purview/purview-administration-rest/package.json
index f8094a812aff..1211da507db4 100644
--- a/sdk/purview/purview-administration-rest/package.json
+++ b/sdk/purview/purview-administration-rest/package.json
@@ -86,7 +86,7 @@
   "dependencies": {
     "@azure/core-paging": "^1.1.1",
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-catalog-rest/package.json b/sdk/purview/purview-catalog-rest/package.json
index 839d8b642e8b..03e03ef273d7 100644
--- a/sdk/purview/purview-catalog-rest/package.json
+++ b/sdk/purview/purview-catalog-rest/package.json
@@ -86,7 +86,7 @@
   "dependencies": {
     "@azure/core-lro": "^2.2.0",
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",
     "tslib": "^2.2.0"
diff --git a/sdk/purview/purview-scanning-rest/package.json b/sdk/purview/purview-scanning-rest/package.json
index 538b09cf1df3..6c89f20f6fb1 100644
--- a/sdk/purview/purview-scanning-rest/package.json
+++ b/sdk/purview/purview-scanning-rest/package.json
@@ -85,7 +85,7 @@
   "autoPublish": false,
   "dependencies": {
     "@azure/core-auth": "^1.3.0",
-    "@azure-rest/core-client": "1.0.0-beta.8",
+    "@azure-rest/core-client": "1.0.0-beta.7",
     "@azure/core-paging": "^1.1.1",
     "@azure/core-rest-pipeline": "^1.1.0",
     "@azure/logger": "^1.0.0",

From 4ef0faa3eaf72fe7cab42d5476f694b8691e806d Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Tue, 2 Nov 2021 11:40:22 +0800
Subject: [PATCH 12/13] update pnpm-lock

---
 common/config/rush/pnpm-lock.yaml | 45 ++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 6533b4f9fc84..24d141eaaa78 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -315,6 +315,18 @@ packages:
       - supports-color
     dev: false
 
+  /@azure-rest/core-client/1.0.0-beta.7:
+    resolution: {integrity: sha512-6+HEW4uN4SBGLxgTtIwPc/wawFYBPTSUkZ8k7OqDaz3EsWYXyYC5UHftrUgG7QFkxpjMAFlwqh9tHzXgvxozHQ==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@azure/core-auth': 1.3.2
+      '@azure/core-rest-pipeline': 1.3.1
+      '@azure/core-util': 1.0.0-beta.1
+      tslib: 2.3.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /@azure/abort-controller/1.0.4:
     resolution: {integrity: sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==}
     engines: {node: '>=8.0.0'}
@@ -731,7 +743,7 @@ packages:
     resolution: {integrity: sha512-Q71Buur3RMcg6lCnisLL8Im562DBw+ybzgm+YQj/FbAaI8ZNu/zl/5z1fE4k3Q9LSIzYrz6HLRzlhdSBXpydlQ==}
     engines: {node: '>=8.0.0'}
     dependencies:
-      '@azure/core-http': 1.2.3
+      '@azure/core-http': 1.2.6
       '@azure/core-tracing': 1.0.0-preview.9
       '@azure/logger': 1.0.3
       '@azure/msal-node': 1.0.0-beta.6_debug@4.3.2
@@ -3134,7 +3146,7 @@ packages:
     resolution: {integrity: sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==}
     deprecated: Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)
     dependencies:
-      ms: 2.1.1
+      ms: 2.1.3
     dev: false
 
   /debug/3.2.7:
@@ -7911,7 +7923,7 @@ packages:
   /wide-align/1.1.5:
     resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
     dependencies:
-      string-width: 1.0.2
+      string-width: 4.2.3
     dev: false
 
   /word-wrap/1.2.3:
@@ -8186,10 +8198,11 @@ packages:
     dev: false
 
   file:projects/agrifood-farming.tgz:
-    resolution: {integrity: sha512-1cHqJvKBq/d4QrENstHw3ulu9u8sg4vt70dqM6md/2FKOsH6caqL/ykmDO75qNlPQ0dHwsoi7kJFOZvB65jp0g==, tarball: file:projects/agrifood-farming.tgz}
+    resolution: {integrity: sha512-5SL/NNg5sbTo04wrG7kF62TqoLvSuWI7tYsYpALcINxqrEqgnRBwYmYAz3ZvjPEyxUzEzMNudS3L/zI0SnHm+Q==, tarball: file:projects/agrifood-farming.tgz}
     name: '@rush-temp/agrifood-farming'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure-rest/core-client-paging': 1.0.0-beta.1
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
@@ -8286,10 +8299,11 @@ packages:
     dev: false
 
   file:projects/ai-document-translator.tgz:
-    resolution: {integrity: sha512-Q3mvCE8UPzt4MNyRd101Rf56LBdH3eacpH2PJ232mn9W4lxODksLpWfghRN/6irHfY8VGbknzfPg0e8eVIjSVQ==, tarball: file:projects/ai-document-translator.tgz}
+    resolution: {integrity: sha512-FVAn9cJBUOxsjTgb+6gRMZedXUXTOkROcQt3hugRaz5uFk8LZpAokqxjs25wT/nUNbk/ARZQ4qgmayo/Y0vuSw==, tarball: file:projects/ai-document-translator.tgz}
     name: '@rush-temp/ai-document-translator'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -9753,10 +9767,11 @@ packages:
     dev: false
 
   file:projects/confidential-ledger.tgz:
-    resolution: {integrity: sha512-OvHMdPe+wTq9LI15zcGW+Z7raltAKlPXKsbkAIsEOzMwE50XfFIEF2ljdpgonDI3Ziag3uUGXuw9He+iPVkACg==, tarball: file:projects/confidential-ledger.tgz}
+    resolution: {integrity: sha512-K7taBYr8BfWwhzPHwR/iKwPMFcbJyU93/Vjy1XfZ/wA22QD8192XBLuaPamOH3BAS7qZkzA5KtmKcwZbqveDlA==, tarball: file:projects/confidential-ledger.tgz}
     name: '@rush-temp/confidential-ledger'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -9992,10 +10007,11 @@ packages:
     dev: false
 
   file:projects/core-client-lro.tgz:
-    resolution: {integrity: sha512-J/q6yM4oCI551Bm8oIZeZmHcUxEXrZi9Jd+k64tjnL7oBlNFhsnkQxGJP/5p2VHBy3Wz2dSn5qvDaf/6Z7idDg==, tarball: file:projects/core-client-lro.tgz}
+    resolution: {integrity: sha512-14MiFwnsKK9QvQvw2HCX58K9SBbi1vwuharI1RRrGA/QE5T1vjt003O8xyOE0+VpyFhVxOBcPJAzeve+iaVlag==, tarball: file:projects/core-client-lro.tgz}
     name: '@rush-temp/core-client-lro'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
       '@types/mocha': 7.0.2
@@ -10033,10 +10049,11 @@ packages:
     dev: false
 
   file:projects/core-client-paging.tgz:
-    resolution: {integrity: sha512-6N2EJFde9Ar1r01pa3xj3iwnU47DR9khilFuTllI96nixFTbquAx6DZk0wIlkObDBVgMKorUu66Dgf6s1i/g2g==, tarball: file:projects/core-client-paging.tgz}
+    resolution: {integrity: sha512-6zYQV6oIAFUeOUZCLOQMaaOIrTxq4ZByRSK9v8y0kpJt2ONw9ZsPxeDzDl7F9/sboyw7R5I9nTBYmGHAGBD1gw==, tarball: file:projects/core-client-paging.tgz}
     name: '@rush-temp/core-client-paging'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
       '@types/mocha': 7.0.2
@@ -12162,10 +12179,11 @@ packages:
     dev: false
 
   file:projects/purview-account.tgz:
-    resolution: {integrity: sha512-t8nn+ZZsiH51WBLKDLdSZei60Pct1ufYVqgB+I1mLXybrXZ3U35jxHmJ2eFc8swYb9vMIdq34ZHsFMBehMHKkw==, tarball: file:projects/purview-account.tgz}
+    resolution: {integrity: sha512-Hy2CpT+edPfEMoOOx6R8NVfhbVPwvkeeAo79A5Sm1dDP2w3Tv59nWito5mj+LxFJh6v8WeZm3GC2s510fgWuBw==, tarball: file:projects/purview-account.tgz}
     name: '@rush-temp/purview-account'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure-rest/core-client-paging': 1.0.0-beta.1
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
@@ -12209,10 +12227,11 @@ packages:
     dev: false
 
   file:projects/purview-administration.tgz:
-    resolution: {integrity: sha512-VpnlL/dXKtfeIcrvn+2o0VU0x7EgJCH8jlRGK16IgitxpdThElh+DyeQykByUk5m5m2uDG4HQVlzq/kWIx28Fw==, tarball: file:projects/purview-administration.tgz}
+    resolution: {integrity: sha512-1UFzNhDP1JW3ZvxfPX9QaovLd6G5vAawXyAE4wdAyqcGS1zq29ZdYypKUuUZXVlkofV3LRCJHs/Bz7Z0Isz2Iw==, tarball: file:projects/purview-administration.tgz}
     name: '@rush-temp/purview-administration'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -12255,10 +12274,11 @@ packages:
     dev: false
 
   file:projects/purview-catalog.tgz:
-    resolution: {integrity: sha512-HvXivcbWQThK0KKCE48UriQzPQL7FzplrRCatKm1y9JmUGMRsDGeSf7se0p/QeHUZKaOX1wnFpOk//DlPNxeIw==, tarball: file:projects/purview-catalog.tgz}
+    resolution: {integrity: sha512-OJNZ4UoJRIUpch/cFHpy0ciX774l+xjzUT5ZZO6NTlMSjRhWROVGkTsEVyviZ1mxi3deGcD4rpIrZV52jDkKNw==, tarball: file:projects/purview-catalog.tgz}
     name: '@rush-temp/purview-catalog'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -12301,10 +12321,11 @@ packages:
     dev: false
 
   file:projects/purview-scanning.tgz:
-    resolution: {integrity: sha512-10GyHF4DJ7ACUqimz7od/1eEuEGXyzgZ6xqE4hwQq5xYiTPtK/9U+eygz1ffWzG8Z9P5PmFe8+wVobpzRZBsfw==, tarball: file:projects/purview-scanning.tgz}
+    resolution: {integrity: sha512-Zbz3+Af/2Av7cAFc6zPgXXbQmkTMmjcZA+94P+3Pt+VhI+1Wi24iSO8jlMXpfG3m5fz7WpQelFh7wou2+uF3WA==, tarball: file:projects/purview-scanning.tgz}
     name: '@rush-temp/purview-scanning'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22

From 4df227f250cbe6b924852cd017f3290ca4af570c Mon Sep 17 00:00:00 2001
From: qiaozha <qiaozha@microsoft.com>
Date: Wed, 3 Nov 2021 08:39:06 +0800
Subject: [PATCH 13/13] resolve ci failure

---
 common/config/rush/pnpm-lock.yaml | 44 ++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index a357478a3eca..27c5bc21b69a 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -317,6 +317,18 @@ packages:
       - supports-color
     dev: false
 
+  /@azure-rest/core-client/1.0.0-beta.7:
+    resolution: {integrity: sha512-6+HEW4uN4SBGLxgTtIwPc/wawFYBPTSUkZ8k7OqDaz3EsWYXyYC5UHftrUgG7QFkxpjMAFlwqh9tHzXgvxozHQ==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@azure/core-auth': 1.3.2
+      '@azure/core-rest-pipeline': 1.3.1
+      '@azure/core-util': 1.0.0-beta.1
+      tslib: 2.3.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /@azure/abort-controller/1.0.4:
     resolution: {integrity: sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw==}
     engines: {node: '>=8.0.0'}
@@ -8254,10 +8266,11 @@ packages:
     dev: false
 
   file:projects/agrifood-farming.tgz:
-    resolution: {integrity: sha512-doOPU3+EB1HeT/+wPsN3iRalkIAm97H3z6Qp/3uXpTl73QcnhML7f3rA0If5cwtNAeD21y7lMDeqxA2fHwKjuw==, tarball: file:projects/agrifood-farming.tgz}
+    resolution: {integrity: sha512-5SL/NNg5sbTo04wrG7kF62TqoLvSuWI7tYsYpALcINxqrEqgnRBwYmYAz3ZvjPEyxUzEzMNudS3L/zI0SnHm+Q==, tarball: file:projects/agrifood-farming.tgz}
     name: '@rush-temp/agrifood-farming'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure-rest/core-client-paging': 1.0.0-beta.1
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
@@ -8355,10 +8368,11 @@ packages:
     dev: false
 
   file:projects/ai-document-translator.tgz:
-    resolution: {integrity: sha512-aVjpA7a84YiyFSakcI2FuS2iyTL51HF9S9ZLK1CLW3HB4d4/nU1zZLlj+BG6pyoTFL3lAs9rIkToNWTqRMujsQ==, tarball: file:projects/ai-document-translator.tgz}
+    resolution: {integrity: sha512-FVAn9cJBUOxsjTgb+6gRMZedXUXTOkROcQt3hugRaz5uFk8LZpAokqxjs25wT/nUNbk/ARZQ4qgmayo/Y0vuSw==, tarball: file:projects/ai-document-translator.tgz}
     name: '@rush-temp/ai-document-translator'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -9364,7 +9378,7 @@ packages:
     dev: false
 
   file:projects/arm-streamanalytics.tgz:
-    resolution: {integrity: sha512-GYtEbWFfsmbKa168tVMSugSMPWBxtmxwU2f3gxq5cWOXbkP3EdUf5cTnPvWELOHwGifKuKiyC29W7YWiOWhfmQ==, tarball: file:projects/arm-streamanalytics.tgz}
+    resolution: {integrity: sha512-MhbiHP5ZomEoVlRa9KOHteLHqPOvxZfszSEZ0JgUowO9APTWrir2HLd1R+bHBpX3myNuOGV0yRtk1x661KVLgg==, tarball: file:projects/arm-streamanalytics.tgz}
     name: '@rush-temp/arm-streamanalytics'
     version: 0.0.0
     dependencies:
@@ -9382,9 +9396,6 @@ packages:
       tslib: 2.3.1
       typescript: 4.2.4
       uglify-js: 3.14.2
-    transitivePeerDependencies:
-      - debug
-      - supports-color
     dev: false
 
   file:projects/arm-templatespecs.tgz:
@@ -9860,10 +9871,11 @@ packages:
     dev: false
 
   file:projects/confidential-ledger.tgz:
-    resolution: {integrity: sha512-tM0C9+IHHB3iahb5JZjv7kBRlZKW7Zhfzffbq7dBK9iG7nJSwN5Lo06gjWU2CqaURKblLAoqaDCtfxd/Jjdq3A==, tarball: file:projects/confidential-ledger.tgz}
+    resolution: {integrity: sha512-K7taBYr8BfWwhzPHwR/iKwPMFcbJyU93/Vjy1XfZ/wA22QD8192XBLuaPamOH3BAS7qZkzA5KtmKcwZbqveDlA==, tarball: file:projects/confidential-ledger.tgz}
     name: '@rush-temp/confidential-ledger'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -10100,10 +10112,11 @@ packages:
     dev: false
 
   file:projects/core-client-lro.tgz:
-    resolution: {integrity: sha512-KwN4VXaNjq7h7f9ks2/0vkiPronTala/qLwbIxxO5gZjRbmDpUu999lOwD/ynCFzB7hK4tDYwtxgOsOFKMPIcQ==, tarball: file:projects/core-client-lro.tgz}
+    resolution: {integrity: sha512-14MiFwnsKK9QvQvw2HCX58K9SBbi1vwuharI1RRrGA/QE5T1vjt003O8xyOE0+VpyFhVxOBcPJAzeve+iaVlag==, tarball: file:projects/core-client-lro.tgz}
     name: '@rush-temp/core-client-lro'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
       '@types/mocha': 7.0.2
@@ -10141,10 +10154,11 @@ packages:
     dev: false
 
   file:projects/core-client-paging.tgz:
-    resolution: {integrity: sha512-knla0zW4914qdG1a6+9Z16YO6LHkdRA5zNU31aE24S2h9GBRwIjqkY2nHzS4ox8BdW+jUQMq1jsglh/ZRCMOfQ==, tarball: file:projects/core-client-paging.tgz}
+    resolution: {integrity: sha512-6zYQV6oIAFUeOUZCLOQMaaOIrTxq4ZByRSK9v8y0kpJt2ONw9ZsPxeDzDl7F9/sboyw7R5I9nTBYmGHAGBD1gw==, tarball: file:projects/core-client-paging.tgz}
     name: '@rush-temp/core-client-paging'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
       '@types/mocha': 7.0.2
@@ -12280,10 +12294,11 @@ packages:
     dev: false
 
   file:projects/purview-account.tgz:
-    resolution: {integrity: sha512-KCHH4nNsKIKCXPC8nJ42CiEto01FIZeTJHMPT0mPvuWf9MNBVf87oWMiuyZeKCBvJNaSIct+f2WZlscwn5Aarg==, tarball: file:projects/purview-account.tgz}
+    resolution: {integrity: sha512-Hy2CpT+edPfEMoOOx6R8NVfhbVPwvkeeAo79A5Sm1dDP2w3Tv59nWito5mj+LxFJh6v8WeZm3GC2s510fgWuBw==, tarball: file:projects/purview-account.tgz}
     name: '@rush-temp/purview-account'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure-rest/core-client-paging': 1.0.0-beta.1
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
@@ -12327,10 +12342,11 @@ packages:
     dev: false
 
   file:projects/purview-administration.tgz:
-    resolution: {integrity: sha512-rdQEVy2YorOtxN8HfvBymLYcB+CkH06b/w7Ye5LGRSr4dJ9PbbQgaWb1eLM97x8izbfCvXV5jnPCebNSVVV2ZQ==, tarball: file:projects/purview-administration.tgz}
+    resolution: {integrity: sha512-1UFzNhDP1JW3ZvxfPX9QaovLd6G5vAawXyAE4wdAyqcGS1zq29ZdYypKUuUZXVlkofV3LRCJHs/Bz7Z0Isz2Iw==, tarball: file:projects/purview-administration.tgz}
     name: '@rush-temp/purview-administration'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -12373,10 +12389,11 @@ packages:
     dev: false
 
   file:projects/purview-catalog.tgz:
-    resolution: {integrity: sha512-++7byWbCn/YjRbuaT00dFATWs90UgnA3xgiKHC8IQGGjKVC+5O4RT3TysswIiVmCmUhlhyQE6snwEQyisOCY1A==, tarball: file:projects/purview-catalog.tgz}
+    resolution: {integrity: sha512-OJNZ4UoJRIUpch/cFHpy0ciX774l+xjzUT5ZZO6NTlMSjRhWROVGkTsEVyviZ1mxi3deGcD4rpIrZV52jDkKNw==, tarball: file:projects/purview-catalog.tgz}
     name: '@rush-temp/purview-catalog'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22
@@ -12419,10 +12436,11 @@ packages:
     dev: false
 
   file:projects/purview-scanning.tgz:
-    resolution: {integrity: sha512-Ns73savuHZDlXxkoUI3odSRrxrB6mbwXy67fg4afkMztZy2X+7wuFy4sI1DcqOdr9piwQ330B5F7DsGjC11Y9A==, tarball: file:projects/purview-scanning.tgz}
+    resolution: {integrity: sha512-Zbz3+Af/2Av7cAFc6zPgXXbQmkTMmjcZA+94P+3Pt+VhI+1Wi24iSO8jlMXpfG3m5fz7WpQelFh7wou2+uF3WA==, tarball: file:projects/purview-scanning.tgz}
     name: '@rush-temp/purview-scanning'
     version: 0.0.0
     dependencies:
+      '@azure-rest/core-client': 1.0.0-beta.7
       '@azure/identity': 1.5.2
       '@microsoft/api-extractor': 7.18.17
       '@types/chai': 4.2.22