add plus method check back

Author: salonichf5

internal/controller/nginx/config/http/config.go

@@ -170,13 +170,32 @@ type ServerConfig struct {
 	DisableSNIHostValidation bool
 }
 
-var OSSAllowedLBMethods = map[ngfAPI.LoadBalancingType]struct{}{
-	ngfAPI.LoadBalancingTypeRoundRobin:               {},
-	ngfAPI.LoadBalancingTypeLeastConnection:          {},
-	ngfAPI.LoadBalancingTypeIPHash:                   {},
-	ngfAPI.LoadBalancingTypeRandom:                   {},
-	ngfAPI.LoadBalancingTypeHash:                     {},
-	ngfAPI.LoadBalancingTypeHashConsistent:           {},
-	ngfAPI.LoadBalancingTypeRandomTwo:                {},
-	ngfAPI.LoadBalancingTypeRandomTwoLeastConnection: {},
-}
+var (
+	OSSAllowedLBMethods = map[ngfAPI.LoadBalancingType]struct{}{
+		ngfAPI.LoadBalancingTypeRoundRobin:               {},
+		ngfAPI.LoadBalancingTypeLeastConnection:          {},
+		ngfAPI.LoadBalancingTypeIPHash:                   {},
+		ngfAPI.LoadBalancingTypeRandom:                   {},
+		ngfAPI.LoadBalancingTypeHash:                     {},
+		ngfAPI.LoadBalancingTypeHashConsistent:           {},
+		ngfAPI.LoadBalancingTypeRandomTwo:                {},
+		ngfAPI.LoadBalancingTypeRandomTwoLeastConnection: {},
+	}
+
+	PlusAllowedLBMethods = map[ngfAPI.LoadBalancingType]struct{}{
+		ngfAPI.LoadBalancingTypeRoundRobin:                 {},
+		ngfAPI.LoadBalancingTypeLeastConnection:            {},
+		ngfAPI.LoadBalancingTypeIPHash:                     {},
+		ngfAPI.LoadBalancingTypeRandom:                     {},
+		ngfAPI.LoadBalancingTypeHash:                       {},
+		ngfAPI.LoadBalancingTypeHashConsistent:             {},
+		ngfAPI.LoadBalancingTypeRandomTwo:                  {},
+		ngfAPI.LoadBalancingTypeRandomTwoLeastConnection:   {},
+		ngfAPI.LoadBalancingTypeLeastTimeHeader:            {},
+		ngfAPI.LoadBalancingTypeLeastTimeLastByte:          {},
+		ngfAPI.LoadBalancingTypeLeastTimeHeaderInflight:    {},
+		ngfAPI.LoadBalancingTypeLeastTimeLastByteInflight:  {},
+		ngfAPI.LoadBalancingTypeRandomTwoLeastTimeHeader:   {},
+		ngfAPI.LoadBalancingTypeRandomTwoLeastTimeLastByte: {},
+	}
+)

internal/controller/nginx/config/policies/upstreamsettings/validator.go

@@ -159,31 +159,37 @@ func (v Validator) validateUpstreamKeepAlive(
 
 // ValidateLoadBalancingMethod validates the load balancing method for upstream servers.
 func (v Validator) validateLoadBalancingMethod(spec ngfAPI.UpstreamSettingsPolicySpec) field.ErrorList {
-	var allErrs field.ErrorList
-	fieldPath := field.NewPath("spec")
-
 	if spec.LoadBalancingMethod == nil {
 		return nil
 	}
 
-	if !v.plusEnabled {
-		if _, ok := httpConfig.OSSAllowedLBMethods[*spec.LoadBalancingMethod]; !ok {
-			path := fieldPath.Child("loadBalancingMethod")
-			allErrs = append(allErrs, field.Invalid(
-				path,
-				*spec.LoadBalancingMethod,
-				fmt.Sprintf(
-					"NGINX OSS only supports the following load balancing methods: %s",
-					getLoadBalancingMethodList(httpConfig.OSSAllowedLBMethods),
-				),
-			))
-		}
+	var allErrs field.ErrorList
+	path := field.NewPath("spec")
+	lbPath := path.Child("loadBalancingMethod")
+
+	allowedMethods := httpConfig.OSSAllowedLBMethods
+	nginxType := "NGINX OSS"
+	if v.plusEnabled {
+		allowedMethods = httpConfig.PlusAllowedLBMethods
+		nginxType = "NGINX Plus"
+	}
+
+	if _, ok := allowedMethods[*spec.LoadBalancingMethod]; !ok {
+		allErrs = append(allErrs, field.Invalid(
+			lbPath,
+			*spec.LoadBalancingMethod,
+			fmt.Sprintf(
+				"%s supports the following load balancing methods: %s",
+				nginxType,
+				getLoadBalancingMethodList(allowedMethods),
+			),
+		))
 	}
 
 	if spec.HashMethodKey != nil {
 		hashMethodKey := *spec.HashMethodKey
 		if err := v.genericValidator.ValidateNginxVariableName(string(hashMethodKey)); err != nil {
-			path := fieldPath.Child("hashMethodKey")
+			path := path.Child("hashMethodKey")
 			allErrs = append(allErrs, field.Invalid(path, hashMethodKey, err.Error()))
 		}
 	}

internal/controller/nginx/config/policies/upstreamsettings/validator_test.go

@@ -335,7 +335,7 @@ func TestValidate_ValidateLoadBalancingMethod(t *testing.T) {
 			},
 			expConditions: []conditions.Condition{
 				conditions.NewPolicyInvalid("spec.loadBalancingMethod: Invalid value: \"least_time last_byte\": " +
-					"NGINX OSS only supports the following load balancing methods: "),
+					"NGINX OSS supports the following load balancing methods: "),
 			},
 		},
 		{
@@ -357,9 +357,22 @@ func TestValidate_ValidateLoadBalancingMethod(t *testing.T) {
 			},
 			expConditions: []conditions.Condition{
 				conditions.NewPolicyInvalid("spec.loadBalancingMethod: Invalid value: \"invalid-method\": " +
-					"NGINX OSS only supports the following load balancing methods: "),
+					"NGINX OSS supports the following load balancing methods: "),
 			},
 		},
+		{
+			name: "invalid load balancing method for NGINX Plus",
+			policy: &ngfAPI.UpstreamSettingsPolicy{
+				Spec: ngfAPI.UpstreamSettingsPolicySpec{
+					LoadBalancingMethod: helpers.GetPointer(ngfAPI.LoadBalancingType("invalid-method")),
+				},
+			},
+			expConditions: []conditions.Condition{
+				conditions.NewPolicyInvalid("spec.loadBalancingMethod: Invalid value: \"invalid-method\": " +
+					"NGINX Plus supports the following load balancing methods: "),
+			},
+			plusEnabled: true,
+		},
 	}
 
 	for _, test := range tests {