From f09855d40e401beab96c875d0d3bbe43b222413f Mon Sep 17 00:00:00 2001 From: drivelikebrazil Date: Tue, 7 May 2024 17:24:08 -0500 Subject: [PATCH] Remove config key order check (#1504) * Make bases and environments equivalent priority config keys Signed-off-by: Richard Swearingen --- pkg/policy/checker.go | 4 ++-- pkg/policy/checker_test.go | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkg/policy/checker.go b/pkg/policy/checker.go index 8e4e99eb..6b0c1e00 100644 --- a/pkg/policy/checker.go +++ b/pkg/policy/checker.go @@ -17,8 +17,8 @@ var ( separatorRegex = regexp.MustCompile(`^--- *$`) topkeysPriority = map[string]int{ "bases": 0, - "environments": 1, - "releases": 2, + "environments": 0, + "releases": 1, } ) diff --git a/pkg/policy/checker_test.go b/pkg/policy/checker_test.go index 45d3a558..5e81d9ce 100644 --- a/pkg/policy/checker_test.go +++ b/pkg/policy/checker_test.go @@ -144,24 +144,29 @@ func TestTopConfigKeysVerifier(t *testing.T) { helmfileContent: []byte("a:\ne:\n"), wantErr: false, }, + { + name: "no error when correct order 02", + helmfileContent: []byte("environments:\nbases:\nreleases:\n"), + wantErr: false, + }, { name: "error when not correct order 00", - helmfileContent: []byte("environments:\nbases:\n"), + helmfileContent: []byte("releases:\nbases:\n"), wantErr: true, }, { name: "error when not correct order 01", - helmfileContent: []byte("environments:\nhelmDefaults:\nbases:\n"), + helmfileContent: []byte("releases:\nhelmDefaults:\nbases:\n"), wantErr: true, }, { name: "error when not correct order 02", - helmfileContent: []byte("helmDefaults:\nenvironments:\nbases:\n"), + helmfileContent: []byte("helmDefaults:\nreleases:\nbases:\n"), wantErr: true, }, { name: "error when not correct order 03", - helmfileContent: []byte("environments:\nva:\nve:\nbases:\n"), + helmfileContent: []byte("releases:\nva:\nve:\nbases:\n"), wantErr: true, }, {