Skip validation based on the presence of other annotations

Signed-off-by: Haywood Shannon <[email protected]>

Author: haywoodsh

internal/configs/annotations.go

@@ -289,17 +289,10 @@ func parseAnnotations(ingEx *IngressEx, baseCfgParams *ConfigParams, isPlus bool
 	}
 
 	if httpRedirectCode, exists := ingEx.Ingress.Annotations[HTTPRedirectCodeAnnotation]; exists {
-		// Check if SSL redirect or redirect-to-https is enabled
-		sslRedirectEnabled := cfgParams.SSLRedirect
-		redirectToHTTPSEnabled := cfgParams.RedirectToHTTPS
-
-		// HTTP redirect code annotation only applies when SSL redirect or redirect-to-https is enabled
-		if sslRedirectEnabled || redirectToHTTPSEnabled {
-			if code, err := ParseHTTPRedirectCode(httpRedirectCode); err != nil {
-				nl.Errorf(l, "Ingress %s/%s: Invalid value for nginx.org/http-redirect-code: %q: %v", ingEx.Ingress.GetNamespace(), ingEx.Ingress.GetName(), httpRedirectCode, err)
-			} else {
-				cfgParams.HTTPRedirectCode = code
-			}
+		if code, err := ParseHTTPRedirectCode(httpRedirectCode); err != nil {
+			nl.Errorf(l, "Ingress %s/%s: Invalid value for nginx.org/http-redirect-code: %q: %v", ingEx.Ingress.GetNamespace(), ingEx.Ingress.GetName(), httpRedirectCode, err)
+		} else {
+			cfgParams.HTTPRedirectCode = code
 		}
 	}
 

internal/configs/annotations_test.go

@@ -1029,12 +1029,12 @@ func TestHTTPRedirectCodeAnnotationBehavior(t *testing.T) {
 			expectedCode: 307,
 		},
 		{
-			name: "redirect code ignored when SSL redirect disabled",
+			name: "redirect code applied when SSL redirect disabled",
 			annotations: map[string]string{
 				"nginx.org/ssl-redirect":       "false",
 				"nginx.org/http-redirect-code": "307",
 			},
-			expectedCode: 301, // default
+			expectedCode: 307,
 		},
 		{
 			name: "redirect code applied with redirect-to-https",
@@ -1044,6 +1044,13 @@ func TestHTTPRedirectCodeAnnotationBehavior(t *testing.T) {
 			},
 			expectedCode: 302,
 		},
+		{
+			name: "redirect code applied without any redirect settings",
+			annotations: map[string]string{
+				"nginx.org/http-redirect-code": "308",
+			},
+			expectedCode: 308,
+		},
 	}
 
 	for _, tt := range tests {