Merge pull request #8331 from mentat9/master

Fixes for help, #7522 and #5747
Azure · Jan 18, 2019 · 0a3985f · 0a3985f
2 parents 89eea9c + a3e3a4f
commit 0a3985f
Show file tree

Hide file tree

Showing 13 changed files with 22,233 additions and 472 deletions.
diff --git a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicyDefinition.cs
@@ -15,6 +15,7 @@
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.ErrorResponses;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
     using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
@@ -110,15 +111,35 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
 
             if (!string.IsNullOrEmpty(ResourceIdUtility.GetResourceName(resourceId)))
             {
-                var resource = await this
-                    .GetResourcesClient()
-                    .GetResource<JObject>(
-                        resourceId: resourceId,
-                        apiVersion: apiVersion,
-                        cancellationToken: this.CancellationToken.Value)
-                    .ConfigureAwait(continueOnCapturedContext: false);
-                ResponseWithContinuation<JObject[]> retVal;
-                return resource.TryConvertTo(out retVal) && retVal.Value != null
+                JObject resource;
+                try
+                {
+                    resource = await this
+                        .GetResourcesClient()
+                        .GetResource<JObject>(
+                            resourceId: resourceId,
+                            apiVersion: apiVersion,
+                            cancellationToken: this.CancellationToken.Value)
+                        .ConfigureAwait(continueOnCapturedContext: false);
+                }
+                catch (ErrorResponseMessageException ex)
+                {
+                    if (!ex.Message.StartsWith("PolicyDefinitionNotFound", StringComparison.OrdinalIgnoreCase))
+                    {
+                        throw;
+                    }
+
+                    resourceId = this.GetBuiltinResourceId();
+                    resource = await this
+                        .GetResourcesClient()
+                        .GetResource<JObject>(
+                            resourceId: resourceId,
+                            apiVersion: apiVersion,
+                            cancellationToken: this.CancellationToken.Value)
+                        .ConfigureAwait(continueOnCapturedContext: false);
+                }
+
+                return resource.TryConvertTo(out ResponseWithContinuation<JObject[]> retVal) && retVal.Value != null
                     ? retVal
                     : new ResponseWithContinuation<JObject[]> { Value = resource.AsArray() };
             }
@@ -141,5 +162,13 @@ private string GetResourceId()
         {
             return this.Id ?? this.MakePolicyDefinitionId(this.ManagementGroupName, this.SubscriptionId, this.Name);
         }
+
+        /// <summary>
+        /// Gets the resource Id assuming the name is for a builtin
+        /// </summary>
+        private string GetBuiltinResourceId()
+        {
+            return $"/{Constants.Providers}/{Constants.MicrosoftAuthorizationPolicyDefinitionType}/{this.Name}";
+        }
     }
 }
diff --git a/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicySetDefinition.cs b/src/Resources/ResourceManager/Implementation/Policy/GetAzurePolicySetDefinition.cs
@@ -15,6 +15,7 @@
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
 {
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.ErrorResponses;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
     using Microsoft.Azure.Commands.ResourceManager.Common;
     using Newtonsoft.Json.Linq;
@@ -110,15 +111,35 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
 
             if (!string.IsNullOrEmpty(ResourceIdUtility.GetResourceName(resourceId)))
             {
-                var resource = await this
-                    .GetResourcesClient()
-                    .GetResource<JObject>(
-                        resourceId: resourceId,
-                        apiVersion: apiVersion,
-                        cancellationToken: this.CancellationToken.Value)
-                    .ConfigureAwait(continueOnCapturedContext: false);
-                ResponseWithContinuation<JObject[]> retVal;
-                return resource.TryConvertTo(out retVal) && retVal.Value != null
+                JObject resource;
+                try
+                {
+                    resource = await this
+                        .GetResourcesClient()
+                        .GetResource<JObject>(
+                            resourceId: resourceId,
+                            apiVersion: apiVersion,
+                            cancellationToken: this.CancellationToken.Value)
+                        .ConfigureAwait(continueOnCapturedContext: false);
+                }
+                catch (ErrorResponseMessageException ex)
+                {
+                    if (!ex.Message.StartsWith("PolicySetDefinitionNotFound", StringComparison.OrdinalIgnoreCase))
+                    {
+                        throw;
+                    }
+
+                    resourceId = this.GetBuiltinResourceId();
+                    resource = await this
+                        .GetResourcesClient()
+                        .GetResource<JObject>(
+                            resourceId: resourceId,
+                            apiVersion: apiVersion,
+                            cancellationToken: this.CancellationToken.Value)
+                        .ConfigureAwait(continueOnCapturedContext: false);
+                }
+
+                return resource.TryConvertTo(out ResponseWithContinuation<JObject[]> retVal) && retVal.Value != null
                     ? retVal
                     : new ResponseWithContinuation<JObject[]> { Value = resource.AsArray() };
             }
@@ -141,5 +162,13 @@ private string GetResourceId()
         {
             return this.Id ?? this.MakePolicySetDefinitionId(this.ManagementGroupName, this.SubscriptionId, this.Name);
         }
+
+        /// <summary>
+        /// Gets the resource Id assuming the name is for a builtin
+        /// </summary>
+        private string GetBuiltinResourceId()
+        {
+            return $"/{Constants.Providers}/{Constants.MicrosoftAuthorizationPolicySetDefinitionType}/{this.Name}";
+        }
     }
 }
diff --git a/src/Resources/ResourceManager/Implementation/Policy/PolicyCmdletBase.cs b/src/Resources/ResourceManager/Implementation/Policy/PolicyCmdletBase.cs
@@ -88,7 +88,7 @@ protected PSObject[] GetFilteredOutputObjects(string resourceType, ListFilter fi
                     return true;
                 }
 
-                var policyType = result.GetPSObjectProperty("Properties.policyType");
+                var policyType = ((PSObject)result.Properties["Properties"].Value).Properties["policyType"].Value;
                 return policyType == null || string.Equals(policyType.ToString(), filter.ToString(), StringComparison.OrdinalIgnoreCase);
             };
 

diff --git a/src/Resources/Resources.Test/ScenarioTests/PolicyTests.cs b/src/Resources/Resources.Test/ScenarioTests/PolicyTests.cs
@@ -115,6 +115,20 @@ public void TestPolicyDefinitionWithUri()
             TestRunner.RunTestScript("Test-PolicyDefinitionWithUri");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetCmdletFilterParameter()
+        {
+            TestRunner.RunTestScript("Test-GetCmdletFilterParameter");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetBuiltinsByName()
+        {
+            TestRunner.RunTestScript("Test-GetBuiltinsByName");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetPolicyAssignmentParameters()

diff --git a/src/Resources/Resources.Test/ScenarioTests/PolicyTests.ps1 b/src/Resources/Resources.Test/ScenarioTests/PolicyTests.ps1
@@ -658,9 +658,6 @@ function Test-PolicyDefinitionCRUDAtManagementGroup
     Assert-NotNull($actual.Properties.PolicyRule)
     Assert-AreEqual $expected.Properties.Mode $actual.Properties.Mode
 
-    # make sure it can't be retrieved at default subscription level
-    Assert-ThrowsContains { Get-AzureRMPolicyDefinition -Name $policyName } "PolicyDefinitionNotFound : The policy definition '$policyName' could not be found."
-
     # update the same policy definition, get it back and validate the new properties
     $actual = Set-AzureRMPolicyDefinition -Name $policyName -ManagementGroupName $managementGroup -DisplayName testDisplay -Description $updatedDescription -Policy ".\SamplePolicyDefinition.json" -Metadata $metadata
     $expected = Get-AzureRMPolicyDefinition -Name $policyName -ManagementGroupName $managementGroup 
@@ -741,9 +738,6 @@ function Test-PolicySetDefinitionCRUDAtManagementGroup
     Assert-AreEqual $expected.PolicySetDefinitionId $actual.PolicySetDefinitionId
     Assert-NotNull($actual.Properties.PolicyDefinitions)
 
-    # make sure it can't be retrieved at default subscription level
-    Assert-ThrowsContains { Get-AzureRMPolicySetDefinition -Name $policySetDefName } "PolicySetDefinitionNotFound : The policy set definition '$policySetDefName' could not be found."
-
     # update the policy set definition, get it back and validate
     $expected = Set-AzureRMPolicySetDefinition -Name $policySetDefName -ManagementGroupName $managementGroup -DisplayName testDisplay -Description $updatedDescription
     $actual = Get-AzureRMPolicySetDefinition -Name $policySetDefName -ManagementGroupName $managementGroup
@@ -808,6 +802,48 @@ function Test-PolicySetDefinitionCRUDAtSubscription
     Assert-AreEqual True $remove
 }
 
+function Test-GetCmdletFilterParameter
+{
+    # policy definitions
+    $builtins = Get-AzureRmPolicyDefinition -Builtin
+    $builtins | %{ Assert-AreEqual $_.Properties.PolicyType "Builtin" }
+
+    $custom = Get-AzureRmPolicyDefinition -Custom
+    $custom | %{ Assert-AreEqual $_.Properties.PolicyType "Custom" }
+
+    $all = Get-AzureRmPolicyDefinition
+    Assert-AreEqual ($builtins.Count + $custom.Count) $all.Count
+
+    # policy set definitions
+    $builtins = Get-AzureRmPolicySetDefinition -Builtin
+    $builtins | %{ Assert-AreEqual $_.Properties.PolicyType "Builtin" }
+
+    $custom = Get-AzureRmPolicySetDefinition -Custom
+    $custom | %{ Assert-AreEqual $_.Properties.PolicyType "Custom" }
+
+    $all = Get-AzureRmPolicySetDefinition
+    Assert-AreEqual ($builtins.Count + $custom.Count) $all.Count
+}
+
+function Test-GetBuiltinsByName
+{
+    # policy definitions
+    $builtins = Get-AzureRmPolicyDefinition -Builtin
+    foreach ($builtin in $builtins)
+    {
+        $definition = Get-AzureRmPolicyDefinition -Name $builtin.Name
+        Assert-AreEqual $builtin.ResourceId $definition.ResourceId
+    }
+
+    # policy set definitions
+    $builtins = Get-AzureRmPolicySetDefinition -Builtin
+    foreach ($builtin in $builtins)
+    {
+        $setDefinition = Get-AzureRmPolicySetDefinition -Name $builtin.Name
+        Assert-AreEqual $builtin.ResourceId $setDefinition.ResourceId
+    }
+}
+
 <#
 The following section contains tests for each cmdlet that validate as many combinations of
 parameters as possible/reasonable. Tests for all combinations of parameters are present here
@@ -1015,7 +1051,7 @@ function Test-GetPolicyDefinitionParameters
     Assert-ThrowsContains { Get-AzureRmPolicyDefinition -Name $someName -Id $someId -Custom } $parameterSetError
 
     # validate remaining parameter combinations starting with -Id
-    Assert-ThrowsContains { Get-AzureRmPolicyDefinition -Id $goodId } $policyDefinitionNotFound
+    $ok = Get-AzureRmPolicyDefinition -Id $goodId
     Assert-ThrowsContains { Get-AzureRmPolicyDefinition -Id $goodId -ManagementGroupName $someManagementGroup } $parameterSetError
     Assert-ThrowsContains { Get-AzureRmPolicyDefinition -Id $goodId -SubscriptionId $subscriptionId } $parameterSetError
     Assert-ThrowsContains { Get-AzureRmPolicyDefinition -Id $goodId -BuiltIn } $parameterSetError
@@ -1159,7 +1195,7 @@ function Test-GetPolicySetDefinitionParameters
     Assert-ThrowsContains { Get-AzureRmPolicySetDefinition -Name $someName -Id $someId -Custom } $parameterSetError
 
     # validate remaining parameter combinations starting with -Id
-    Assert-ThrowsContains { Get-AzureRmPolicySetDefinition -Id $goodId } $policySetDefinitionNotFound
+    $ok = Get-AzureRmPolicySetDefinition -Id $goodId
     Assert-ThrowsContains { Get-AzureRmPolicySetDefinition -Id $goodId -ManagementGroupName $someManagementGroup } $parameterSetError
     Assert-ThrowsContains { Get-AzureRmPolicySetDefinition -Id $goodId -SubscriptionId $subscriptionId } $parameterSetError
     Assert-ThrowsContains { Get-AzureRmPolicySetDefinition -Id $goodId -BuiltIn } $parameterSetError

diff --git a/...rosoft.Azure.Commands.Resources.Test.ScenarioTests.PolicyTests/TestGetBuiltinsByName.json b/...rosoft.Azure.Commands.Resources.Test.ScenarioTests.PolicyTests/TestGetBuiltinsByName.json
diff --git a/...Azure.Commands.Resources.Test.ScenarioTests.PolicyTests/TestGetCmdletFilterParameter.json b/...Azure.Commands.Resources.Test.ScenarioTests.PolicyTests/TestGetCmdletFilterParameter.json
diff --git a/....Commands.Resources.Test.ScenarioTests.PolicyTests/TestGetPolicyDefinitionParameters.json b/....Commands.Resources.Test.ScenarioTests.PolicyTests/TestGetPolicyDefinitionParameters.json
diff --git a/...mmands.Resources.Test.ScenarioTests.PolicyTests/TestGetPolicySetDefinitionParameters.json b/...mmands.Resources.Test.ScenarioTests.PolicyTests/TestGetPolicySetDefinitionParameters.json