Merge pull request #868 from aledbf/lint

Lint nginx code
kubernetes · Jun 15, 2017 · c6b5335 · c6b5335
2 parents 13c6b0e + 92e3b5b
commit c6b5335
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -165,9 +165,6 @@ type NGINXController struct {
 
 	cmdArgs []string
 
-	watchClass string
-	namespace  string
-
 	stats        *statsCollector
 	statusModule statusModule
 

diff --git a/controllers/nginx/pkg/config/config.go b/controllers/nginx/pkg/config/config.go
@@ -177,7 +177,7 @@ type Configuration struct {
 
 	// Enable json escaping
 	// http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format
-	LogFormatEscapeJson bool `json:"log-format-escape-json,omitempty"`
+	LogFormatEscapeJSON bool `json:"log-format-escape-json,omitempty"`
 
 	// Customize upstream log_format
 	// http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format
@@ -315,7 +315,7 @@ func NewDefault() Configuration {
 		KeepAlive:                75,
 		KeepAliveRequests:        100,
 		LargeClientHeaderBuffers: "4 8k",
-		LogFormatEscapeJson:      false,
+		LogFormatEscapeJSON:      false,
 		LogFormatStream:          logFormatStream,
 		LogFormatUpstream:        logFormatUpstream,
 		MaxWorkerConnections:     16384,

diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
@@ -24,7 +24,6 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"regexp"
 	"strings"
 	text_template "text/template"
 
@@ -392,7 +391,6 @@ func isLocationAllowed(input interface{}) bool {
 }
 
 var (
-	nonAlpha        = regexp.MustCompile("[^a-zA-Z0-9]+")
 	denyPathSlugMap = map[string]string{}
 )
 

diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -93,7 +93,7 @@ http {
     # disable warnings
     uninitialized_variable_warn off;
 
-    log_format upstreaminfo {{ if $cfg.LogFormatEscapeJson }}escape=json {{ end }}'{{ buildLogFormatUpstream $cfg }}';
+    log_format upstreaminfo {{ if $cfg.LogFormatEscapeJSON }}escape=json {{ end }}'{{ buildLogFormatUpstream $cfg }}';
 
     {{/* map urls that should not appear in access.log */}}
     {{/* http://nginx.org/en/docs/http/ngx_http_log_module.html#access_log */}}