Fix missing properties for compliant objects in Inform mode

ref: https://issues.redhat.com/browse/ACM-14577

ObjectProperties were previously only set for enforced policies and non-compliant
objects, causing compliant objects in Inform policies to have nil properties
and inconsistent status reporting.

This commit displays objectProperties on compliant objects in Inform mode.

Signed-off-by: Janelle Law <[email protected]>

Author: jan-law

controllers/configurationpolicy_controller.go

@@ -2436,13 +2436,6 @@ func (r *ConfigurationPolicyReconciler) handleSingleObj(
 				resultReason = reasonWantFoundNoMatch
 			}
 
-			objectProperties = &policyv1.ObjectProperties{
-				CreatedByPolicy:          &created,
-				UID:                      uid,
-				Diff:                     diff,
-				DryRunNoOpOverrodePolicy: &dryRunNoOpOverrodePolicy,
-			}
-
 			result.events = append(result.events, objectTmplEvalEvent{false, resultReason, resultMsg})
 		} else {
 			// it is a must have and it does exist, so it is compliant
@@ -2452,17 +2445,17 @@ func (r *ConfigurationPolicyReconciler) handleSingleObj(
 				} else {
 					result.events = append(result.events, objectTmplEvalEvent{true, reasonWantFoundExists, ""})
 				}
-
-				objectProperties = &policyv1.ObjectProperties{
-					CreatedByPolicy:          &created,
-					UID:                      uid,
-					Diff:                     diff,
-					DryRunNoOpOverrodePolicy: &dryRunNoOpOverrodePolicy,
-				}
 			} else {
 				result.events = append(result.events, objectTmplEvalEvent{true, reasonWantFoundExists, ""})
 			}
 		}
+
+		objectProperties = &policyv1.ObjectProperties{
+			CreatedByPolicy:    &created,
+			UID:                uid,
+			Diff:               diff,
+			DryRunNoOpOverride: &dryRunNoOpOverride,
+		}
 	}
 
 	return

test/e2e/case20_delete_objects_test.go

@@ -178,14 +178,34 @@ var _ = Describe("Test Object deletion", Ordered, func() {
 
 				utils.CheckComplianceStatus(g, managedPlc, "Compliant")
 			}, defaultTimeoutSeconds, 1).Should(Succeed())
+			Eventually(func() bool {
+				managedPlc := utils.GetWithTimeout(clientManagedDynamic, gvrConfigPolicy,
+					case20ConfigPolicyNameInform, testNamespace, true, defaultTimeoutSeconds)
+				relatedObj := managedPlc.Object["status"].(map[string]interface{})["relatedObjects"].([]interface{})[0]
+				properties := relatedObj.(map[string]interface{})["properties"].(map[string]interface{})
+
+				return properties["createdByPolicy"].(bool)
+			}, defaultTimeoutSeconds, 1).Should(BeFalse())
 			Eventually(func() interface{} {
 				managedPlc := utils.GetWithTimeout(clientManagedDynamic, gvrConfigPolicy,
 					case20ConfigPolicyNameInform, testNamespace, true, defaultTimeoutSeconds)
 				relatedObj := managedPlc.Object["status"].(map[string]interface{})["relatedObjects"].([]interface{})[0]
-				properties := relatedObj.(map[string]interface{})["properties"]
+				properties := relatedObj.(map[string]interface{})["properties"].(map[string]interface{})
 
-				return properties
-			}, defaultTimeoutSeconds, 1).Should(BeNil())
+				return properties["uid"]
+			}, defaultTimeoutSeconds, 1).ShouldNot(BeEmpty())
+			Eventually(func() bool {
+				managedPlc := utils.GetWithTimeout(clientManagedDynamic, gvrConfigPolicy,
+					case20ConfigPolicyNameInform, testNamespace, true, defaultTimeoutSeconds)
+				relatedObj := managedPlc.Object["status"].(map[string]interface{})["relatedObjects"].([]interface{})[0]
+				properties := relatedObj.(map[string]interface{})["properties"].(map[string]interface{})
+
+				if dryRunNoOpOverride, exists := properties["dryRunNoOpOverride"]; exists {
+					return dryRunNoOpOverride.(bool)
+				}
+
+				return false
+			}, defaultTimeoutSeconds, 1).Should(BeFalse())
 		})
 		AfterAll(func() {
 			policies := []string{