From 11df900d31ac5aae72364227faff276287d4eb08 Mon Sep 17 00:00:00 2001
From: Kamil Sobol <kasobol@microsoft.com>
Date: Wed, 2 Jun 2021 14:50:12 -0700
Subject: [PATCH] try https://github.com/Azure/autorest/pull/4152

---
 .../src/Generated/AppendBlobRestClient.cs     |  4 ---
 .../src/Generated/BlobRestClient.cs           | 26 +++----------------
 .../src/Generated/BlockBlobRestClient.cs      |  6 -----
 .../src/Generated/ContainerRestClient.cs      | 16 ------------
 .../src/Generated/PageBlobRestClient.cs       |  9 -------
 .../Azure.Storage.Blobs/src/autorest.md       |  4 +--
 6 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs
index e0b690b465493..9b91712bb9579 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs
+++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/AppendBlobRestClient.cs
@@ -53,7 +53,6 @@ internal HttpMessage CreateCreateRequest(long contentLength, int? timeout, strin
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             if (timeout != null)
             {
                 uri.AppendQuery("timeout", timeout.Value, true);
@@ -234,7 +233,6 @@ internal HttpMessage CreateAppendBlockRequest(long contentLength, Stream body, i
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "appendblock", true);
             if (timeout != null)
             {
@@ -390,7 +388,6 @@ internal HttpMessage CreateAppendBlockFromUrlRequest(string sourceUrl, long cont
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "appendblock", true);
             if (timeout != null)
             {
@@ -576,7 +573,6 @@ internal HttpMessage CreateSealRequest(int? timeout, string leaseId, DateTimeOff
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "seal", true);
             if (timeout != null)
             {
diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs
index ef5cdd0ff2f14..0d1c5f1c87245 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs
+++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs
@@ -55,7 +55,7 @@ internal HttpMessage CreateDownloadRequest(string snapshot, string versionId, in
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
+            uri.AppendPath("path:20.get", false);
             if (snapshot != null)
             {
                 uri.AppendQuery("snapshot", snapshot, true);
@@ -199,7 +199,7 @@ internal HttpMessage CreateGetPropertiesRequest(string snapshot, string versionI
             request.Method = RequestMethod.Head;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
+            uri.AppendPath("path:20.head", false);
             if (snapshot != null)
             {
                 uri.AppendQuery("snapshot", snapshot, true);
@@ -317,7 +317,7 @@ internal HttpMessage CreateDeleteRequest(string snapshot, string versionId, int?
             request.Method = RequestMethod.Delete;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
+            uri.AppendPath("path:20.delete", false);
             if (snapshot != null)
             {
                 uri.AppendQuery("snapshot", snapshot, true);
@@ -429,7 +429,6 @@ internal HttpMessage CreateUndeleteRequest(int? timeout)
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "undelete", true);
             if (timeout != null)
             {
@@ -482,7 +481,6 @@ internal HttpMessage CreateSetExpiryRequest(BlobExpiryOptions expiryOptions, int
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "expiry", true);
             if (timeout != null)
             {
@@ -544,7 +542,6 @@ internal HttpMessage CreateSetHttpHeadersRequest(int? timeout, string blobCacheC
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "properties", true);
             if (timeout != null)
             {
@@ -669,7 +666,6 @@ internal HttpMessage CreateSetImmutabilityPolicyRequest(int? timeout, DateTimeOf
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "immutabilityPolicies", true);
             if (timeout != null)
             {
@@ -740,7 +736,6 @@ internal HttpMessage CreateDeleteImmutabilityPolicyRequest(int? timeout)
             request.Method = RequestMethod.Delete;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "immutabilityPolicies", true);
             if (timeout != null)
             {
@@ -793,7 +788,6 @@ internal HttpMessage CreateSetLegalHoldRequest(bool legalHold, int? timeout)
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "legalhold", true);
             if (timeout != null)
             {
@@ -849,7 +843,6 @@ internal HttpMessage CreateSetMetadataRequest(int? timeout, IDictionary<string,
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "metadata", true);
             if (timeout != null)
             {
@@ -968,7 +961,6 @@ internal HttpMessage CreateAcquireLeaseRequest(int? timeout, long? duration, str
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             if (timeout != null)
             {
@@ -1064,7 +1056,6 @@ internal HttpMessage CreateReleaseLeaseRequest(string leaseId, int? timeout, Dat
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             if (timeout != null)
             {
@@ -1163,7 +1154,6 @@ internal HttpMessage CreateRenewLeaseRequest(string leaseId, int? timeout, DateT
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             if (timeout != null)
             {
@@ -1262,7 +1252,6 @@ internal HttpMessage CreateChangeLeaseRequest(string leaseId, string proposedLea
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             if (timeout != null)
             {
@@ -1372,7 +1361,6 @@ internal HttpMessage CreateBreakLeaseRequest(int? timeout, long? breakPeriod, Da
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             if (timeout != null)
             {
@@ -1462,7 +1450,6 @@ internal HttpMessage CreateCreateSnapshotRequest(int? timeout, IDictionary<strin
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "snapshot", true);
             if (timeout != null)
             {
@@ -1581,7 +1568,6 @@ internal HttpMessage CreateStartCopyFromURLRequest(string copySource, int? timeo
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             if (timeout != null)
             {
                 uri.AppendQuery("timeout", timeout.Value, true);
@@ -1762,7 +1748,6 @@ internal HttpMessage CreateCopyFromURLRequest(string copySource, int? timeout, I
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             if (timeout != null)
             {
                 uri.AppendQuery("timeout", timeout.Value, true);
@@ -1932,7 +1917,6 @@ internal HttpMessage CreateAbortCopyFromURLRequest(string copyId, int? timeout,
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "copy", true);
             uri.AppendQuery("copyid", copyId, true);
             if (timeout != null)
@@ -2007,7 +1991,6 @@ internal HttpMessage CreateSetTierRequest(AccessTier tier, string snapshot, stri
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "tier", true);
             if (snapshot != null)
             {
@@ -2096,7 +2079,6 @@ internal HttpMessage CreateQueryRequest(string snapshot, int? timeout, string le
             request.Method = RequestMethod.Post;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "query", true);
             if (snapshot != null)
             {
@@ -2226,7 +2208,6 @@ internal HttpMessage CreateGetTagsRequest(int? timeout, string snapshot, string
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "tags", true);
             if (timeout != null)
             {
@@ -2319,7 +2300,6 @@ internal HttpMessage CreateSetTagsRequest(int? timeout, string versionId, byte[]
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "tags", true);
             if (timeout != null)
             {
diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs
index 87b4d06dafef7..b31753f471789 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs
+++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlockBlobRestClient.cs
@@ -54,7 +54,6 @@ internal HttpMessage CreateUploadRequest(long contentLength, Stream body, int? t
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             if (timeout != null)
             {
                 uri.AppendQuery("timeout", timeout.Value, true);
@@ -264,7 +263,6 @@ internal HttpMessage CreatePutBlobFromUrlRequest(long contentLength, string copy
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             if (timeout != null)
             {
                 uri.AppendQuery("timeout", timeout.Value, true);
@@ -492,7 +490,6 @@ internal HttpMessage CreateStageBlockRequest(string blockId, long contentLength,
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "block", true);
             uri.AppendQuery("blockid", blockId, true);
             if (timeout != null)
@@ -617,7 +614,6 @@ internal HttpMessage CreateStageBlockFromURLRequest(string blockId, long content
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "block", true);
             uri.AppendQuery("blockid", blockId, true);
             if (timeout != null)
@@ -770,7 +766,6 @@ internal HttpMessage CreateCommitBlockListRequest(BlockLookupList blocks, int? t
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "blocklist", true);
             if (timeout != null)
             {
@@ -985,7 +980,6 @@ internal HttpMessage CreateGetBlockListRequest(BlockListType listType, string sn
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "blocklist", true);
             if (snapshot != null)
             {
diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs
index 099b05fe3fb9c..4221298f55770 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs
+++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/ContainerRestClient.cs
@@ -54,7 +54,6 @@ internal HttpMessage CreateCreateRequest(int? timeout, IDictionary<string, strin
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
             {
@@ -131,7 +130,6 @@ internal HttpMessage CreateGetPropertiesRequest(int? timeout, string leaseId)
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
             {
@@ -190,7 +188,6 @@ internal HttpMessage CreateDeleteRequest(int? timeout, string leaseId, DateTimeO
             request.Method = RequestMethod.Delete;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
             {
@@ -261,7 +258,6 @@ internal HttpMessage CreateSetMetadataRequest(int? timeout, string leaseId, IDic
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "metadata", true);
             if (timeout != null)
@@ -333,7 +329,6 @@ internal HttpMessage CreateGetAccessPolicyRequest(int? timeout, string leaseId)
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "acl", true);
             if (timeout != null)
@@ -419,7 +414,6 @@ internal HttpMessage CreateSetAccessPolicyRequest(int? timeout, string leaseId,
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "acl", true);
             if (timeout != null)
@@ -511,7 +505,6 @@ internal HttpMessage CreateRestoreRequest(int? timeout, string deletedContainerN
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "undelete", true);
             if (timeout != null)
@@ -577,7 +570,6 @@ internal HttpMessage CreateRenameRequest(string sourceContainerName, int? timeou
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "rename", true);
             if (timeout != null)
@@ -652,7 +644,6 @@ internal HttpMessage CreateSubmitBatchRequest(long contentLength, string multipa
             request.Method = RequestMethod.Post;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "batch", true);
             if (timeout != null)
@@ -741,7 +732,6 @@ internal HttpMessage CreateAcquireLeaseRequest(int? timeout, long? duration, str
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
@@ -820,7 +810,6 @@ internal HttpMessage CreateReleaseLeaseRequest(string leaseId, int? timeout, Dat
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
@@ -902,7 +891,6 @@ internal HttpMessage CreateRenewLeaseRequest(string leaseId, int? timeout, DateT
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
@@ -984,7 +972,6 @@ internal HttpMessage CreateBreakLeaseRequest(int? timeout, long? breakPeriod, Da
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
@@ -1057,7 +1044,6 @@ internal HttpMessage CreateChangeLeaseRequest(string leaseId, string proposedLea
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "lease", true);
             uri.AppendQuery("restype", "container", true);
             if (timeout != null)
@@ -1150,7 +1136,6 @@ internal HttpMessage CreateListBlobFlatSegmentRequest(string prefix, string mark
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "list", true);
             if (prefix != null)
@@ -1244,7 +1229,6 @@ internal HttpMessage CreateListBlobHierarchySegmentRequest(string prefix, string
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("restype", "container", true);
             uri.AppendQuery("comp", "list", true);
             if (prefix != null)
diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs
index d188cb5ea0432..a4cc70537fb6c 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs
+++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/PageBlobRestClient.cs
@@ -54,7 +54,6 @@ internal HttpMessage CreateCreateRequest(long contentLength, long blobContentLen
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             if (timeout != null)
             {
                 uri.AppendQuery("timeout", timeout.Value, true);
@@ -250,7 +249,6 @@ internal HttpMessage CreateUploadPagesRequest(long contentLength, Stream body, b
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "page", true);
             if (timeout != null)
             {
@@ -419,7 +417,6 @@ internal HttpMessage CreateClearPagesRequest(long contentLength, int? timeout, s
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "page", true);
             if (timeout != null)
             {
@@ -559,7 +556,6 @@ internal HttpMessage CreateUploadPagesFromURLRequest(string sourceUrl, string so
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "page", true);
             if (timeout != null)
             {
@@ -766,7 +762,6 @@ internal HttpMessage CreateGetPageRangesRequest(string snapshot, int? timeout, s
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "pagelist", true);
             if (snapshot != null)
             {
@@ -883,7 +878,6 @@ internal HttpMessage CreateGetPageRangesDiffRequest(string snapshot, int? timeou
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "pagelist", true);
             if (snapshot != null)
             {
@@ -1012,7 +1006,6 @@ internal HttpMessage CreateResizeRequest(long blobContentLength, int? timeout, s
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "properties", true);
             if (timeout != null)
             {
@@ -1128,7 +1121,6 @@ internal HttpMessage CreateUpdateSequenceNumberRequest(SequenceNumberAction sequ
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "properties", true);
             if (timeout != null)
             {
@@ -1226,7 +1218,6 @@ internal HttpMessage CreateCopyIncrementalRequest(string copySource, int? timeou
             request.Method = RequestMethod.Put;
             var uri = new RawRequestUriBuilder();
             uri.AppendRaw(url, false);
-            uri.AppendPath("/", false);
             uri.AppendQuery("comp", "incrementalcopy", true);
             if (timeout != null)
             {
diff --git a/sdk/storage/Azure.Storage.Blobs/src/autorest.md b/sdk/storage/Azure.Storage.Blobs/src/autorest.md
index c98e373421fa8..74dc57c568f99 100644
--- a/sdk/storage/Azure.Storage.Blobs/src/autorest.md
+++ b/sdk/storage/Azure.Storage.Blobs/src/autorest.md
@@ -128,14 +128,14 @@ directive:
         if (property.includes('/{containerName}/{blob}'))
         {
             var oldName = property;
-            var newName = property.replace('/{containerName}/{blob}', '/');
+            var newName = property.replace('/{containerName}/{blob}', '');
             $[newName] = $[oldName];
             delete $[oldName];
         } 
         else if (property.includes('/{containerName}'))
         {
             var oldName = property;
-            var newName = property.replace('/{containerName}', '/');
+            var newName = property.replace('/{containerName}', '');
             $[newName] = $[oldName];
             delete $[oldName];
         }