Fixed inconsistent compliance status bug + Retrieving correct reporting data

Author: Aashish Rajaram Salokhe

src/GuestConfiguration/GuestConfiguration/Cmdlets/GetAzVMGuestPolicyStatus.cs

@@ -77,7 +77,7 @@ public override void ExecuteCmdlet()
                     // get all gcrp assignments first
                     gcrpAssignments = GetAllGCRPAssignments(ResourceGroupName, VMName);
 
-                    gcPolicyAssignmentReports = GetPolicyStatusesDetailedByInitiativeId(ResourceGroupName, VMName, InitiativeId, false, gcrpAssignments);
+                    gcPolicyAssignmentReports = GetPolicyStatusesDetailedByInitiativeId(ResourceGroupName, VMName, InitiativeId, gcrpAssignments);
 
                     if (gcPolicyAssignmentReports == null || gcPolicyAssignmentReports.Count() > 0)
                     {
@@ -97,7 +97,7 @@ public override void ExecuteCmdlet()
                     // get all gcrp assignments first
                     gcrpAssignments = GetAllGCRPAssignments(ResourceGroupName, VMName);
 
-                    gcPolicyAssignmentReports = GetPolicyStatusesDetailed(ResourceGroupName, VMName, gcrpAssignments, false);
+                    gcPolicyAssignmentReports = GetPolicyStatusesDetailed(ResourceGroupName, VMName, gcrpAssignments);
                     if (gcPolicyAssignmentReports == null || gcPolicyAssignmentReports.Count() > 0)
                     {
                         WriteObject(gcPolicyAssignmentReports, true);

src/GuestConfiguration/GuestConfiguration/Common/GuestConfigurationCmdletBase.cs

@@ -30,6 +30,8 @@ namespace Microsoft.Azure.Commands.GuestConfiguration.Common
     using Microsoft.Azure.Commands.GuestConfiguration.Models;
     using Microsoft.Azure.Management.GuestConfiguration;
     using Microsoft.Azure.Management.GuestConfiguration.Models;
+    using Microsoft.Azure.Management.PolicyInsights;
+    using Microsoft.Azure.Management.PolicyInsights.Models;    
     using GuestConfigurationErrorResponseException = Management.GuestConfiguration.Models.ErrorResponseException;
     using StringResources = Microsoft.Azure.Commands.GuestConfiguration.Properties.Resources;
     using ResourceManagerErrorResponseException = Microsoft.Azure.Management.Internal.ResourceManager.Version2018_05_01.Models.ErrorResponseException;
@@ -49,6 +51,11 @@ public abstract class GuestConfigurationCmdletBase : AzureRMCmdlet
         /// </summary>
         private IPolicyClient _policyClient;
 
+        /// <summary>
+        /// Policy insights client
+        /// </summary>
+        private IPolicyInsightsClient _policyInsightsClient;
+
         private string _initiativeId = null;
 
         /// <summary>
@@ -75,11 +82,26 @@ public IPolicyClient PolicyClient
             }
         }
 
+        /// <summary>
+        /// Gets or sets the policy insights client
+        /// </summary>
+        public IPolicyInsightsClient PolicyInsightsClient
+        {
+            get
+            {
+                return _policyInsightsClient ??
+                    (_policyInsightsClient = AzureSession.Instance.ClientFactory.CreateArmClient<PolicyInsightsClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager));
+            }
+            set
+            {
+                _policyInsightsClient = value;
+            }
+        }
+
         // Get all guest configuration policy assignment reports for a VM
         protected IEnumerable<PolicyStatusDetailed> GetPolicyStatusesDetailed(string resourceGroupName, 
             string vmName,
-            IEnumerable<GuestConfigurationAssignment> gcrpAssignments, 
-            bool isStatusHistoryCmdlet)
+            IEnumerable<GuestConfigurationAssignment> gcrpAssignments)
         {
             var gcPolicyAssignmentReportList = new List<PolicyStatusDetailed>();
             var gcPolicySetDefinitions = GetAllGuestConfigPolicySetDefinitions();
@@ -91,7 +113,7 @@ protected IEnumerable<PolicyStatusDetailed> GetPolicyStatusesDetailed(string res
 
             foreach (var gcPolicySetDefinition in gcPolicySetDefinitions)
             {
-                var gcAssignmentReports = GetPolicyStatusesDetailedByInitiativeId(resourceGroupName, vmName, gcPolicySetDefinition.Id, isStatusHistoryCmdlet, gcrpAssignments);
+                var gcAssignmentReports = GetPolicyStatusesDetailedByInitiativeId(resourceGroupName, vmName, gcPolicySetDefinition.Id, gcrpAssignments);
                 if (gcAssignmentReports != null || gcAssignmentReports.Count() > 0)
                 {
                     gcPolicyAssignmentReportList.AddRange(gcAssignmentReports);
@@ -148,7 +170,7 @@ protected IEnumerable<PolicyData> GetPolicyStatuses(string resourceGroupName,
                 var policySetDefinitions = GetAllGuestConfigPolicySetDefinitions();
                 policySetDefinitionsArray = policySetDefinitions != null ? policySetDefinitions.ToArray() : null;
             }
-            var policyStatuses = GetPolicyStatusesHelper(policySetDefinitionsArray, gcrpAssignments);
+            var policyStatuses = GetPolicyStatusesHelper(policySetDefinitionsArray, gcrpAssignments, resourceGroupName);
             return policyStatuses;
         }
 
@@ -177,7 +199,18 @@ protected IEnumerable<PolicyStatusDetailed> GetPolicyStatusesDetailedByInitiativ
                 {
                     gcrpReport = GuestConfigurationClient.GuestConfigurationAssignmentReports.Get(resourceGroupName, gcPolicyAssignment.Configuration.Name, reportGuid, vmName);
                 }
-                gcPolicyAssignmentReportList.Add(new PolicyStatusDetailed(gcrpReport, gcPolicyAssignment));
+
+                PolicyStatusDetailed policyDetailed = new PolicyStatusDetailed(gcrpReport, gcPolicyAssignment);
+                QueryOptions queryOptions = new QueryOptions();
+                queryOptions.Filter = string.Format("resourceGroup eq '{0}' and policyDefinitionAction eq 'deployifnotexists' and contains(ResourceId,'{1}')", resourceGroupName, vmName);
+                queryOptions.OrderBy = "Timestamp desc";
+                queryOptions.Top = 1;
+                PolicyStatesQueryResults policyDbResults = PolicyInsightsClient.PolicyStates.ListQueryResultsForPolicySetDefinition("latest", DefaultContext.Subscription.Id, gcPolicyAssignment.PolicySetDefinitionName, queryOptions);
+                if (policyDbResults.Odatacount > 0 && policyDbResults.Value[0].ComplianceState == "NonCompliant")
+                {
+                    policyDetailed.ComplianceStatus = policyDbResults.Value[0].ComplianceState;
+                }
+                gcPolicyAssignmentReportList.Add(policyDetailed);
             }
 
             return gcPolicyAssignmentReportList;
@@ -186,8 +219,7 @@ protected IEnumerable<PolicyStatusDetailed> GetPolicyStatusesDetailedByInitiativ
         // Get guest configuration policy status history by initiative definition name
         protected IEnumerable<PolicyStatusDetailed> GetPolicyStatusesDetailedByInitiativeId(string resourceGroupName,
             string vmName,
-            string initiativeId,
-            bool isStatusHistoryCmdlet,
+            string initiativeId,            
             IEnumerable<GuestConfigurationAssignment> gcrpAssignments)
         {
             var initiativeName = GetInitiativeNameFromId(initiativeId);
@@ -227,7 +259,7 @@ protected PolicyStatusDetailed GetPolicyStatusDetailedByReportId(string reportId
 
             if (urlParameters == null || reportGuid == null)
             {
-                throw new ErrorResponseException(string.Format(StringResources.InvalidReportId, reportId));
+                throw new GuestConfigurationErrorResponseException(string.Format(StringResources.InvalidReportId, reportId));
             }
 
             PolicyStatusDetailed policyReport = null;
@@ -268,7 +300,7 @@ private string GetInitiativeNameFromId(string initiativeId)
             var indexOfInitiativeName = initiativeId.LastIndexOf("/");
             if (indexOfInitiativeName < 0 || indexOfInitiativeName == initiativeId.Length - 1)
             {
-                throw new ErrorResponseException(string.Format(StringResources.NoInitiativeNameFound, initiativeId));
+                throw new GuestConfigurationErrorResponseException(string.Format(StringResources.NoInitiativeNameFound, initiativeId));
             }
             var initiativeName = initiativeId.Substring(indexOfInitiativeName + 1);
             return initiativeName;
@@ -305,7 +337,7 @@ private IEnumerable<PolicySetDefinition> GetAllGuestConfigPolicySetDefinitions()
             return gcPolicySetDefinitions;
         }
 
-        private IEnumerable<PolicyData> GetPolicyStatusesHelper(PolicySetDefinition[] policySetDefinitions, IEnumerable<GuestConfigurationAssignment> gcrpAssignments)
+        private IEnumerable<PolicyData> GetPolicyStatusesHelper(PolicySetDefinition[] policySetDefinitions, IEnumerable<GuestConfigurationAssignment> gcrpAssignments, string resourceGroupName)
         {
             var gcPolicyAssignmentsList = new List<PolicyData>();
             foreach (var policySetDefinition in policySetDefinitions)
@@ -395,10 +427,11 @@ private IEnumerable<PolicyData> GetPolicyStatusesHelper(PolicySetDefinition[] po
 
                         if (!string.IsNullOrEmpty(guestConfigurationAssignmentNameInPolicy) && gcrp_AssignmentName_Assignment_Map.ContainsKey(guestConfigurationAssignmentNameInPolicy))
                         {
+                            var assignments = PolicyClient.PolicyAssignments.ListForResourceGroup(resourceGroupName, string.Format("policyDefinitionId eq '{0}'", policySetDefinition.Id));                            
                             var gcrpAsgnment = gcrp_AssignmentName_Assignment_Map[guestConfigurationAssignmentNameInPolicy];
-                            if (gcrpAsgnment != null)
+                            if (gcrpAsgnment != null && assignments.Count() > 0)
                             {
-                                gcPolicyAssignmentsList.Add(new PolicyData(gcrpAsgnment, policyDef.DisplayName));
+                                gcPolicyAssignmentsList.Add(new PolicyData(gcrpAsgnment, policyDef.DisplayName, policySetDefinition.Name));
                             }
                         }
                     }

src/GuestConfiguration/GuestConfiguration/GuestConfiguration.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.GuestConfiguration" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.PolicyInsights" Version="2.0.2" />
   </ItemGroup>
 
   <ItemGroup>

src/GuestConfiguration/GuestConfiguration/Models/PolicyData.cs

@@ -20,10 +20,11 @@ namespace Microsoft.Azure.Commands.GuestConfiguration.Models
     // Contains data from Azure policy and guest configuration assignment from Guest Configuration service
     public class PolicyData
     {
-        public PolicyData(GuestConfigurationAssignment gcrpAssignment, string policyDisplayName)
+        public PolicyData(GuestConfigurationAssignment gcrpAssignment, string policyDisplayName, string policyDefinitionName)
         {
             this.PolicyDisplayName = policyDisplayName;
             this.ComplianceStatus = gcrpAssignment.Properties.ComplianceStatus;
+            this.PolicySetDefinitionName = policyDefinitionName;
             this.Configuration = new ConfigurationInfo()
             {
                 Name = gcrpAssignment.Properties.GuestConfiguration.Name,
@@ -41,6 +42,8 @@ public PolicyData()
 
         }
 
+        public string PolicySetDefinitionName { get; set; }
+
         public ConfigurationInfo Configuration;
 
         public string PolicyDisplayName { get; set; }

src/GuestConfiguration/GuestConfiguration/Models/PolicyStatus.cs

@@ -40,6 +40,7 @@ public PolicyStatus(GuestConfigurationAssignmentReport gcrpReport, PolicyData gc
                 this.ReportId = gcrpReport.Id;
                 this.StartTime = gcrpReport.Properties.StartTime;
                 this.EndTime = gcrpReport.Properties.EndTime;
+                
                 this.ComplianceStatus = gcrpReport.Properties.ComplianceStatus;
                 this.Configuration = new PolicyData.ConfigurationInfo
                 {