Code clean up, add negative test

nginxinc · Sep 14, 2018 · 312d362 · 312d362
1 parent 3b7fad6
commit 312d362
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 40 deletions.
diff --git a/internal/nginx/extensions.go b/internal/nginx/extensions.go
@@ -17,26 +17,35 @@ func ParseLBMethod(method string) (string, error) {
  method, err := validateHashLBMethod(method)
  return method, err
  }
- if strings.HasPrefix(method, "random") {
- method, err := validateRandomLBMethod(method)
- return method, err
- }
 
- if method == "least_conn" || method == "ip_hash" {
+ if _, exists := nginxLBValidInput[method]; exists {
  return method, nil
  }
  return "", fmt.Errorf("Invalid load balancing method: %q", method)
 }
 
+var nginxLBValidInput = map[string]bool{
+ "least_conn": true,
+ "ip_hash": true,
+ "random": true,
+ "random two": true,
+ "random two least_conn": true,
+}
+
 var nginxPlusLBValidInput = map[string]bool{
- "least_time": true,
- "last_byte": true,
- "least_conn": true,
- "ip_hash": true,
- "least_time header": true,
- "least_time last_byte": true,
- "least_time header inflight": true,
- "least_time last_byte inflight": true,
+ "least_time": true,
+ "last_byte": true,
+ "least_conn": true,
+ "ip_hash": true,
+ "random": true,
+ "random two": true,
+ "random two least_conn": true,
+ "random two least_time=header": true,
+ "random two least_time=last_byte": true,
+ "least_time header": true,
+ "least_time last_byte": true,
+ "least_time header inflight": true,
+ "least_time last_byte inflight": true,
 }
 
 // ParseLBMethodForPlus parses method and matches it to a corresponding load balancing method in NGINX Plus. An error is returned if method is not valid
@@ -49,10 +58,6 @@ func ParseLBMethodForPlus(method string) (string, error) {
  method, err := validateHashLBMethod(method)
  return method, err
  }
- if strings.HasPrefix(method, "random") {
- method, err := validateRandomLBMethodForPlus(method)
- return method, err
- }
 
  if _, exists := nginxPlusLBValidInput[method]; exists {
  return method, nil
@@ -70,29 +75,6 @@ func validateHashLBMethod(method string) (string, error) {
  return "", fmt.Errorf("Invalid load balancing method: %q", method)
 }
 
-func validateRandomLBMethod(method string) (string, error) {
- keyWords := strings.Split(method, " ")
- if keyWords[0] == "random" {
- if len(keyWords) == 1 || len(keyWords) == 2 && keyWords[1] == "two" ||
- len(keyWords) == 3 && keyWords[1] == "two" && keyWords[2] == "least_conn" {
- return method, nil
- }
- }
- return "", fmt.Errorf("Invalid load balancing method: %q", method)
-}
-
-func validateRandomLBMethodForPlus(method string) (string, error) {
- keyWords := strings.Split(method, " ")
- if keyWords[0] == "random" {
- if len(keyWords) == 1 || len(keyWords) == 2 && keyWords[1] == "two" ||
- len(keyWords) == 3 && keyWords[1] == "two" &&
- (keyWords[2] == "least_conn" || keyWords[2] == "least_time=header" || keyWords[2] == "least_time=last_byte") {
- return method, nil
- }
- }
- return "", fmt.Errorf("Invalid load balancing method: %q", method)
-}
-
 // http://nginx.org/en/docs/syntax.html
 var validTimeSuffixes = []string{
  "ms",

diff --git a/internal/nginx/extensions_test.go b/internal/nginx/extensions_test.go
@@ -23,6 +23,10 @@ func TestParseLBMethod(t *testing.T) {
  "least_time header",
  "hash123",
  "hash $request_id conwrongspelling",
+ "random one",
+ "random two least_time=header",
+ "random two least_time=last_byte",
+ "random two ip_hash",
  }
 
  for _, test := range testsWithValidInput {
@@ -69,6 +73,8 @@ func TestParseLBMethodForPlus(t *testing.T) {
  "blabla",
  "hash123",
  "least_time inflight header",
+ "random one",
+ "random two ip_hash",
  }
 
  for _, test := range testsWithValidInput {