public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix more go lint warn 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2022-04-20 16:26:06 +08:00
parent 8b15272cbc
commit 88f17e6c9a
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/state/create_test.go
View File

@ -334,13 +334,13 @@ func TestReadFromYaml_FilterReleasesOnLabels(t *testing.T) {
filter LabelFilter filter LabelFilter
results []bool results []bool
}{ }{
{LabelFilter{positiveLabels: [][]string{[]string{"tier", "frontend"}}}, {LabelFilter{positiveLabels: [][]string{{"tier", "frontend"}}},
[]bool{true, true, false}}, []bool{true, true, false}},
{LabelFilter{positiveLabels: [][]string{[]string{"tier", "frontend"}, []string{"foo", "bar"}}}, {LabelFilter{positiveLabels: [][]string{{"tier", "frontend"}, {"foo", "bar"}}},
[]bool{true, false, false}}, []bool{true, false, false}},
{LabelFilter{negativeLabels: [][]string{[]string{"tier", "frontend"}}}, {LabelFilter{negativeLabels: [][]string{{"tier", "frontend"}}},
[]bool{false, false, true}}, []bool{false, false, true}},
{LabelFilter{positiveLabels: [][]string{[]string{"tier", "frontend"}}, negativeLabels: [][]string{[]string{"foo", "bar"}}}, {LabelFilter{positiveLabels: [][]string{{"tier", "frontend"}}, negativeLabels: [][]string{{"foo", "bar"}}},
[]bool{false, true, false}}, []bool{false, true, false}},
} }
state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger) state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)
@ -375,13 +375,13 @@ func TestReadFromYaml_FilterNegatives(t *testing.T) {
filter LabelFilter filter LabelFilter
results []bool results []bool
}{ }{
{LabelFilter{positiveLabels: [][]string{[]string{"stage", "pre"}}}, {LabelFilter{positiveLabels: [][]string{{"stage", "pre"}}},
[]bool{true, false, false}}, []bool{true, false, false}},
{LabelFilter{positiveLabels: [][]string{[]string{"stage", "post"}}}, {LabelFilter{positiveLabels: [][]string{{"stage", "post"}}},
[]bool{false, true, false}}, []bool{false, true, false}},
{LabelFilter{negativeLabels: [][]string{[]string{"stage", "pre"}, []string{"stage", "post"}}}, {LabelFilter{negativeLabels: [][]string{{"stage", "pre"}, {"stage", "post"}}},
[]bool{false, false, true}}, []bool{false, false, true}},
{LabelFilter{negativeLabels: [][]string{[]string{"foo", "bar"}}}, {LabelFilter{negativeLabels: [][]string{{"foo", "bar"}}},
[]bool{false, true, true}}, []bool{false, true, true}},
} }
state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger) state, err := createFromYaml(yamlContent, yamlFile, DefaultEnv, logger)

12
pkg/state/state_exec_tmpl_test.go
View File

@ -90,9 +90,9 @@ func TestHelmState_executeTemplates(t *testing.T) {
Name: "test-app", Name: "test-app",
Namespace: "dev", Namespace: "dev",
SetValuesTemplate: []SetValue{ SetValuesTemplate: []SetValue{
SetValue{Name: "val1", Value: "{{ .Release.Name }}-val1"}, {Name: "val1", Value: "{{ .Release.Name }}-val1"},
SetValue{Name: "val2", File: "{{ .Release.Name }}.yml"}, {Name: "val2", File: "{{ .Release.Name }}.yml"},
SetValue{Name: "val3", Values: []string{"{{ .Release.Name }}-val2", "{{ .Release.Name }}-val3"}}, {Name: "val3", Values: []string{"{{ .Release.Name }}-val2", "{{ .Release.Name }}-val3"}},
}, },
}, },
want: ReleaseSpec{ want: ReleaseSpec{
@ -100,9 +100,9 @@ func TestHelmState_executeTemplates(t *testing.T) {
Name: "test-app", Name: "test-app",
Namespace: "dev", Namespace: "dev",
SetValues: []SetValue{ SetValues: []SetValue{
SetValue{Name: "val1", Value: "test-app-val1"}, {Name: "val1", Value: "test-app-val1"},
SetValue{Name: "val2", File: "test-app.yml"}, {Name: "val2", File: "test-app.yml"},
SetValue{Name: "val3", Values: []string{"test-app-val2", "test-app-val3"}}, {Name: "val3", Values: []string{"test-app-val2", "test-app-val3"}},
}, },
}, },
}, },

6
pkg/state/state_test.go
View File

@ -31,9 +31,9 @@ func TestLabelParsing(t *testing.T) {
expectedFilter LabelFilter expectedFilter LabelFilter
errorExected bool errorExected bool
}{ }{
{"foo=bar", LabelFilter{positiveLabels: [][]string{[]string{"foo", "bar"}}, negativeLabels: [][]string{}}, false}, {"foo=bar", LabelFilter{positiveLabels: [][]string{{"foo", "bar"}}, negativeLabels: [][]string{}}, false},
{"foo!=bar", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{[]string{"foo", "bar"}}}, false}, {"foo!=bar", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{{"foo", "bar"}}}, false},
{"foo!=bar,baz=bat", LabelFilter{positiveLabels: [][]string{[]string{"baz", "bat"}}, negativeLabels: [][]string{[]string{"foo", "bar"}}}, false}, {"foo!=bar,baz=bat", LabelFilter{positiveLabels: [][]string{{"baz", "bat"}}, negativeLabels: [][]string{{"foo", "bar"}}}, false},
{"foo", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true}, {"foo", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true},
{"foo!=bar=baz", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true}, {"foo!=bar=baz", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true},
{"=bar", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true}, {"=bar", LabelFilter{positiveLabels: [][]string{}, negativeLabels: [][]string{}}, true},