Merge pull request Azure#8175 from wastoresh/accountname

Maddie Clayton · web-flow · commit dd7fd4899b29 · 2018-12-19T20:20:55.000-08:00
[Storage] Fix the context StorageAccountName and URI of blob snapshot sas token
diff --git a/src/ResourceManager/Storage/Commands.Storage.Test/Common/Cmdlet/StorageContextDisconnectedTests.cs b/src/ResourceManager/Storage/Commands.Storage.Test/Common/Cmdlet/StorageContextDisconnectedTests.cs
@@ -384,7 +384,7 @@ public void CanCreateStorageContextSASToken_SmNull_RmNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[SasToken]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
@@ -417,7 +417,7 @@ public void CanCreateStorageContextSASToken_SmNull_RmNotNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[SasToken]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
@@ -451,7 +451,7 @@ public void CanCreateStorageContextSASToken_SmNotNull_RmNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[SasToken]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
@@ -485,7 +485,7 @@ public void CanCreateStorageContextSASToken_SmNotNull_RmNotNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[SasToken]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
@@ -518,7 +518,7 @@ public void CanCreateStorageContextAnonymous_SmNull_RmNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[Anonymous]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
@@ -551,7 +551,7 @@ public void CanCreateStorageContextAnonymous_SmNull_RmNotNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[Anonymous]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
@@ -585,7 +585,7 @@ public void CanCreateStorageContextAnonymous_SmNotNull_RmNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[Anonymous]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
@@ -619,7 +619,7 @@ public void CanCreateStorageContextAnonymous_SmNotNull_RmNotNull()
                 Assert.NotNull(output);
                 var storageContext = output.First() as AzureStorageContext;
                 Assert.NotNull(storageContext);
-                Assert.Equal("[Anonymous]", storageContext.StorageAccountName);
+                Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);
             }
             finally
             {
diff --git a/src/ResourceManager/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs b/src/ResourceManager/Storage/Commands.Storage/Blob/Cmdlet/NewAzureStorageBlobSasToken.cs
@@ -161,7 +161,16 @@ public override void ExecuteCmdlet()
 
             if (FullUri)
             {
-                string fullUri = blob.Uri.ToString() + sasToken;
+                string fullUri = blob.SnapshotQualifiedUri.ToString();
+                if (blob.IsSnapshot)
+                {
+                    // Since snapshot URL already has '?', need remove '?' in the first char of sas
+                    fullUri = fullUri + "&" + sasToken.Substring(1);
+                }
+                else
+                {
+                    fullUri = fullUri + sasToken;
+                }
                 WriteObject(fullUri);
             }
             else
diff --git a/src/ResourceManager/Storage/Commands.Storage/ChangeLog.md b/src/ResourceManager/Storage/Commands.Storage/ChangeLog.md
@@ -18,6 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Set the StorageAccountName of Storage context as the real Storage Account Name, when it's created with Sas Token, OAuth or Anonymous 
+    - New-AzStorageContext
+* Create Sas Token of Blob Snapshot Object with '-FullUri' parameter, fix the returned Uri to be the sanpshot Uri
+    - New-AzStorageBlobSASToken
 
 ## Version 1.0.0
 * General availability of `Az.Storage` module
diff --git a/src/ResourceManager/Storage/Commands.Storage/Common/AzureStorageContext.cs b/src/ResourceManager/Storage/Commands.Storage/Common/AzureStorageContext.cs
@@ -130,7 +130,7 @@ public string ConnectionString {
         /// Create a storage context usign cloud storage account
         /// </summary>
         /// <param name="account">cloud storage account</param>
-        public AzureStorageContext(CloudStorageAccount account)
+        public AzureStorageContext(CloudStorageAccount account, string accountName = null)
         {
             StorageAccount = account;
 
@@ -154,7 +154,7 @@ public AzureStorageContext(CloudStorageAccount account)
                 FileEndPoint = account.FileEndpoint.ToString();
             }
 
-            StorageAccountName = account.Credentials.AccountName;
+            StorageAccountName = string.IsNullOrEmpty(accountName) ? account.Credentials.AccountName : accountName;
             Context = this;
             Name = String.Empty;
 
diff --git a/src/ResourceManager/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs b/src/ResourceManager/Storage/Commands.Storage/Common/Cmdlet/NewAzureStorageContext.cs
@@ -575,7 +575,7 @@ public override void ExecuteCmdlet()
                     throw new ArgumentException(Resources.DefaultStorageCredentialsNotFound);
             }
 
-            AzureStorageContext context = new AzureStorageContext(account);
+            AzureStorageContext context = new AzureStorageContext(account, StorageAccountName);
             WriteObject(context);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ public void CanCreateStorageContextSASToken_SmNull_RmNull()`
`384`	`384`	`Assert.NotNull(output);`
`385`	`385`	`var storageContext = output.First() as AzureStorageContext;`
`386`	`386`	`Assert.NotNull(storageContext);`
`387`		`- Assert.Equal("[SasToken]", storageContext.StorageAccountName);`
	`387`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`388`	`388`	`}`
`389`	`389`	`finally`
`390`	`390`	`{`
`@@ -417,7 +417,7 @@ public void CanCreateStorageContextSASToken_SmNull_RmNotNull()`
`417`	`417`	`Assert.NotNull(output);`
`418`	`418`	`var storageContext = output.First() as AzureStorageContext;`
`419`	`419`	`Assert.NotNull(storageContext);`
`420`		`- Assert.Equal("[SasToken]", storageContext.StorageAccountName);`
	`420`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`421`	`421`	`}`
`422`	`422`	`finally`
`423`	`423`	`{`
`@@ -451,7 +451,7 @@ public void CanCreateStorageContextSASToken_SmNotNull_RmNull()`
`451`	`451`	`Assert.NotNull(output);`
`452`	`452`	`var storageContext = output.First() as AzureStorageContext;`
`453`	`453`	`Assert.NotNull(storageContext);`
`454`		`- Assert.Equal("[SasToken]", storageContext.StorageAccountName);`
	`454`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`455`	`455`	`}`
`456`	`456`	`finally`
`457`	`457`	`{`
`@@ -485,7 +485,7 @@ public void CanCreateStorageContextSASToken_SmNotNull_RmNotNull()`
`485`	`485`	`Assert.NotNull(output);`
`486`	`486`	`var storageContext = output.First() as AzureStorageContext;`
`487`	`487`	`Assert.NotNull(storageContext);`
`488`		`- Assert.Equal("[SasToken]", storageContext.StorageAccountName);`
	`488`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`489`	`489`	`}`
`490`	`490`	`finally`
`491`	`491`	`{`
`@@ -518,7 +518,7 @@ public void CanCreateStorageContextAnonymous_SmNull_RmNull()`
`518`	`518`	`Assert.NotNull(output);`
`519`	`519`	`var storageContext = output.First() as AzureStorageContext;`
`520`	`520`	`Assert.NotNull(storageContext);`
`521`		`- Assert.Equal("[Anonymous]", storageContext.StorageAccountName);`
	`521`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`522`	`522`	`}`
`523`	`523`	`finally`
`524`	`524`	`{`
`@@ -551,7 +551,7 @@ public void CanCreateStorageContextAnonymous_SmNull_RmNotNull()`
`551`	`551`	`Assert.NotNull(output);`
`552`	`552`	`var storageContext = output.First() as AzureStorageContext;`
`553`	`553`	`Assert.NotNull(storageContext);`
`554`		`- Assert.Equal("[Anonymous]", storageContext.StorageAccountName);`
	`554`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`555`	`555`	`}`
`556`	`556`	`finally`
`557`	`557`	`{`
`@@ -585,7 +585,7 @@ public void CanCreateStorageContextAnonymous_SmNotNull_RmNull()`
`585`	`585`	`Assert.NotNull(output);`
`586`	`586`	`var storageContext = output.First() as AzureStorageContext;`
`587`	`587`	`Assert.NotNull(storageContext);`
`588`		`- Assert.Equal("[Anonymous]", storageContext.StorageAccountName);`
	`588`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`589`	`589`	`}`
`590`	`590`	`finally`
`591`	`591`	`{`
`@@ -619,7 +619,7 @@ public void CanCreateStorageContextAnonymous_SmNotNull_RmNotNull()`
`619`	`619`	`Assert.NotNull(output);`
`620`	`620`	`var storageContext = output.First() as AzureStorageContext;`
`621`	`621`	`Assert.NotNull(storageContext);`
`622`		`- Assert.Equal("[Anonymous]", storageContext.StorageAccountName);`
	`622`	`+ Assert.Equal(cmdlet.StorageAccountName, storageContext.StorageAccountName);`
`623`	`623`	`}`
`624`	`624`	`finally`
`625`	`625`	`{`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public string ConnectionString {`
`130`	`130`	`/// Create a storage context usign cloud storage account`
`131`	`131`	`/// </summary>`
`132`	`132`	`/// <param name="account">cloud storage account</param>`
`133`		`- public AzureStorageContext(CloudStorageAccount account)`
	`133`	`+ public AzureStorageContext(CloudStorageAccount account, string accountName = null)`
`134`	`134`	`{`
`135`	`135`	`StorageAccount = account;`
`136`	`136`
`@@ -154,7 +154,7 @@ public AzureStorageContext(CloudStorageAccount account)`
`154`	`154`	`FileEndPoint = account.FileEndpoint.ToString();`
`155`	`155`	`}`
`156`	`156`
`157`		`- StorageAccountName = account.Credentials.AccountName;`
	`157`	`+ StorageAccountName = string.IsNullOrEmpty(accountName) ? account.Credentials.AccountName : accountName;`
`158`	`158`	`Context = this;`
`159`	`159`	`Name = String.Empty;`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ public override void ExecuteCmdlet()`
`575`	`575`	`throw new ArgumentException(Resources.DefaultStorageCredentialsNotFound);`
`576`	`576`	`}`
`577`	`577`
`578`		`- AzureStorageContext context = new AzureStorageContext(account);`
	`578`	`+ AzureStorageContext context = new AzureStorageContext(account, StorageAccountName);`
`579`	`579`	`WriteObject(context);`
`580`	`580`	`}`
`581`	`581`	`}`