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

fix checker for empty array case (#1153)

This commit is contained in:
yxxhero 2023-11-20 16:34:24 +08:00 committed by GitHub
parent 4651723fef
commit 0199b5f764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/policy/checker.go
View File

@ -13,7 +13,7 @@ import (
var ( var (
EnvironmentsAndReleasesWithinSameYamlPartErr = errors.New("environments and releases cannot be defined within the same YAML part. Use --- to extract the environments into a dedicated part") EnvironmentsAndReleasesWithinSameYamlPartErr = errors.New("environments and releases cannot be defined within the same YAML part. Use --- to extract the environments into a dedicated part")
topConfigKeysRegex = regexp.MustCompile(`^[a-zA-Z]+: *$`) topConfigKeysRegex = regexp.MustCompile(`^[a-zA-Z]+:`)
separatorRegex = regexp.MustCompile(`^--- *$`) separatorRegex = regexp.MustCompile(`^--- *$`)
topkeysPriority = map[string]int{ topkeysPriority = map[string]int{
"bases": 0, "bases": 0,

16
pkg/policy/checker_test.go
View File

@ -19,7 +19,7 @@ func TestForbidEnvironmentsWithReleases(t *testing.T) {
}{ }{
{ {
name: "no error when only releases", name: "no error when only releases",
filePath: "helmfile.yaml.gotmpl", filePath: "helmfile.yaml",
content: []byte("releases:\n"), content: []byte("releases:\n"),
v1mode: false, v1mode: false,
expectedErr: false, expectedErr: false,
@ -27,7 +27,7 @@ func TestForbidEnvironmentsWithReleases(t *testing.T) {
}, },
{ {
name: "no error when only environments", name: "no error when only environments",
filePath: "helmfile.yaml.gotmpl", filePath: "helmfile.yaml",
content: []byte("environments:\n"), content: []byte("environments:\n"),
v1mode: false, v1mode: false,
expectedErr: false, expectedErr: false,
@ -35,7 +35,7 @@ func TestForbidEnvironmentsWithReleases(t *testing.T) {
}, },
{ {
name: "no error when has --- between releases and environments", name: "no error when has --- between releases and environments",
filePath: "helmfile.yaml.gotmpl", filePath: "helmfile.yaml",
content: []byte("environments:\n---\nreleases:\n"), content: []byte("environments:\n---\nreleases:\n"),
v1mode: false, v1mode: false,
expectedErr: false, expectedErr: false,
@ -43,7 +43,7 @@ func TestForbidEnvironmentsWithReleases(t *testing.T) {
}, },
{ {
name: "no error when has --- between releases and environments, and --- on top of helmfile.yaml.gotmpl", name: "no error when has --- between releases and environments, and --- on top of helmfile.yaml.gotmpl",
filePath: "helmfile.yaml.gotmpl", filePath: "helmfile.yaml",
content: []byte("---\nenvironments:\n---\nreleases:\n"), content: []byte("---\nenvironments:\n---\nreleases:\n"),
v1mode: false, v1mode: false,
expectedErr: false, expectedErr: false,
@ -51,7 +51,7 @@ func TestForbidEnvironmentsWithReleases(t *testing.T) {
}, },
{ {
name: "error when both releases and environments", name: "error when both releases and environments",
filePath: "helmfile.yaml.gotmpl", filePath: "helmfile.yaml",
content: []byte("environments:\nreleases:\n"), content: []byte("environments:\nreleases:\n"),
v1mode: false, v1mode: false,
expectedErr: true, expectedErr: true,
@ -214,6 +214,12 @@ func TestTopKeys(t *testing.T) {
hasSeparator: true, hasSeparator: true,
want: []string{"bases", "---", "releases"}, want: []string{"bases", "---", "releases"},
}, },
{
name: "get top keys with empty array",
helmfileContent: []byte("bases: []\n---\nreleases: []\n"),
hasSeparator: true,
want: []string{"bases", "---", "releases"},
},
{ {
name: "get empty keys", name: "get empty keys",
helmfileContent: []byte(""), helmfileContent: []byte(""),