update based on reviews

Author: salonichf5

internal/controller/state/conditions/conditions.go

@@ -133,13 +133,17 @@ const (
 	// ObservabilityPolicy or ClientSettingsPolicy is applied to Gateways or Routes.
 	PolicyAffectedReason v1alpha2.PolicyConditionReason = "PolicyAffected"
 
-	// PolicySourceInvalid is used with the "PolicySourceInvalid" condition when a
-	// source of a WAFPolicy is invalid or incomplete.
-	PolicySourceInvalid v1alpha2.PolicyConditionReason = "SourceInvalid"
-
-	// PolicyFetchError is used with the "PolicyFetchError" condition when a
+	// WAFPolicyFetchError is used with the "WAFPolicyFetchError" condition when a
 	// WAFPolicy or LogProfileBundle cannot be fetched from the specified file location.
-	PolicyFetchError v1alpha2.PolicyConditionReason = "FetchError"
+	WAFPolicyFetchError v1alpha2.PolicyConditionReason = "FetchError"
+
+	// WAFPolicyMessageSourceInvalid is a message used with the "PolicyInvalid" condition
+	// when the WAF policy source is invalid or incomplete.
+	WAFPolicyMessageSourceInvalid = "The WAF policy source is invalid or incomplete."
+
+	// WAFSecurityLogMessageSourceInvalid is a message used with the "PolicyInvalid" condition
+	// when the WAFSecurityLog source is invalid or incomplete.
+	WAFSecurityLogMessageSourceInvalid = "The WAFSecurityLog source is invalid or incomplete."
 
 	// ClientSettingsPolicyAffected is used with the "PolicyAffected" condition when a
 	// ClientSettingsPolicy is applied to a Gateway, HTTPRoute, or GRPCRoute.
@@ -1029,22 +1033,12 @@ func NewWAFPolicyAffected() Condition {
 	}
 }
 
-// NewPolicySourceInvalid returns a Condition that indicates that the WAF policy source is invalid or incomplete.
-func NewPolicySourceInvalid() Condition {
-	return Condition{
-		Type:    string(PolicySourceInvalid),
-		Status:  metav1.ConditionFalse,
-		Reason:  string(PolicySourceInvalid),
-		Message: "The policy source is invalid or incomplete.",
-	}
-}
-
-// NewPolicyFetchError returns a Condition that indicates that there was an error fetching the WAF policy bundle.
-func NewPolicyFetchError(msg string) Condition {
+// NewWAFPolicyFetchError returns a Condition that indicates that there was an error fetching the WAF policy bundle.
+func NewWAFPolicyFetchError(msg string) Condition {
 	return Condition{
-		Type:    string(PolicyFetchError),
+		Type:    string(WAFPolicyFetchError),
 		Status:  metav1.ConditionFalse,
-		Reason:  string(PolicyFetchError),
+		Reason:  string(WAFPolicyFetchError),
 		Message: "Failed to fetch the policy bundle due to: " + msg,
 	}
 }

internal/controller/state/graph/policies.go

@@ -567,7 +567,9 @@ func fetchWAFPolicyBundleData(
 		if wafPolicy.Spec.PolicySource != nil && wafPolicy.Spec.PolicySource.FileLocation != "" {
 			fetcher := createFetcher(buildFetchOptions(wafPolicy.Spec.PolicySource)...)
 			if !fetchAndStoreBundle(wafPolicy.Spec.PolicySource.FileLocation, policy, refPolicyBundles, fetcher) {
-				policy.Conditions = append(policy.Conditions, conditions.NewPolicySourceInvalid())
+				policy.Conditions = append(policy.Conditions,
+					conditions.NewPolicyInvalid(conditions.WAFPolicyMessageSourceInvalid),
+				)
 				continue
 			}
 		}
@@ -579,7 +581,9 @@ func fetchWAFPolicyBundleData(
 
 			fetcher := createFetcher(buildFetchOptions(secLog.LogProfileBundle)...)
 			if !fetchAndStoreBundle(secLog.LogProfileBundle.FileLocation, policy, refPolicyBundles, fetcher) {
-				policy.Conditions = append(policy.Conditions, conditions.NewPolicySourceInvalid())
+				policy.Conditions = append(policy.Conditions,
+					conditions.NewPolicyInvalid(conditions.WAFSecurityLogMessageSourceInvalid),
+				)
 				break
 			}
 		}
@@ -603,7 +607,7 @@ func fetchAndStoreBundle(
 	data, err := fetcher.GetRemoteFile(fileLocation)
 	if err != nil {
 		policy.Valid = false
-		policy.Conditions = append(policy.Conditions, conditions.NewPolicyFetchError(err.Error()))
+		policy.Conditions = append(policy.Conditions, conditions.NewWAFPolicyFetchError(err.Error()))
 		return false
 	}
 

internal/controller/state/graph/policies_test.go

@@ -2164,7 +2164,7 @@ func TestFetchPolicyBundleData(t *testing.T) {
 				"invalid-waf": false,
 			},
 			expectedConds: []conditions.Condition{
-				conditions.NewPolicySourceInvalid(),
+				conditions.NewPolicyInvalid("The WAF policy source is invalid or incomplete."),
 			},
 		},
 		{
@@ -2321,7 +2321,7 @@ func TestFetchPolicyBundleData(t *testing.T) {
 				"waf-fail": true,
 			},
 			expectedConds: []conditions.Condition{
-				conditions.NewPolicySourceInvalid(),
+				conditions.NewPolicyInvalid("The policy source is invalid or incomplete."),
 			},
 		},
 		{
@@ -2358,8 +2358,8 @@ func TestFetchPolicyBundleData(t *testing.T) {
 				"waf-mixed": true,
 			},
 			expectedConds: []conditions.Condition{
-				conditions.NewPolicySourceInvalid(),
-				conditions.NewPolicyFetchError("network error"),
+				conditions.NewPolicyInvalid("WAFSecurityLog source is invalid or incomplete."),
+				conditions.NewWAFPolicyFetchError("network error"),
 			},
 		},
 		{
@@ -2402,8 +2402,8 @@ func TestFetchPolicyBundleData(t *testing.T) {
 				"waf-multi": true,
 			},
 			expectedConds: []conditions.Condition{
-				conditions.NewPolicySourceInvalid(),
-				conditions.NewPolicyFetchError("network error"),
+				conditions.NewPolicyInvalid("WAFSecurityLog source is invalid or incomplete."),
+				conditions.NewWAFPolicyFetchError("network error"),
 			},
 		},
 	}
@@ -2460,11 +2460,11 @@ func TestFetchPolicyBundleData(t *testing.T) {
 							if len(policy.Conditions) > 1 {
 								g.Expect(policy.Conditions[0].Reason).To(Equal("FetchError"))
 								g.Expect(policy.Conditions[0].Message).To(ContainSubstring("Failed to fetch the policy bundle due to:"))
-								g.Expect(policy.Conditions[1].Reason).To(Equal("SourceInvalid"))
-								g.Expect(policy.Conditions[1].Message).To(ContainSubstring("policy source is invalid or incomplete."))
+								g.Expect(policy.Conditions[1].Reason).To(Equal("Invalid"))
+								g.Expect(policy.Conditions[1].Message).To(ContainSubstring("source is invalid or incomplete."))
 							} else {
-								g.Expect(policy.Conditions[0].Reason).To(Equal("SourceInvalid"))
-								g.Expect(policy.Conditions[0].Message).To(ContainSubstring("policy source is invalid or incomplete."))
+								g.Expect(policy.Conditions[0].Reason).To(Equal("Invalid"))
+								g.Expect(policy.Conditions[0].Message).To(ContainSubstring("source is invalid or incomplete."))
 							}
 						}
 						break