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

Merge pull request #855 from aledbf/lint

Browse source 
Lint code
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-06-13 11:31:32 -04:00 committed by GitHub
commit bd1429ddac
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/pkg/ingress/annotations/secureupstream/main_test.go
View file

@ -83,7 +83,7 @@ func TestAnnotations(t *testing.T) {
_, err := NewParser(mockCfg{ _, err := NewParser(mockCfg{
certs: map[string]resolver.AuthSSLCert{ certs: map[string]resolver.AuthSSLCert{
"default/secure-verify-ca": resolver.AuthSSLCert{}, "default/secure-verify-ca": {},
}, },
}).Parse(ing) }).Parse(ing)
if err != nil { if err != nil {
@ -111,7 +111,7 @@ func TestSecretOnNonSecure(t *testing.T) {
ing.SetAnnotations(data) ing.SetAnnotations(data)
_, err := NewParser(mockCfg{ _, err := NewParser(mockCfg{
certs: map[string]resolver.AuthSSLCert{ certs: map[string]resolver.AuthSSLCert{
"default/secure-verify-ca": resolver.AuthSSLCert{}, "default/secure-verify-ca": {},
}, },
}).Parse(ing) }).Parse(ing)
if err == nil { if err == nil {

2
core/pkg/ingress/controller/metrics.go
View file

@ -57,7 +57,7 @@ var (
prometheus.GaugeOpts{ prometheus.GaugeOpts{
Namespace: ns, Namespace: ns,
Name: sslLabelExpire, Name: sslLabelExpire,
Help: "Number of seconds since 1970 to the SSL Certificate expire. An example to check if this " + Help: "Number of seconds since 1970 to the SSL Certificate expire. An example to check if this " +
"certificate will expire in 10 days is: \"ingress_controller_ssl_expire_time_seconds < (time() + (10 * 24 * 3600))\"", "certificate will expire in 10 days is: \"ingress_controller_ssl_expire_time_seconds < (time() + (10 * 24 * 3600))\"",
}, },
[]string{sslLabelHost}, []string{sslLabelHost},