.

src/Common/Commands.Common.Storage/AzureContextExtensions.cs

@@ -0,0 +1,82 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using Microsoft.WindowsAzure.Commands.Common;
+using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.WindowsAzure.Commands.Common.Storage;
+using ArmStorage = Microsoft.Azure.Management.Storage;
+using SmStorage = Microsoft.WindowsAzure.Management.Storage;
+using Microsoft.WindowsAzure.Storage;
+using Microsoft.Azure.Common.Authentication;
+using Microsoft.WindowsAzure.Storage.Auth;
+
+namespace Microsoft.WindowsAzure.Commands.Utilities.Common
+{
+    public static class AzureContextExtensions
+    {
+        /// <summary>
+        /// Set the current storage account using the given connection string
+        /// </summary>
+        /// <param name="context">The current context.</param>
+        /// <param name="connectionString">The connection string to check.</param>
+        public static void SetCurrentStorageAccount(this AzureContext context, string connectionString)
+        {
+            if (context.Subscription != null)
+            {
+                context.Subscription.SetProperty(AzureSubscription.Property.StorageAccount, connectionString);
+            }
+        }
+
+        /// <summary>
+        /// Set the current storage account using the given connection string.
+        /// </summary>
+        /// <param name="context">The current context.</param>
+        /// <param name="account">A storage account.</param>
+        public static void SetCurrentStorageAccount(this AzureContext context, IStorageContextProvider account)
+        {
+            if (context.Subscription != null && account != null && account.Context != null 
+                && account.Context.StorageAccount != null)
+            {
+                context.SetCurrentStorageAccount(account.Context.StorageAccount.ToString(true));
+            }
+        }
+
+        /// <summary>
+        /// Get the current storage account.
+        /// </summary>
+        /// <param name="context">The current context.</param>
+        /// <returns>The current storage account, or null, if no current storage account is set.</returns>
+        public static CloudStorageAccount GetCurrentStorageAccount(this AzureContext context)
+        {
+            if (context != null && context.Subscription != null)
+            {
+                try
+                {
+                    return
+                        CloudStorageAccount.Parse(
+                            context.Subscription.GetProperty(AzureSubscription.Property.StorageAccount));
+                }
+                catch
+                {
+                    // return null if we could not parse the connection string
+                }
+            }
+
+            return null;
+        }
+
+    }
+}

src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

@@ -67,6 +67,10 @@
       <HintPath>..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.Azure.Management.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -161,15 +165,18 @@
     <Compile Include="AzureStorageContext.cs" />
     <Compile Include="BlobUploadParameters.cs" />
     <Compile Include="IStorageClientWrapper.cs" />
+    <Compile Include="IStorageContextProvider.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="StorageClientWrapper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="StorageIdentity.cs" />
     <Compile Include="StorageUtilities.cs" />
     <Compile Include="WindowsAzureSubscriptionExtensions.cs" />
+    <Compile Include="AzureContextExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -180,6 +187,12 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Commands.Common\Commands.Common.csproj">
+      <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
+      <Name>Commands.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
 </Project>

src/Common/Commands.Common.Storage/IStorageContextProvider.cs

@@ -0,0 +1,30 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.WindowsAzure.Commands.Common.Storage
+{
+    public interface IStorageContextProvider
+    {
+        AzureStorageContext Context
+        {
+            get;
+        }
+    }
+}

src/Common/Commands.Common.Storage/StorageIdentity.cs

@@ -0,0 +1,42 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.WindowsAzure.Commands.Common.Storage
+{
+    public class StorageIdentity
+    {
+        private const string StorageIdentityRegex =
+            "/subscriptions/([^/]+)/resourceGroups/([^/]+)/microsoft.storage/storageAccounts/(\\w+)";
+        public StorageIdentity(string identity)
+        {
+            var matcher = new Regex(StorageIdentityRegex);
+            var result = matcher.Match(identity);
+            if (!result.Success || result.Groups == null || result.Groups.Count < 3)
+            {
+                throw new InvalidOperationException(string.Format("Cannot find resource grpoup name and storage account name from resource identity {0}", identity));
+            }
+
+            this.ResourceGroupName = result.Groups[1].Value;
+            this.StorageAccountName = result.Groups[2].Value;
+        }
+
+        public string ResourceGroupName { get; private set; }
+
+        public string StorageAccountName { get; private set; }
+    }
+}

src/Common/Commands.Common.Storage/StorageUtilities.cs

@@ -1,4 +1,9 @@
 
+using System.CodeDom;
+using System.Diagnostics.Eventing.Reader;
+using System.Text;
+using Microsoft.Azure.Management.Storage;
+
 namespace Microsoft.WindowsAzure.Commands.Common.Storage
 {
     using System;
@@ -8,6 +13,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage
     using Microsoft.WindowsAzure.Storage.Auth;
     using Microsoft.WindowsAzure.Storage.Blob;
     using Microsoft.WindowsAzure.Storage.Table;
+    using  Arm = Microsoft.Azure.Management.Storage;
 
     public class StorageUtilities
     {
@@ -26,38 +32,143 @@ public static Uri CreateHttpsEndpoint(string endpointUri)
             return new Uri(endpoint);
         }
 
-        public static CloudStorageAccount GenerateCloudStorageAccount(StorageManagementClient storageClient, string accountName)
+        /// <summary>
+        /// Create a cloud storage account using an ARM storage management client
+        /// </summary>
+        /// <param name="storageClient">The client to use to get storage account details.</param>
+        /// <param name="resourceGroupName">The resource group contining the storage account.</param>
+        /// <param name="accountName">The name of the storage account.</param>
+        /// <returns>A CloudStorageAccount that can be used by windows azure storage library to manipulate objects in the storage account.</returns>
+        public static CloudStorageAccount GenerateCloudStorageAccount(Arm.IStorageManagementClient storageClient,
+            string resourceGroupName, string accountName)
         {
-            var storageServiceResponse = storageClient.StorageAccounts.Get(accountName);
-            var storageKeysResponse = storageClient.StorageAccounts.GetKeys(accountName);
-
-            Uri fileEndpoint = null;
-            Uri blobEndpoint = null;
-            Uri queueEndpoint = null;
-            Uri tableEndpoint = null;
+            if (!TestMockSupport.RunningMocked)
+            {
+                var storageServiceResponse = storageClient.StorageAccounts.GetProperties(resourceGroupName, accountName);
+                Uri blobEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Blob;
+                Uri queueEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Queue;
+                Uri tableEndpoint = storageServiceResponse.StorageAccount.PrimaryEndpoints.Table;
+                return new CloudStorageAccount(
+                    GenerateStorageCredentials(storageClient, resourceGroupName, accountName),
+                    blobEndpoint,
+                    queueEndpoint,
+                    tableEndpoint, null);
+            }
+            else
+            {
+                return new CloudStorageAccount(
+                    new StorageCredentials(accountName,
+                        Convert.ToBase64String(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString()))),
+                    new Uri(string.Format("https://{0}.blob.core.windows.net", accountName)),
+                    new Uri(string.Format("https://{0}.queue.core.windows.net", accountName)),
+                    new Uri(string.Format("https://{0}.table.core.windows.net", accountName)),
+                    null);
+            }
+        }
 
-            if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 4)
+        /// <summary>
+        /// Create a cloud storage account using a service management storage client
+        /// </summary>
+        /// <param name="storageClient">The client to use to get storage account details.</param>
+        /// <param name="accountName">The name of the storage account.</param>
+        /// <returns>A CloudStorageAccount that can be used by windows azure storage library to manipulate objects in the storage account.</returns>
+        public static CloudStorageAccount GenerateCloudStorageAccount(IStorageManagementClient storageClient, string accountName)
+        {
+            if (!TestMockSupport.RunningMocked)
             {
-                fileEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[3].ToString());
+                var storageServiceResponse = storageClient.StorageAccounts.Get(accountName);
+
+                Uri fileEndpoint = null;
+                Uri blobEndpoint = null;
+                Uri queueEndpoint = null;
+                Uri tableEndpoint = null;
+
+                if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 4)
+                {
+                    fileEndpoint =
+                        StorageUtilities.CreateHttpsEndpoint(
+                            storageServiceResponse.StorageAccount.Properties.Endpoints[3].ToString());
+                }
+
+                if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 3)
+                {
+                    tableEndpoint =
+                        StorageUtilities.CreateHttpsEndpoint(
+                            storageServiceResponse.StorageAccount.Properties.Endpoints[2].ToString());
+                    queueEndpoint =
+                        StorageUtilities.CreateHttpsEndpoint(
+                            storageServiceResponse.StorageAccount.Properties.Endpoints[1].ToString());
+                }
+
+                if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 1)
+                {
+                    blobEndpoint =
+                        StorageUtilities.CreateHttpsEndpoint(
+                            storageServiceResponse.StorageAccount.Properties.Endpoints[0].ToString());
+                }
+
+                return new CloudStorageAccount(
+                    GenerateStorageCredentials(storageClient, storageServiceResponse.StorageAccount.Name),
+                    blobEndpoint,
+                    queueEndpoint,
+                    tableEndpoint,
+                    fileEndpoint);
             }
-
-            if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 3)
+            else
             {
-                tableEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[2].ToString());
-                queueEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[1].ToString());
+                return new CloudStorageAccount(
+                    new StorageCredentials(accountName,
+                        Convert.ToBase64String(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString()))),
+                    new Uri(string.Format("https://{0}.blob.core.windows.net", accountName)),
+                    new Uri(string.Format("https://{0}.queue.core.windows.net", accountName)),
+                    new Uri(string.Format("https://{0}.table.core.windows.net", accountName)),
+                    new Uri(string.Format("https://{0}.file.core.windows.net", accountName)));
             }
+       }
 
-            if (storageServiceResponse.StorageAccount.Properties.Endpoints.Count >= 1)
+        /// <summary>
+        /// Create storage credentials for the given account
+        /// </summary>
+        /// <param name="storageClient">The ARM storage management client.</param>
+        /// <param name="resourceGroupName">The resource group containing the storage account.</param>
+        /// <param name="accountName">The storage account name.</param>
+        /// <returns>Storage credentials for the given account.</returns>
+        public static StorageCredentials GenerateStorageCredentials(Arm.IStorageManagementClient storageClient,
+            string resourceGroupName, string accountName)
+        {
+            if (!TestMockSupport.RunningMocked)
+            {
+                var storageKeysResponse = storageClient.StorageAccounts.ListKeys(resourceGroupName, accountName);
+                return new StorageCredentials(accountName,
+                    storageKeysResponse.StorageAccountKeys.Key1);
+            }
+            else
             {
-                blobEndpoint = StorageUtilities.CreateHttpsEndpoint(storageServiceResponse.StorageAccount.Properties.Endpoints[0].ToString());
+                return new StorageCredentials(accountName,
+                    Convert.ToBase64String(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())));
             }
+        }
 
-            return new CloudStorageAccount(
-                new StorageCredentials(storageServiceResponse.StorageAccount.Name, storageKeysResponse.PrimaryKey),
-                blobEndpoint,
-                queueEndpoint,
-                tableEndpoint,
-                fileEndpoint);
+        /// <summary>
+        /// Create storage credentials for the given account
+        /// </summary>
+        /// <param name="storageClient">The RDFE storage management client.</param>
+        /// <param name="accountName">The storage account name.</param>
+        /// <returns>Storage credentials for the given account.</returns>
+         public static StorageCredentials GenerateStorageCredentials(IStorageManagementClient storageClient,
+            string accountName)
+        {
+            if (!TestMockSupport.RunningMocked)
+            {
+                var storageKeysResponse = storageClient.StorageAccounts.GetKeys(accountName);
+                return new StorageCredentials(accountName,
+                    storageKeysResponse.PrimaryKey);
+            }
+            else
+            {
+                return new StorageCredentials(accountName,
+                    Convert.ToBase64String(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())));
+            }
         }
 
         public static string GenerateTableStorageSasUrl(string connectionString, string tableName, DateTime expiryTime, SharedAccessTablePermissions permissions)