Update tests for PolicyInsights (Azure#5772)

* Add tests for policyEvaluationDetails * Correct AssemblyVersion
mentat9 · Jun 10, 2019 · 8065534 · 8065534
1 parent 88a344b
commit 8065534
Show file tree

Hide file tree

Showing 36 changed files with 253 additions and 74 deletions.
diff --git a/...hts/Management/Management.PolicyInsights/Microsoft.Azure.Management.PolicyInsights.csproj b/...hts/Management/Management.PolicyInsights/Microsoft.Azure.Management.PolicyInsights.csproj
@@ -7,9 +7,9 @@
     <PackageId>Microsoft.Azure.Management.PolicyInsights</PackageId>
     <Description>Provides policy insights operations for Microsoft Azure.</Description>
     <AssemblyName>Microsoft.Azure.Management.PolicyInsights</AssemblyName>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
     <PackageTags>Azure;Policy;PolicyInsights;PolicyEvent;PolicyState;Compliance;</PackageTags>
-    <PackageReleaseNotes>Taking dependency on 10.0.3 version of Newtonsoft nuget package.</PackageReleaseNotes>
+    <PackageReleaseNotes>Added support for querying policy evaluation details.</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup>
     <TargetFrameworks>$(SdkTargetFx)</TargetFrameworks>

diff --git a/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Properties/AssemblyInfo.cs b/src/SDKs/PolicyInsights/Management/Management.PolicyInsights/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyDescription("Provides Microsoft Azure policy insights operations.")]
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]

diff --git a/src/SDKs/PolicyInsights/Management/PolicyInsights.Tests/PolicyInsightsTests.cs b/src/SDKs/PolicyInsights/Management/PolicyInsights.Tests/PolicyInsightsTests.cs
@@ -77,7 +77,7 @@ private void ValidatePolicyEventsQueryResults(PolicyEventsQueryResults queryResu
             }
         }
 
-        private void ValidatePolicyStatesQueryResults(PolicyStatesQueryResults queryResults)
+        private void ValidatePolicyStatesQueryResults(PolicyStatesQueryResults queryResults, bool expandPolicyEvaluationDetails = false)
         {
             Assert.NotNull(queryResults);
 
@@ -102,6 +102,15 @@ private void ValidatePolicyStatesQueryResults(PolicyStatesQueryResults queryResu
                 Assert.False(string.IsNullOrEmpty(policyState.SubscriptionId));
                 Assert.False(string.IsNullOrEmpty(policyState.PolicyDefinitionAction));
 
+                if (expandPolicyEvaluationDetails && string.Equals(policyState.ComplianceState, "NonCompliant", StringComparison.OrdinalIgnoreCase))
+                {
+                    Assert.NotNull(policyState.PolicyEvaluationDetails);
+                }
+                else
+                {
+                    Assert.Null(policyState.PolicyEvaluationDetails);
+                }
+
                 Assert.NotNull(policyState.AdditionalProperties);
             }
         }
@@ -305,6 +314,17 @@ public void PolicyStates_LatestResourceScope()
             }
         }
 
+        [Fact]
+        public void PolicyStates_LatestResourceScopeExpandPolicyEvaluationDetails()
+        {
+            using (var context = MockContext.Start(this.GetType().FullName))
+            {
+                var policyInsightsClient = GetPolicyInsightsClient(context);
+                var queryResults = policyInsightsClient.PolicyStates.ListQueryResultsForResource(PolicyStatesResource.Latest, ResourceId, new QueryOptions { Top = 10, Expand = "PolicyEvaluationDetails" });
+                ValidatePolicyStatesQueryResults(queryResults: queryResults, expandPolicyEvaluationDetails: true);
+            }
+        }
+
         [Fact]
         public void PolicyStates_LatestPolicySetDefinitionScope()
         {
@@ -397,6 +417,17 @@ public void PolicyStates_DefaultResourceScope()
             }
         }
 
+        [Fact]
+        public void PolicyStates_DefaultResourceScopeExpandPolicyEvaluationDetails()
+        {
+            using (var context = MockContext.Start(this.GetType().FullName))
+            {
+                var policyInsightsClient = GetPolicyInsightsClient(context);
+                var queryResults = policyInsightsClient.PolicyStates.ListQueryResultsForResource(PolicyStatesResource.Default, ResourceId, new QueryOptions { Top = 10, Expand = "PolicyEvaluationDetails" });
+                ValidatePolicyStatesQueryResults(queryResults: queryResults, expandPolicyEvaluationDetails: true);
+            }
+        }
+
         [Fact]
         public void PolicyStates_DefaultPolicySetDefinitionScope()
         {

diff --git a/...ds/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultManagementGroupScope.json b/...ds/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultManagementGroupScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/providers/Microsoft.Management/managementGroups/azgovtest4/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudC9tYW5hZ2VtZW50R3JvdXBzL2F6Z292dGVzdDQvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNC0wNCYkdG9wPTEwJiRmcm9tPTIwMTgtMDQtMDRUMDAlM0EwMCUzQTAwWg==",
+      "RequestUri": "/providers/Microsoft.Management/managementGroups/azgovtest4/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudC9tYW5hZ2VtZW50R3JvdXBzL2F6Z292dGVzdDQvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNy0wMS1wcmV2aWV3JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...s/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultPolicyDefinitionScope.json b/...s/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultPolicyDefinitionScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policyDefinitions/d7b13c30-e6aa-47e1-b50a-8e33f152d086/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lEZWZpbml0aW9ucy9kN2IxM2MzMC1lNmFhLTQ3ZTEtYjUwYS04ZTMzZjE1MmQwODYvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNC0wNCYkdG9wPTEwJiRmcm9tPTIwMTgtMDQtMDRUMDAlM0EwMCUzQTAwWg==",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policyDefinitions/d7b13c30-e6aa-47e1-b50a-8e33f152d086/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lEZWZpbml0aW9ucy9kN2IxM2MzMC1lNmFhLTQ3ZTEtYjUwYS04ZTMzZjE1MmQwODYvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNy0wMS1wcmV2aWV3JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...olicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultPolicySetDefinitionScope.json b/...olicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultPolicySetDefinitionScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policySetDefinitions/db6c5074-a529-4cc8-8882-43f10ef42002/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lTZXREZWZpbml0aW9ucy9kYjZjNTA3NC1hNTI5LTRjYzgtODg4Mi00M2YxMGVmNDIwMDIvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNC0wNCYkdG9wPTEwJiRmcm9tPTIwMTgtMDQtMDRUMDAlM0EwMCUzQTAwWg==",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policySetDefinitions/db6c5074-a529-4cc8-8882-43f10ef42002/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lTZXREZWZpbml0aW9ucy9kYjZjNTA3NC1hNTI5LTRjYzgtODg4Mi00M2YxMGVmNDIwMDIvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNy0wMS1wcmV2aWV3JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...ests.PolicyInsightsTests/PolicyStates_DefaultResourceGroupLevelPolicyAssignmentScope.json b/...ests.PolicyInsightsTests/PolicyStates_DefaultResourceGroupLevelPolicyAssignmentScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/resourcegroups/bulenttestrg/providers/Microsoft.Authorization/policyAssignments/45ab2ab7898d45ebb3087573/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Jlc291cmNlZ3JvdXBzL2J1bGVudHRlc3RyZy9wcm92aWRlcnMvTWljcm9zb2Z0LkF1dGhvcml6YXRpb24vcG9saWN5QXNzaWdubWVudHMvNDVhYjJhYjc4OThkNDVlYmIzMDg3NTczL3Byb3ZpZGVycy9NaWNyb3NvZnQuUG9saWN5SW5zaWdodHMvcG9saWN5U3RhdGVzL2RlZmF1bHQvcXVlcnlSZXN1bHRzP2FwaS12ZXJzaW9uPTIwMTgtMDQtMDQmJHRvcD0xMCYkZnJvbT0yMDE4LTA0LTA0VDAwJTNBMDAlM0EwMFo=",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/resourcegroups/bulenttestrg/providers/Microsoft.Authorization/policyAssignments/45ab2ab7898d45ebb3087573/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Jlc291cmNlZ3JvdXBzL2J1bGVudHRlc3RyZy9wcm92aWRlcnMvTWljcm9zb2Z0LkF1dGhvcml6YXRpb24vcG9saWN5QXNzaWdubWVudHMvNDVhYjJhYjc4OThkNDVlYmIzMDg3NTczL3Byb3ZpZGVycy9NaWNyb3NvZnQuUG9saWN5SW5zaWdodHMvcG9saWN5U3RhdGVzL2RlZmF1bHQvcXVlcnlSZXN1bHRzP2FwaS12ZXJzaW9uPTIwMTgtMDctMDEtcHJldmlldyYkdG9wPTEwJiRmcm9tPTIwMTgtMDQtMDRUMDAlM0EwMCUzQTAwWg==",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...ords/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultResourceGroupScope.json b/...ords/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultResourceGroupScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/resourceGroups/bulenttestrg/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Jlc291cmNlR3JvdXBzL2J1bGVudHRlc3RyZy9wcm92aWRlcnMvTWljcm9zb2Z0LlBvbGljeUluc2lnaHRzL3BvbGljeVN0YXRlcy9kZWZhdWx0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA0LTA0JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/resourceGroups/bulenttestrg/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Jlc291cmNlR3JvdXBzL2J1bGVudHRlc3RyZy9wcm92aWRlcnMvTWljcm9zb2Z0LlBvbGljeUluc2lnaHRzL3BvbGljeVN0YXRlcy9kZWZhdWx0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA3LTAxLXByZXZpZXcmJHRvcD0xMCYkZnJvbT0yMDE4LTA0LTA0VDAwJTNBMDAlM0EwMFo=",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...onRecords/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultResourceScope.json b/...onRecords/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultResourceScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "//subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/resourcegroups/govintpolicyrp/providers/microsoft.network/trafficmanagerprofiles/gov-int-policy-rp/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "Ly9zdWJzY3JpcHRpb25zL2QwNjEwYjI3LTk2NjMtNGMwNS04OWY4LTViNGJlMDFlODZhNS9yZXNvdXJjZWdyb3Vwcy9nb3ZpbnRwb2xpY3lycC9wcm92aWRlcnMvbWljcm9zb2Z0Lm5ldHdvcmsvdHJhZmZpY21hbmFnZXJwcm9maWxlcy9nb3YtaW50LXBvbGljeS1ycC9wcm92aWRlcnMvTWljcm9zb2Z0LlBvbGljeUluc2lnaHRzL3BvbGljeVN0YXRlcy9kZWZhdWx0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA0LTA0JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
+      "RequestUri": "//subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/resourcegroups/govintpolicyrp/providers/microsoft.network/trafficmanagerprofiles/gov-int-policy-rp/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "Ly9zdWJzY3JpcHRpb25zL2QwNjEwYjI3LTk2NjMtNGMwNS04OWY4LTViNGJlMDFlODZhNS9yZXNvdXJjZWdyb3Vwcy9nb3ZpbnRwb2xpY3lycC9wcm92aWRlcnMvbWljcm9zb2Z0Lm5ldHdvcmsvdHJhZmZpY21hbmFnZXJwcm9maWxlcy9nb3YtaW50LXBvbGljeS1ycC9wcm92aWRlcnMvTWljcm9zb2Z0LlBvbGljeUluc2lnaHRzL3BvbGljeVN0YXRlcy9kZWZhdWx0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA3LTAxLXByZXZpZXcmJHRvcD0xMCYkZnJvbT0yMDE4LTA0LTA0VDAwJTNBMDAlM0EwMFo=",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...s.PolicyInsightsTests/PolicyStates_DefaultResourceScopeExpandPolicyEvaluationDetails.json b/...s.PolicyInsightsTests/PolicyStates_DefaultResourceScopeExpandPolicyEvaluationDetails.json
diff --git a/...Tests.PolicyInsightsTests/PolicyStates_DefaultSubscriptionLevelPolicyAssignmentScope.json b/...Tests.PolicyInsightsTests/PolicyStates_DefaultSubscriptionLevelPolicyAssignmentScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policyAssignments/45ab2ab7898d45ebb3087573/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lBc3NpZ25tZW50cy80NWFiMmFiNzg5OGQ0NWViYjMwODc1NzMvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNC0wNCYkdG9wPTEwJiRmcm9tPTIwMTgtMDQtMDRUMDAlM0EwMCUzQTAwWg==",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policyAssignments/45ab2ab7898d45ebb3087573/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lBc3NpZ25tZW50cy80NWFiMmFiNzg5OGQ0NWViYjMwODc1NzMvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvZGVmYXVsdC9xdWVyeVJlc3VsdHM/YXBpLXZlcnNpb249MjAxOC0wNy0wMS1wcmV2aWV3JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...cords/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultSubscriptionScope.json b/...cords/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_DefaultSubscriptionScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuUG9saWN5SW5zaWdodHMvcG9saWN5U3RhdGVzL2RlZmF1bHQvcXVlcnlSZXN1bHRzP2FwaS12ZXJzaW9uPTIwMTgtMDQtMDQmJHRvcD0xMCYkZnJvbT0yMDE4LTA0LTA0VDAwJTNBMDAlM0EwMFo=",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.PolicyInsights/policyStates/default/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuUG9saWN5SW5zaWdodHMvcG9saWN5U3RhdGVzL2RlZmF1bHQvcXVlcnlSZXN1bHRzP2FwaS12ZXJzaW9uPTIwMTgtMDctMDEtcHJldmlldyYkdG9wPTEwJiRmcm9tPTIwMTgtMDQtMDRUMDAlM0EwMCUzQTAwWg==",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...rds/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_LatestManagementGroupScope.json b/...rds/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_LatestManagementGroupScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/providers/Microsoft.Management/managementGroups/azgovtest4/providers/Microsoft.PolicyInsights/policyStates/latest/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudC9tYW5hZ2VtZW50R3JvdXBzL2F6Z292dGVzdDQvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvbGF0ZXN0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA0LTA0JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
+      "RequestUri": "/providers/Microsoft.Management/managementGroups/azgovtest4/providers/Microsoft.PolicyInsights/policyStates/latest/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFuYWdlbWVudC9tYW5hZ2VtZW50R3JvdXBzL2F6Z292dGVzdDQvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvbGF0ZXN0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA3LTAxLXByZXZpZXcmJHRvcD0xMCYkZnJvbT0yMDE4LTA0LTA0VDAwJTNBMDAlM0EwMFo=",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...ds/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_LatestPolicyDefinitionScope.json b/...ds/PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_LatestPolicyDefinitionScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policyDefinitions/d7b13c30-e6aa-47e1-b50a-8e33f152d086/providers/Microsoft.PolicyInsights/policyStates/latest/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lEZWZpbml0aW9ucy9kN2IxM2MzMC1lNmFhLTQ3ZTEtYjUwYS04ZTMzZjE1MmQwODYvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvbGF0ZXN0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA0LTA0JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policyDefinitions/d7b13c30-e6aa-47e1-b50a-8e33f152d086/providers/Microsoft.PolicyInsights/policyStates/latest/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lEZWZpbml0aW9ucy9kN2IxM2MzMC1lNmFhLTQ3ZTEtYjUwYS04ZTMzZjE1MmQwODYvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvbGF0ZXN0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA3LTAxLXByZXZpZXcmJHRvcD0xMCYkZnJvbT0yMDE4LTA0LTA0VDAwJTNBMDAlM0EwMFo=",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {

diff --git a/...PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_LatestPolicySetDefinitionScope.json b/...PolicyInsights.Tests.PolicyInsightsTests/PolicyStates_LatestPolicySetDefinitionScope.json
@@ -1,8 +1,8 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policySetDefinitions/db6c5074-a529-4cc8-8882-43f10ef42002/providers/Microsoft.PolicyInsights/policyStates/latest/queryResults?api-version=2018-04-04&$top=10&$from=2018-04-04T00:00:00Z",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lTZXREZWZpbml0aW9ucy9kYjZjNTA3NC1hNTI5LTRjYzgtODg4Mi00M2YxMGVmNDIwMDIvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvbGF0ZXN0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA0LTA0JiR0b3A9MTAmJGZyb209MjAxOC0wNC0wNFQwMCUzQTAwJTNBMDBa",
+      "RequestUri": "/subscriptions/d0610b27-9663-4c05-89f8-5b4be01e86a5/providers/Microsoft.Authorization/policySetDefinitions/db6c5074-a529-4cc8-8882-43f10ef42002/providers/Microsoft.PolicyInsights/policyStates/latest/queryResults?api-version=2018-07-01-preview&$top=10&$from=2018-04-04T00:00:00Z",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZDA2MTBiMjctOTY2My00YzA1LTg5ZjgtNWI0YmUwMWU4NmE1L3Byb3ZpZGVycy9NaWNyb3NvZnQuQXV0aG9yaXphdGlvbi9wb2xpY3lTZXREZWZpbml0aW9ucy9kYjZjNTA3NC1hNTI5LTRjYzgtODg4Mi00M2YxMGVmNDIwMDIvcHJvdmlkZXJzL01pY3Jvc29mdC5Qb2xpY3lJbnNpZ2h0cy9wb2xpY3lTdGF0ZXMvbGF0ZXN0L3F1ZXJ5UmVzdWx0cz9hcGktdmVyc2lvbj0yMDE4LTA3LTAxLXByZXZpZXcmJHRvcD0xMCYkZnJvbT0yMDE4LTA0LTA0VDAwJTNBMDAlM0EwMFo=",
       "RequestMethod": "POST",
       "RequestBody": "",
       "RequestHeaders": {