MINOR: http_request_rule: return content type can be nil

When parsing return content type, it should be nil if the string is empty.

Author: hdurand0710

configuration/http_request_rule.go

@@ -336,14 +336,18 @@ func ParseHTTPRequestRule(f types.Action) (*models.HTTPRequestRule, error) { //n
 			CondTest:  v.CondTest,
 		}
 	case *http_actions.Deny:
+		var returnContentTypePtr *string
+		if v.ContentType != "" {
+			returnContentTypePtr = &v.ContentType
+		}
 		rule = &models.HTTPRequestRule{
 			Type:                "deny",
 			Cond:                v.Cond,
 			CondTest:            v.CondTest,
 			ReturnHeaders:       actionHdr2ModelHdr(v.Hdrs),
 			ReturnContent:       v.Content,
 			ReturnContentFormat: v.ContentFormat,
-			ReturnContentType:   &v.ContentType,
+			ReturnContentType:   returnContentTypePtr,
 			DenyStatus:          v.Status,
 		}
 	case *http_actions.DisableL7Retry:
@@ -454,13 +458,17 @@ func ParseHTTPRequestRule(f types.Action) (*models.HTTPRequestRule, error) { //n
 			CondTest:  v.CondTest,
 		}
 	case *http_actions.Return:
+		var returnContentTypePtr *string
+		if v.ContentType != "" {
+			returnContentTypePtr = &v.ContentType
+		}
 		rule = &models.HTTPRequestRule{
 			Cond:                v.Cond,
 			CondTest:            v.CondTest,
 			ReturnHeaders:       actionHdr2ModelHdr(v.Hdrs),
 			ReturnContent:       v.Content,
 			ReturnContentFormat: v.ContentFormat,
-			ReturnContentType:   &v.ContentType,
+			ReturnContentType:   returnContentTypePtr,
 			ReturnStatusCode:    v.Status,
 			Type:                "return",
 		}

test/expected/structured.json

@@ -1889,7 +1889,6 @@
                 {
                     "cond": "unless",
                     "cond_test": "src 192.168.0.0/16",
-                    "return_content_type": "",
                     "type": "deny"
                 },
                 {