From 122ce48ae61b28c5641bc123721fcd612a5bddcf Mon Sep 17 00:00:00 2001 From: jgleonard Date: Tue, 15 May 2018 15:30:25 -0400 Subject: [PATCH 1/5] Remove default rule ignoring dotfiles https://github.com/kubernetes/helm/issues/4058 isn't being updated in dotfiles due to the exclusion here. --- pkg/ignore/rules.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/ignore/rules.go b/pkg/ignore/rules.go index 185d289bb..b4de2e0f1 100644 --- a/pkg/ignore/rules.go +++ b/pkg/ignore/rules.go @@ -46,7 +46,8 @@ func Empty() *Rules { // // Ignore all dotfiles in "templates/" func (r *Rules) AddDefaults() { - r.parseRule(`templates/.?*`) + // Placeholder for default rules with sample of ignoring dotfiles + // r.parseRule(`templates/.?*`) } // ParseFile parses a helmignore file and returns the *Rules. From 7765cc2b5127530b863e1d943e68c49a864e9b84 Mon Sep 17 00:00:00 2001 From: "jon.leonard" Date: Tue, 15 May 2018 15:42:27 -0400 Subject: [PATCH 2/5] add test update for dotfile include --- pkg/ignore/rules_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/ignore/rules_test.go b/pkg/ignore/rules_test.go index 17b8bf403..dc2b9b51a 100644 --- a/pkg/ignore/rules_test.go +++ b/pkg/ignore/rules_test.go @@ -98,7 +98,8 @@ func TestIgnore(t *testing.T) { {`cargo/*.*`, "cargo/a.txt", true}, {`cargo/*.txt`, "mast/a.txt", false}, {`ru[c-e]?er.txt`, "rudder.txt", true}, - {`templates/.?*`, "templates/.dotfile", true}, + // ".?*" should not get ignored. https://github.com/kubernetes/helm/issues/4058 + {`templates/.?*`, "templates/.dotfile", false}, // "." should never get ignored. https://github.com/kubernetes/helm/issues/1776 {`.*`, ".", false}, {`.*`, "./", false}, From d774919f93b3f7ae2b9d4de84a93045cb34a8108 Mon Sep 17 00:00:00 2001 From: jgleonard Date: Tue, 15 May 2018 15:42:27 -0400 Subject: [PATCH 3/5] add test update for dotfile include --- pkg/ignore/rules_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/ignore/rules_test.go b/pkg/ignore/rules_test.go index 17b8bf403..dc2b9b51a 100644 --- a/pkg/ignore/rules_test.go +++ b/pkg/ignore/rules_test.go @@ -98,7 +98,8 @@ func TestIgnore(t *testing.T) { {`cargo/*.*`, "cargo/a.txt", true}, {`cargo/*.txt`, "mast/a.txt", false}, {`ru[c-e]?er.txt`, "rudder.txt", true}, - {`templates/.?*`, "templates/.dotfile", true}, + // ".?*" should not get ignored. https://github.com/kubernetes/helm/issues/4058 + {`templates/.?*`, "templates/.dotfile", false}, // "." should never get ignored. https://github.com/kubernetes/helm/issues/1776 {`.*`, ".", false}, {`.*`, "./", false}, From f8f8fb4cb048af22b6ed53963f78b90f1bcce3c4 Mon Sep 17 00:00:00 2001 From: jgleonard Date: Tue, 15 May 2018 15:53:06 -0400 Subject: [PATCH 4/5] gofmt --- pkg/ignore/rules_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/ignore/rules_test.go b/pkg/ignore/rules_test.go index dc2b9b51a..17d419efa 100644 --- a/pkg/ignore/rules_test.go +++ b/pkg/ignore/rules_test.go @@ -98,7 +98,7 @@ func TestIgnore(t *testing.T) { {`cargo/*.*`, "cargo/a.txt", true}, {`cargo/*.txt`, "mast/a.txt", false}, {`ru[c-e]?er.txt`, "rudder.txt", true}, - // ".?*" should not get ignored. https://github.com/kubernetes/helm/issues/4058 + // ".?*" should not get ignored. https://github.com/kubernetes/helm/issues/4058 {`templates/.?*`, "templates/.dotfile", false}, // "." should never get ignored. https://github.com/kubernetes/helm/issues/1776 {`.*`, ".", false}, From ce8391814fd6d0f837284499927f6806228d9d11 Mon Sep 17 00:00:00 2001 From: jgleonard Date: Tue, 15 May 2018 16:00:38 -0400 Subject: [PATCH 5/5] default rules list now empty, update test accordingly --- pkg/ignore/rules_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/ignore/rules_test.go b/pkg/ignore/rules_test.go index 17d419efa..9103a7bc2 100644 --- a/pkg/ignore/rules_test.go +++ b/pkg/ignore/rules_test.go @@ -145,8 +145,8 @@ func TestAddDefaults(t *testing.T) { r := Rules{} r.AddDefaults() - if len(r.patterns) != 1 { - t.Errorf("Expected 1 default patterns, got %d", len(r.patterns)) + if len(r.patterns) != 0 { + t.Errorf("Expected 0 default patterns, got %d", len(r.patterns)) } }