Change eksctl filter prefix regex to more a more permissive one (#2156)

Miguel Varela Ramos · web-flow · commit cc280e5cfea7 · 2021-05-10T12:54:01.000-07:00
diff --git 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(`^.*[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
@@ -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(`^.*[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",

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ var (`
`70`	`70`	`_flagClusterDownKeepVolumes bool`
`71`	`71`	`)`
`72`	`72`
`73`		-var _eksctlPrefixRegex = regexp.MustCompile(`^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`)
	`73`	+var _eksctlPrefixRegex = regexp.MustCompile(`^.*[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`)
`74`	`74`
`75`	`75`	`func clusterInit() {`
`76`	`76`	`_clusterUpCmd.Flags().SortFlags = false`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func TestRemoveDuplicates(t *testing.T) {`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`name: "eksctl",`
`78`		- prefixRegex: regexp.MustCompile(`^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`),
	`78`	+ prefixRegex: regexp.MustCompile(`^.*[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.+] {2}`),
`79`	`79`	`input: []string{`
`80`	`80`	`"2021-03-26 00:03:50 [ℹ] eksctl version 0.40.0",`
`81`	`81`	`"2021-03-26 00:03:50 [ℹ] using region us-east-1",`