DevFW-CICD/ingress-nginx-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix lint code errors

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-07-06 16:17:46 -04:00
parent b308be5333
commit 835aea4bab
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/nginx/pkg/config/config.go
View file

@ -302,8 +302,8 @@ type Configuration struct {
// NewDefault returns the default nginx configuration // NewDefault returns the default nginx configuration
func NewDefault() Configuration { func NewDefault() Configuration {
defIPCIDR := make([]string, 0) defIPCIDR := make([]string, 0)
defIPCIDR = append(defIPCIDR, "0.0.0.0/0") defIPCIDR = append(defIPCIDR, "0.0.0.0/0")
cfg := Configuration{ cfg := Configuration{
AllowBackendServerHeader: false, AllowBackendServerHeader: false,
ClientHeaderBufferSize: "1k", ClientHeaderBufferSize: "1k",

10
controllers/nginx/pkg/template/configmap.go
View file

@ -30,7 +30,7 @@ const (
customHTTPErrors = "custom-http-errors" customHTTPErrors = "custom-http-errors"
skipAccessLogUrls = "skip-access-log-urls" skipAccessLogUrls = "skip-access-log-urls"
whitelistSourceRange = "whitelist-source-range" whitelistSourceRange = "whitelist-source-range"
proxyRealIPCIDR = "proxy-real-ip-cidr" proxyRealIPCIDR = "proxy-real-ip-cidr"
) )
// ReadConfig obtains the configuration defined by the user merged with the defaults. // ReadConfig obtains the configuration defined by the user merged with the defaults.
@ -46,7 +46,7 @@ func ReadConfig(src map[string]string) config.Configuration {
errors := make([]int, 0) errors := make([]int, 0)
skipUrls := make([]string, 0) skipUrls := make([]string, 0)
whitelist := make([]string, 0) whitelist := make([]string, 0)
proxylist := make([]string, 0) proxylist := make([]string, 0)
if val, ok := conf[customHTTPErrors]; ok { if val, ok := conf[customHTTPErrors]; ok {
delete(conf, customHTTPErrors) delete(conf, customHTTPErrors)
@ -71,14 +71,14 @@ func ReadConfig(src map[string]string) config.Configuration {
delete(conf, proxyRealIPCIDR) delete(conf, proxyRealIPCIDR)
proxylist = append(proxylist, strings.Split(val, ",")...) proxylist = append(proxylist, strings.Split(val, ",")...)
} else { } else {
proxylist = append(proxylist, "0.0.0.0/0") proxylist = append(proxylist, "0.0.0.0/0")
} }
to := config.NewDefault() to := config.NewDefault()
to.CustomHTTPErrors = filterErrors(errors) to.CustomHTTPErrors = filterErrors(errors)
to.SkipAccessLogURLs = skipUrls to.SkipAccessLogURLs = skipUrls
to.WhitelistSourceRange = whitelist to.WhitelistSourceRange = whitelist
to.ProxyRealIPCIDR = proxylist to.ProxyRealIPCIDR = proxylist
config := &mapstructure.DecoderConfig{ config := &mapstructure.DecoderConfig{
Metadata: nil, Metadata: nil,

4
controllers/nginx/pkg/template/configmap_test.go
View file

@ -42,7 +42,7 @@ func TestMergeConfigMapToStruct(t *testing.T) {
"use-gzip": "true", "use-gzip": "true",
"enable-dynamic-tls-records": "false", "enable-dynamic-tls-records": "false",
"gzip-types": "text/html", "gzip-types": "text/html",
"proxy-real-ip-cidr": "1.1.1.1/8,2.2.2.2/24", "proxy-real-ip-cidr": "1.1.1.1/8,2.2.2.2/24",
} }
def := config.NewDefault() def := config.NewDefault()
def.CustomHTTPErrors = []int{300, 400} def.CustomHTTPErrors = []int{300, 400}
@ -53,7 +53,7 @@ func TestMergeConfigMapToStruct(t *testing.T) {
def.EnableDynamicTLSRecords = false def.EnableDynamicTLSRecords = false
def.UseProxyProtocol = true def.UseProxyProtocol = true
def.GzipTypes = "text/html" def.GzipTypes = "text/html"
def.ProxyRealIPCIDR = []string{"1.1.1.1/8", "2.2.2.2/24"} def.ProxyRealIPCIDR = []string{"1.1.1.1/8", "2.2.2.2/24"}
to := ReadConfig(conf) to := ReadConfig(conf)
if diff := pretty.Compare(to, def); diff != "" { if diff := pretty.Compare(to, def); diff != "" {