Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev

Author: gucalder

README.md

@@ -3,8 +3,8 @@
 
 This repository contains a set of PowerShell cmdlets for developers and administrators to develop, deploy and manage Microsoft Azure applications.
 
-* For documentation on how to build and deploy applications to Microsoft Azure please see the [Microsoft Azure Documentation Center](http://azure.microsoft.com/en-us/documentation/).
-* For comprehensive documentation on the developer cmdlets see [How to install and configure Azure PowerShell](http://azure.microsoft.com/en-us/documentation/articles/install-configure-powershell/).
+* For documentation on how to build and deploy applications to Microsoft Azure please see the [Microsoft Azure Documentation Center](https://azure.microsoft.com/en-us/documentation/).
+* For comprehensive documentation on the developer cmdlets see [How to install and configure Azure PowerShell](https://azure.microsoft.com/en-us/documentation/articles/install-configure-powershell/).
 * For comprehensive documentation on the full set of Microsoft Azure cmdlets see [Microsoft Azure Management Center](http://go.microsoft.com/fwlink/?linkID=254459&clcid=0x409).
 
 ## Features
@@ -55,17 +55,17 @@ For detail descriptions and examples of the cmdlets, type
 
 ## Supported Environments
 
-* [Microsoft Azure](http://www.azure.microsoft.com)
+* [Microsoft Azure](https://azure.microsoft.com)
 * [Azure Stack](https://azure.microsoft.com/en-us/overview/azure-stack/)
-* [Windows Azure Pack](http://www.microsoft.com/en-us/server-cloud/windows-azure-pack.aspx)
-* [Microsoft Azure China](http://www.windowsazure.cn/)
+* [Windows Azure Pack](https://www.microsoft.com/en-us/server-cloud/windows-azure-pack.aspx)
+* [Microsoft Azure China](https://www.azure.cn/)
 * [USGovernment](https://azure.microsoft.com/en-us/features/gov/)
 
 ## Installation
 
 ### Microsoft Web Platform Installer
 
-1. Install [Microsoft Web Platform Installer](http://www.microsoft.com/web/downloads/platform.aspx).
+1. Install [Microsoft Web Platform Installer](https://www.microsoft.com/web/downloads/platform.aspx).
 2. Open Microsoft Web Platform Installer and search for __Microsoft Azure PowerShell__.
 3. Install.
 
@@ -84,15 +84,15 @@ You can also find the standalone installers for all the versions at [Downloads](
 
 ### Supported PowerShell Versions
 
-* [Windows Management Framework 3] (http://www.microsoft.com/en-us/download/details.aspx?id=34595)
+* [Windows Management Framework 3] (https://www.microsoft.com/en-us/download/details.aspx?id=34595)
 * [Windows Management Framework 4] (https://www.microsoft.com/en-us/download/details.aspx?id=40855)
 * [Windows Management Framework 5] (https://www.microsoft.com/en-us/download/details.aspx?id=50395)
 
 ## Get Started
 
 In general, following are the steps to start using Microsoft Azure PowerShell
 
-* Get yourself authenticated with Microsoft Azure. For details, please check out [this article](http://azure.microsoft.com/en-us/documentation/articles/install-configure-powershell/).
+* Get yourself authenticated with Microsoft Azure. For details, please check out [this article](https://azure.microsoft.com/en-us/documentation/articles/install-configure-powershell/).
   * Option 1: Login with your Microsoft account or Organizational account directly from PowerShell. Microsoft Azure Active Directory authentication is used in this case. No management certificate is needed.
       * Starting from 1.0.0, you can use ```Add-AzureRmAccount -Credential``` to avoid the browser pop up for Organizational account.
       * To use RDFE cmdlets, use ```Add-AzureAccount```
@@ -120,7 +120,7 @@ New-AzureRmResourceGroup -Name myresourceGroup -Location "West US"
 Add-AzureRmAccount -EnvironmentName AzureChinaCloud
 
 # use the cmdlets to manage your services/applications
-New-AzureRmResourceGroup -Name myresourceGroup -Location "Chine East"
+New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
 ```
 
 ### Windows Azure Pack
@@ -181,10 +181,10 @@ Be sure to check out the [Microsoft Azure Developer Forums on Stack Overflow](ht
 
 ## Contribute Code or Provide Feedback
 
-If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
+If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](https://azure.github.io/guidelines/).
 
 If you encounter any bugs with the library please file an issue in the [Issues](https://github.com/Azure/azure-powershell/issues) section of the project.
 
 # Learn More
 
-* [Microsoft Azure Script Center](http://www.azure.microsoft.com/en-us/documentation/scripts/)
+* [Microsoft Azure Script Center](https://azure.microsoft.com/en-us/documentation/scripts/)

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTestBase.cs

@@ -24,6 +24,7 @@
 using System.Net.Security;
 using System.Reflection;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests
 {
@@ -58,6 +59,14 @@ protected void SetupManagementClients()
 
         protected void RunPowerShellTest(params string[] scripts)
         {
+            Dictionary<string, string> d = new Dictionary<string, string>();
+            d.Add("Microsoft.Resources", null);
+            d.Add("Microsoft.Features", null);
+            d.Add("Microsoft.Authorization", null);
+            d.Add("Microsoft.Compute", null);
+            var providersToIgnore = new Dictionary<string, string>();
+            providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
+            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
             using (UndoContext context = UndoContext.Current)
             {
                 context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/Constants.cs

@@ -54,6 +54,11 @@ public static class Constants
         /// </summary>
         public static readonly string DefaultApiVersion = "2015-01-01";
 
+        /// <summary>
+        /// The default policy API version.
+        /// </summary>
+        public static readonly string PolicyApiVersion = "2015-10-01-preview";
+
         /// <summary>
         /// The move action.
         /// </summary>

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyAssignment.cs

@@ -100,17 +100,13 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
         {
             string resourceId = this.Id ?? this.GetResourceId();
 
-            var apiVersion = await this
-                .DetermineApiVersion(resourceId: resourceId)
-                .ConfigureAwait(continueOnCapturedContext: false);
-
             if (IsResourceGet(resourceId))
             {
                 var resource = await this
                     .GetResourcesClient()
                     .GetResource<JObject>(
                         resourceId: resourceId,
-                        apiVersion: apiVersion,
+                        apiVersion: Constants.PolicyApiVersion,
                         cancellationToken: this.CancellationToken.Value,
                         odataQuery: null)
                     .ConfigureAwait(continueOnCapturedContext: false);
@@ -126,7 +122,7 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
                     .GetResourcesClient()
                     .ListObjectColleciton<JObject>(
                         resourceCollectionId: resourceId,
-                        apiVersion: apiVersion,
+                        apiVersion: Constants.PolicyApiVersion,
                         cancellationToken: this.CancellationToken.Value,
                         odataQuery: filter)
                     .ConfigureAwait(continueOnCapturedContext: false);
@@ -141,7 +137,7 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
                     .GetResourcesClient()
                     .ListObjectColleciton<JObject>(
                         resourceCollectionId: resourceId,
-                        apiVersion: apiVersion,
+                        apiVersion: Constants.PolicyApiVersion,
                         cancellationToken: this.CancellationToken.Value,
                         odataQuery: filter)
                     .ConfigureAwait(continueOnCapturedContext: false);

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyDefinition.cs

@@ -85,17 +85,13 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
         {
             string resourceId = this.Id ?? this.GetResourceId();
 
-            var apiVersion = await this
-                .DetermineApiVersion(resourceId: resourceId)
-                .ConfigureAwait(continueOnCapturedContext: false);
-
             if (!string.IsNullOrEmpty(ResourceIdUtility.GetResourceName(resourceId)))
             {
                 var resource = await this
                     .GetResourcesClient()
                     .GetResource<JObject>(
                         resourceId: resourceId,
-                        apiVersion: apiVersion,
+                        apiVersion: Constants.PolicyApiVersion,
                         cancellationToken: this.CancellationToken.Value)
                     .ConfigureAwait(continueOnCapturedContext: false);
                 ResponseWithContinuation<JObject[]> retVal;
@@ -109,7 +105,7 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
                 .GetResourcesClient()
                 .ListObjectColleciton<JObject>(
                     resourceCollectionId: resourceId,
-                    apiVersion: apiVersion,
+                    apiVersion: Constants.PolicyApiVersion,
                     cancellationToken: this.CancellationToken.Value)
                 .ConfigureAwait(continueOnCapturedContext: false);
             }

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyAssignment.cs

@@ -68,12 +68,11 @@ protected override void OnProcessRecord()
                 throw new PSInvalidOperationException("The supplied PolicyDefinition object is invalid.");
             }
             string resourceId = GetResourceId();
-            var apiVersion = this.DetermineApiVersion(resourceId: resourceId).Result;
 
             var operationResult = this.GetResourcesClient()
                 .PutResource(
                     resourceId: resourceId,
-                    apiVersion: apiVersion,
+                    apiVersion: Constants.PolicyApiVersion,
                     resource: this.GetResource(),
                     cancellationToken: this.CancellationToken.Value,
                     odataQuery: null)
@@ -82,7 +81,7 @@ protected override void OnProcessRecord()
             var managementUri = this.GetResourcesClient()
               .GetResourceManagementRequestUri(
                   resourceId: resourceId,
-                  apiVersion: apiVersion,
+                  apiVersion: Constants.PolicyApiVersion,
                   odataQuery: null);
 
             var activity = string.Format("PUT {0}", managementUri.PathAndQuery);

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyDefinition.cs

@@ -66,12 +66,11 @@ protected override void OnProcessRecord()
         {
             base.OnProcessRecord();
             string resourceId = GetResourceId();
-            var apiVersion = this.DetermineApiVersion(resourceId: resourceId).Result;
 
             var operationResult = this.GetResourcesClient()
                 .PutResource(
                     resourceId: resourceId,
-                    apiVersion: apiVersion,
+                    apiVersion: Constants.PolicyApiVersion,
                     resource: this.GetResource(),
                     cancellationToken: this.CancellationToken.Value,
                     odataQuery: null)
@@ -80,7 +79,7 @@ protected override void OnProcessRecord()
             var managementUri = this.GetResourcesClient()
               .GetResourceManagementRequestUri(
                   resourceId: resourceId,
-                  apiVersion: apiVersion,
+                  apiVersion: Constants.PolicyApiVersion,
                   odataQuery: null);
 
             var activity = string.Format("PUT {0}", managementUri.PathAndQuery);

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/RemoveAzurePolicyAssignment.cs

@@ -85,20 +85,18 @@ private void RunCmdlet()
                 resourceId,
                 () =>
                 {
-                    var apiVersion = this.DetermineApiVersion(resourceId: resourceId).Result;
-
                     var operationResult = this.GetResourcesClient()
                         .DeleteResource(
                             resourceId: resourceId,
-                            apiVersion: apiVersion,
+                            apiVersion: Constants.PolicyApiVersion,
                             cancellationToken: this.CancellationToken.Value,
                             odataQuery: null)
                         .Result;
 
                     var managementUri = this.GetResourcesClient()
                         .GetResourceManagementRequestUri(
                             resourceId: resourceId,
-                            apiVersion: apiVersion,
+                            apiVersion: Constants.PolicyApiVersion,
                             odataQuery: null);
 
                     var activity = string.Format("DELETE {0}", managementUri.PathAndQuery);

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/RemoveAzurePolicyDefinition.cs

@@ -78,20 +78,18 @@ private void RunCmdlet()
                 resourceId,
                 () =>
                 {
-                    var apiVersion = this.DetermineApiVersion(resourceId: resourceId).Result;
-
                     var operationResult = this.GetResourcesClient()
                         .DeleteResource(
                             resourceId: resourceId,
-                            apiVersion: apiVersion,
+                            apiVersion: Constants.PolicyApiVersion,
                             cancellationToken: this.CancellationToken.Value,
                             odataQuery: null)
                         .Result;
 
                     var managementUri = this.GetResourcesClient()
                         .GetResourceManagementRequestUri(
                             resourceId: resourceId,
-                            apiVersion: apiVersion,
+                            apiVersion: Constants.PolicyApiVersion,
                             odataQuery: null);
 
                     var activity = string.Format("DELETE {0}", managementUri.PathAndQuery);

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicyAssignment.cs

@@ -76,21 +76,20 @@ protected override void OnProcessRecord()
         {
             base.OnProcessRecord();
             string resourceId = this.Id ?? this.GetResourceId();
-            var apiVersion = this.DetermineApiVersion(resourceId: resourceId).Result;
 
             var operationResult = this.GetResourcesClient()
                         .PutResource(
                             resourceId: resourceId,
-                            apiVersion: apiVersion,
-                            resource: this.GetResource(resourceId, apiVersion),
+                            apiVersion: Constants.PolicyApiVersion,
+                            resource: this.GetResource(resourceId, Constants.PolicyApiVersion),
                             cancellationToken: this.CancellationToken.Value,
                             odataQuery: null)
                         .Result;
 
             var managementUri = this.GetResourcesClient()
               .GetResourceManagementRequestUri(
                   resourceId: resourceId,
-                  apiVersion: apiVersion,
+                  apiVersion: Constants.PolicyApiVersion,
                   odataQuery: null);
 
             var activity = string.Format("PUT {0}", managementUri.PathAndQuery);

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicyDefinition.cs

@@ -84,21 +84,20 @@ protected override void OnProcessRecord()
         {
             base.OnProcessRecord();
             string resourceId = this.Id ?? this.GetResourceId();
-            var apiVersion = this.DetermineApiVersion(resourceId: resourceId).Result;
 
             var operationResult = this.GetResourcesClient()
                         .PutResource(
                             resourceId: resourceId,
-                            apiVersion: apiVersion,
-                            resource: this.GetResource(resourceId, apiVersion),
+                            apiVersion: Constants.PolicyApiVersion,
+                            resource: this.GetResource(resourceId, Constants.PolicyApiVersion),
                             cancellationToken: this.CancellationToken.Value,
                             odataQuery: null)
                         .Result;
 
             var managementUri = this.GetResourcesClient()
               .GetResourceManagementRequestUri(
                   resourceId: resourceId,
-                  apiVersion: apiVersion,
+                  apiVersion: Constants.PolicyApiVersion,
                   odataQuery: null);
 
             var activity = string.Format("PUT {0}", managementUri.PathAndQuery);