Merge branch 'release-1.0.0-preview' of https://github.com/Azure/azure-powershell into release-1.0.0-preview

Author: hyonholee

setup-powershellget/Setup/ShortcutStartup.ps1

@@ -97,8 +97,6 @@ To use Azure Service Management cmdlets please execute the following cmdlet:
   Install-Module Azure
 "@
 		Write-Output $welcomeMessage
-
-		$VerbosePreference = "Continue"
 	}
 }
 catch 

setup-powershellget/azurecmd.wxs

@@ -5,7 +5,7 @@
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.10.0" ?>
+  <?define version="1.0.0" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>
 

src/Common/Commands.Common/AzureSubscriptionExtensions.cs

@@ -0,0 +1,60 @@
+// ----------------------------------------------------------------------------------
+//
+// 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;
+using Microsoft.Azure.Common.Authentication.Models;
+
+namespace Microsoft.WindowsAzure.Commands.Common
+{
+    public static class AzureSubscriptionExtensions
+    {
+        
+        public static string GetStorageAccountName(this AzureSubscription subscription)
+        {
+            if (subscription == null || !subscription.IsPropertySet(AzureSubscription.Property.StorageAccount))
+            {
+                return null;
+            }
+
+            var result = subscription.GetProperty(AzureSubscription.Property.StorageAccount);
+            if (!string.IsNullOrWhiteSpace(result))
+            {
+                try
+                {
+                    var pairs = result.Split(new char[]{';'}, StringSplitOptions.RemoveEmptyEntries);
+                    foreach (var pair in pairs)
+                    {
+                        var sides = pair.Split(new char[] {'='}, 2, StringSplitOptions.RemoveEmptyEntries);
+                        if (string.Equals("AccountName", sides[0].Trim(), StringComparison.OrdinalIgnoreCase))
+                        {
+                            result = sides[1].Trim();
+                            break;
+                        }
+                    }
+                }
+                catch
+                {
+                    // if there are any errors, return the unchanged account name
+                }
+            }
+
+            return result;
+        }
+
+    }
+}

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

@@ -148,6 +148,7 @@
     <Compile Include="AzurePowerShell.cs" />
     <Compile Include="AzureRmProfileProvider.cs" />
     <Compile Include="AzureSMProfileProvder.cs" />
+    <Compile Include="AzureSubscriptionExtensions.cs" />
     <Compile Include="Constants.cs" />
     <Compile Include="ContextExtensions.cs" />
     <Compile Include="IProfileProvider.cs" />

src/Common/Storage/Azure.Storage.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Automation/AzureRM.Automation.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -43,11 +43,16 @@ static AzureRMCmdlet()
            }
         }
 
+        /// <summary>
+        /// Creates new instance from AzureRMCmdlet and add the RPRegistration handler.
+        /// </summary>
         public AzureRMCmdlet()
         {
             AzureSession.ClientFactory.RemoveHandler(typeof(RPRegistrationDelegatingHandler));
             AzureSession.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
-                () => AzureSession.ClientFactory.CreateClient<ResourceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager),
+                () => new ResourceManagementClient(
+                    AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager),
+                    DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager)),
                 s => _debugMessages.Enqueue(s)));
         }
 

src/ResourceManager/Common/Commands.ResourceManager.Common/RPRegistrationDelegatingHandler.cs

@@ -48,8 +48,6 @@ public RPRegistrationDelegatingHandler(Func<ResourceManagementClient> createClie
 
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            ResourceManagementClient = createClient();
-
             HttpResponseMessage responseMessage = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
             if (IsProviderNotRegistereError(responseMessage))
             {
@@ -61,6 +59,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                     registeredProviders.Add(providerName);
                     try
                     {
+                        ResourceManagementClient = createClient();
                         writeDebug(string.Format(Resources.ResourceProviderRegisterAttempt, providerName));
                         ResourceManagementClient.Providers.Register(providerName);
                         Provider provider = null;

src/ResourceManager/Compute/AzureRM.Compute.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = '0a83c907-1ffb-4d87-a492-c65ac7d7ed37'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = 'e3c0f6bc-fe96-41a0-88f4-5e490a91f05d'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Dns/AzureRM.Dns.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = '5e5ed8bc-27bf-4380-9de1-4b22ba0920b2'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = '3fd1475f-cb23-4ffb-bf08-33d94b7d1acb'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Insights/AzureRM.Insights.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = '698c387c-bd6b-41c6-82ce-721f1ef39548'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.10'  
+ModuleVersion = '0.10.0' 
 
 # ID used to uniquely identify this module  
 GUID = 'fa236c1f-6464-4d6a-a48d-db47c0e7923d'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.10' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/AddAzureKeyVaultKey.cs

@@ -34,7 +34,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// 4 .Create a HSM or software key by importing key material with given key 
     /// attributes
     /// </summary>
-    [Cmdlet(VerbsCommon.Add, "AzureRmKeyVaultKey",
+    [Cmdlet(VerbsCommon.Add, "AzureKeyVaultKey",
         DefaultParameterSetName = CreateParameterSet, 
         HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(KeyBundle))]

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// <summary>
     /// Requests that a backup of the specified key be downloaded and stored to a file
     /// </summary>
-    [Cmdlet(VerbsData.Backup, "AzureRmKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsData.Backup, "AzureKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(String))]
     public class BackupAzureKeyVaultKey : KeyVaultCmdletBase
     {

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultKey.cs

@@ -21,7 +21,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmKeyVaultKey",
+    [Cmdlet(VerbsCommon.Get, "AzureKeyVaultKey",
         DefaultParameterSetName = ByVaultNameParameterSet, 
         HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(List<KeyIdentityItem>), typeof(KeyBundle))]

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultSecret.cs

@@ -21,7 +21,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmKeyVaultSecret",
+    [Cmdlet(VerbsCommon.Get, "AzureKeyVaultSecret",
         DefaultParameterSetName = ByVaultNameParameterSet, 
         HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(List<SecretIdentityItem>), typeof(Secret))]

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultKey.cs

@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureRmKeyVaultKey", 
+    [Cmdlet(VerbsCommon.Remove, "AzureKeyVaultKey", 
         SupportsShouldProcess = true,
         ConfirmImpact = ConfirmImpact.High, 
         HelpUri = Constants.KeyVaultHelpUri)]

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultSecret.cs

@@ -20,7 +20,7 @@
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
-    [Cmdlet(VerbsCommon.Remove, "AzureRmKeyVaultSecret",
+    [Cmdlet(VerbsCommon.Remove, "AzureKeyVaultSecret",
         SupportsShouldProcess = true,
         ConfirmImpact = ConfirmImpact.High, 
         HelpUri = Constants.KeyVaultHelpUri)]

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultKey.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// <summary>
     /// Restores the backup key into a vault 
     /// </summary>
-    [Cmdlet(VerbsData.Restore, "AzureRmKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsData.Restore, "AzureKeyVaultKey", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(KeyBundle))]
     public class RestoreAzureKeyVaultKey : KeyVaultCmdletBase
     {

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/SetAzureKeyVaultKeyAttribute.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     /// Update attribute of a key vault key.
     /// </summary>
     [Alias("Set-AzureKeyVaultKey")]
-    [Cmdlet(VerbsCommon.Set, "AzureRmKeyVaultKeyAttribute", HelpUri = Constants.KeyVaultHelpUri)]
+    [Cmdlet(VerbsCommon.Set, "AzureKeyVaultKeyAttribute", HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(KeyBundle))]
     public class SetAzureKeyVaultKeyAttribute : KeyVaultCmdletBase
     {