fix log and condition

Author: sarthyparty

internal/controller/state/conditions/conditions.go

@@ -979,12 +979,12 @@ func NewPolicyTargetNotFound(msg string) Condition {
 
 // NewPolicyAncestorLimitReached returns a Condition that indicates that the Policy is not accepted because
 // the ancestor status list has reached the maximum size of 16.
-func NewPolicyAncestorLimitReached() Condition {
+func NewPolicyAncestorLimitReached(policyType string, policyName string) Condition {
 	return Condition{
 		Type:    string(v1alpha2.PolicyConditionAccepted),
 		Status:  metav1.ConditionFalse,
 		Reason:  string(PolicyReasonAncestorLimitReached),
-		Message: PolicyMessageAncestorLimitReached,
+		Message: fmt.Sprintf("%s %s %s", PolicyMessageAncestorLimitReached, policyType, policyName),
 	}
 }
 

internal/controller/state/graph/backend_tls_policy.go

@@ -204,8 +204,7 @@ func addPolicyAncestorLimitCondition(
 		}
 	}
 
-	newCondition := conditions.NewPolicyAncestorLimitReached()
-	newCondition.Message = fmt.Sprintf("%s %s %s", newCondition.Message, policyType, policyName)
+	newCondition := conditions.NewPolicyAncestorLimitReached(policyType, policyName)
 	return append(conds, newCondition)
 }
 

internal/controller/state/graph/backend_tls_policy_test.go

@@ -803,8 +803,8 @@ func TestAddGatewaysForBackendTLSPoliciesAncestorLimit(t *testing.T) {
 	logAncestorLimitReached(testLogger, "test/btp-full-ancestors", "BackendTLSPolicy", "test/gateway1")
 	logOutput := logBuf.String()
 
-	g.Expect(logOutput).To(ContainSubstring("Policy ancestor limit reached"))
-	g.Expect(logOutput).To(ContainSubstring("policy=test/btp-full-ancestors"))
+	g.Expect(logOutput).To(ContainSubstring("Policy ancestor limit reached for test/btp-full-ancestors"))
+	g.Expect(logOutput).To(ContainSubstring("test/btp-full-ancestors"))
 	g.Expect(logOutput).To(ContainSubstring("policyKind=BackendTLSPolicy"))
 	g.Expect(logOutput).To(ContainSubstring("ancestor=test/gateway1"))
 }

internal/controller/state/graph/policies_test.go

@@ -2304,8 +2304,8 @@ func TestNGFPolicyAncestorLimitHandling(t *testing.T) {
 
 	// Verify logging occurred
 	logOutput := logBuf.String()
-	g.Expect(logOutput).To(ContainSubstring("Policy ancestor limit reached"))
-	g.Expect(logOutput).To(ContainSubstring("policy=test/policy-full-ancestors"))
+	g.Expect(logOutput).To(ContainSubstring("Policy ancestor limit reached for test/policy-full-ancestors"))
+	g.Expect(logOutput).To(ContainSubstring("test/policy-full-ancestors"))
 	g.Expect(logOutput).To(ContainSubstring("policyKind=TestPolicy"))
 	g.Expect(logOutput).To(ContainSubstring("ancestor=test/gateway1"))
 }

internal/controller/state/graph/policy_ancestor.go

@@ -15,7 +15,7 @@ const maxAncestors = 16
 
 // logAncestorLimitReached logs when a policy ancestor limit is reached.
 func logAncestorLimitReached(logger logr.Logger, policyName, policyKind, ancestorName string) {
-	logger.Info("Policy ancestor limit reached", "policy", policyName, "policyKind", policyKind, "ancestor", ancestorName)
+	logger.Info("Policy ancestor limit reached for "+policyName, "policyKind", policyKind, "ancestor", ancestorName)
 }
 
 // ngfPolicyAncestorsFull returns whether or not an ancestor list is full. A list is full when