From 25b442df7dd308a9cac86320043e60efe1aff6ec Mon Sep 17 00:00:00 2001 From: Miguel Varela Ramos Date: Mon, 10 May 2021 10:22:46 +0100 Subject: [PATCH 1/2] Change eksctl prefix regex to more a more permissive one --- cli/cmd/cluster.go | 2 +- pkg/lib/strings/operations_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go index 9ce4ea5b4d..39700aeb81 100644 --- a/cli/cmd/cluster.go +++ b/cli/cmd/cluster.go @@ -70,7 +70,7 @@ var ( _flagClusterDownKeepVolumes bool ) -var _eksctlPrefixRegex = regexp.MustCompile(`^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`) +var _eksctlPrefixRegex = regexp.MustCompile(`.+ \[.+] {2}`) func clusterInit() { _clusterUpCmd.Flags().SortFlags = false diff --git a/pkg/lib/strings/operations_test.go b/pkg/lib/strings/operations_test.go index 158ba695f3..2a1b9dd88c 100644 --- a/pkg/lib/strings/operations_test.go +++ b/pkg/lib/strings/operations_test.go @@ -75,7 +75,7 @@ func TestRemoveDuplicates(t *testing.T) { }, { name: "eksctl", - prefixRegex: regexp.MustCompile(`^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`), + prefixRegex: regexp.MustCompile(`.+ \[.+] {2}`), input: []string{ "2021-03-26 00:03:50 [ℹ] eksctl version 0.40.0", "2021-03-26 00:03:50 [ℹ] using region us-east-1", From 4eb941f7f64112c8543b2611254a17e78b8eead8 Mon Sep 17 00:00:00 2001 From: Miguel Varela Ramos Date: Mon, 10 May 2021 11:28:16 +0100 Subject: [PATCH 2/2] Update regex --- cli/cmd/cluster.go | 2 +- pkg/lib/strings/operations_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go index 39700aeb81..fd781817c6 100644 --- a/cli/cmd/cluster.go +++ b/cli/cmd/cluster.go @@ -70,7 +70,7 @@ var ( _flagClusterDownKeepVolumes bool ) -var _eksctlPrefixRegex = regexp.MustCompile(`.+ \[.+] {2}`) +var _eksctlPrefixRegex = regexp.MustCompile(`^.*[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`) func clusterInit() { _clusterUpCmd.Flags().SortFlags = false diff --git a/pkg/lib/strings/operations_test.go b/pkg/lib/strings/operations_test.go index 2a1b9dd88c..a9b954dc2e 100644 --- a/pkg/lib/strings/operations_test.go +++ b/pkg/lib/strings/operations_test.go @@ -75,7 +75,7 @@ func TestRemoveDuplicates(t *testing.T) { }, { name: "eksctl", - prefixRegex: regexp.MustCompile(`.+ \[.+] {2}`), + prefixRegex: regexp.MustCompile(`^.*[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`), input: []string{ "2021-03-26 00:03:50 [ℹ] eksctl version 0.40.0", "2021-03-26 00:03:50 [ℹ] using region us-east-1",