Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gotohelm: Add MustRegexSplit #373

Merged
merged 1 commit into from
Jan 8, 2025
+84 −31
Merged

gotohelm: Add MustRegexSplit #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions pkg/gotohelm/helmette/sprig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,29 @@ func MustRegexMatch(pattern, s string) bool {
return RegexMatch(pattern, s)
}

// RegexSplit is the go equivalent of sprig's `regexSplit`.
// +gotohelm:builtin=mustRegexSplit
func RegexSplit(pattern, s string, n int) []string {
r := regexp.MustCompile(pattern)
return r.Split(s, n)
Comment on lines +253 to +254
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On one hand split error is returned to the user, but on the other hand regexp can panic the execution. Could you use regexp.Compile and return an error too?

The same as it is in sprig
https://github.com/Masterminds/sprig/blob/8cb06fe3c8b0f1163c26b0a558669da72ee14656/regex.go#L73-L79

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice catch! I can never keep the meaning of Must straight. From gotohelm's perspective, they largely function the same.

Either way, I added support for both!

}

// MustRegexSplit is the go equivalent of sprig's `mustRegexSplit`.
// +gotohelm:builtin=mustRegexSplit
func MustRegexSplit(pattern, s string, n int) ([]string, error) {
r, err := regexp.Compile(pattern)
if err != nil {
return []string{}, err
}
return r.Split(s, n), nil
}

// +gotohelm:builtin=regexReplaceAll
func RegexReplaceAll(regex, s, repl string) string {
r := regexp.MustCompile(regex)
return r.ReplaceAllString(s, repl)
}

// Coalesce is the go equivalent of sprig's `coalesce`.
// +gotohelm:builtin=coalesce
func Coalesce[T any](values ...T) T {
Expand Down Expand Up @@ -441,12 +464,6 @@ func SemverCompare(constraint, version string) (bool, error) {
return fn(constraint, version)
}

// +gotohelm:builtin=regexReplaceAll
func RegexReplaceAll(regex, s, repl string) string {
r := regexp.MustCompile(regex)
return r.ReplaceAllString(s, repl)
}

// +gotohelm:builtin=join
func Join[T any](sep string, s []T) string {
out := ""
Expand Down
12 changes: 12 additions & 0 deletions pkg/gotohelm/testdata/src/example/sprig/sprig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ func Sprig(dot *helmette.Dot) map[string]any {
"yaml": yaml(),
"tpl": tpl(),
"regexReplaceAll": regexReplaceAll(),
"regexSplit": regexSplit(),
}
}

Expand All @@ -63,6 +64,17 @@ func regexReplaceAll() any {
}
}

func regexSplit() [][]string {
spl, _ := helmette.MustRegexSplit(" ", "1 2 3 4 5", -1)

return append([][]string{
helmette.RegexSplit(" ", "1 2 3 4 5", -1),
helmette.RegexSplit(" ", "1 2 3 4 5", 1),
helmette.RegexSplit(" ", "1 2 3 4 5", 2),
helmette.RegexSplit(" ", "1 2 3 4 5", 10),
}, spl)
}

func yaml() any {
return []string{
helmette.ToYaml(nil),
Expand Down
12 changes: 12 additions & 0 deletions pkg/gotohelm/testdata/src/example/sprig/sprig.rewritten.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ func Sprig(dot *helmette.Dot) map[string]any {
"yaml": yaml(),
"tpl": tpl(),
"regexReplaceAll": regexReplaceAll(),
"regexSplit": regexSplit(),
}
}

Expand All @@ -64,6 +65,17 @@ func regexReplaceAll() any {
}
}

func regexSplit() [][]string {
spl, _ := helmette.MustRegexSplit(" ", "1 2 3 4 5", -1)

return append([][]string{
helmette.RegexSplit(" ", "1 2 3 4 5", -1),
helmette.RegexSplit(" ", "1 2 3 4 5", 1),
helmette.RegexSplit(" ", "1 2 3 4 5", 2),
helmette.RegexSplit(" ", "1 2 3 4 5", 10),
}, spl)
}

func yaml() any {
return []string{
helmette.ToYaml(nil),
Expand Down
62 changes: 37 additions & 25 deletions pkg/gotohelm/testdata/src/example/sprig/sprig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{- range $_ := (list 1) -}}
{{- $_is_returning := false -}}
{{- $_is_returning = true -}}
{{- (dict "r" (dict "asIntegral" (get (fromJson (include "sprig.asIntegral" (dict "a" (list $dot) ))) "r") "asNumeric" (get (fromJson (include "sprig.asNumeric" (dict "a" (list $dot) ))) "r") "atoi" (get (fromJson (include "sprig.atoi" (dict "a" (list ) ))) "r") "concat" (get (fromJson (include "sprig.concat" (dict "a" (list ) ))) "r") "default" (get (fromJson (include "sprig.default_" (dict "a" (list ) ))) "r") "empty" (get (fromJson (include "sprig.empty" (dict "a" (list ) ))) "r") "errTypes" (get (fromJson (include "sprig.errTypes" (dict "a" (list ) ))) "r") "first" (get (fromJson (include "sprig.first" (dict "a" (list ) ))) "r") "float" (get (fromJson (include "sprig.float" (dict "a" (list ) ))) "r") "keys" (get (fromJson (include "sprig.keys" (dict "a" (list ) ))) "r") "len" (get (fromJson (include "sprig.lenTest" (dict "a" (list ) ))) "r") "min" (get (fromJson (include "sprig.minFunc" (dict "a" (list ) ))) "r") "regex" (get (fromJson (include "sprig.regex" (dict "a" (list ) ))) "r") "strings" (get (fromJson (include "sprig.stringsFunctions" (dict "a" (list ) ))) "r") "toString" (get (fromJson (include "sprig.toString" (dict "a" (list ) ))) "r") "hasPrefix" (get (fromJson (include "sprig.hasPrefix" (dict "a" (list ) ))) "r") "trim" (get (fromJson (include "sprig.trim" (dict "a" (list ) ))) "r") "unset" (get (fromJson (include "sprig.unset" (dict "a" (list ) ))) "r") "yaml" (get (fromJson (include "sprig.yaml" (dict "a" (list ) ))) "r") "tpl" (get (fromJson (include "sprig.tpl" (dict "a" (list ) ))) "r") "regexReplaceAll" (get (fromJson (include "sprig.regexReplaceAll" (dict "a" (list ) ))) "r") )) | toJson -}}
{{- (dict "r" (dict "asIntegral" (get (fromJson (include "sprig.asIntegral" (dict "a" (list $dot) ))) "r") "asNumeric" (get (fromJson (include "sprig.asNumeric" (dict "a" (list $dot) ))) "r") "atoi" (get (fromJson (include "sprig.atoi" (dict "a" (list ) ))) "r") "concat" (get (fromJson (include "sprig.concat" (dict "a" (list ) ))) "r") "default" (get (fromJson (include "sprig.default_" (dict "a" (list ) ))) "r") "empty" (get (fromJson (include "sprig.empty" (dict "a" (list ) ))) "r") "errTypes" (get (fromJson (include "sprig.errTypes" (dict "a" (list ) ))) "r") "first" (get (fromJson (include "sprig.first" (dict "a" (list ) ))) "r") "float" (get (fromJson (include "sprig.float" (dict "a" (list ) ))) "r") "keys" (get (fromJson (include "sprig.keys" (dict "a" (list ) ))) "r") "len" (get (fromJson (include "sprig.lenTest" (dict "a" (list ) ))) "r") "min" (get (fromJson (include "sprig.minFunc" (dict "a" (list ) ))) "r") "regex" (get (fromJson (include "sprig.regex" (dict "a" (list ) ))) "r") "strings" (get (fromJson (include "sprig.stringsFunctions" (dict "a" (list ) ))) "r") "toString" (get (fromJson (include "sprig.toString" (dict "a" (list ) ))) "r") "hasPrefix" (get (fromJson (include "sprig.hasPrefix" (dict "a" (list ) ))) "r") "trim" (get (fromJson (include "sprig.trim" (dict "a" (list ) ))) "r") "unset" (get (fromJson (include "sprig.unset" (dict "a" (list ) ))) "r") "yaml" (get (fromJson (include "sprig.yaml" (dict "a" (list ) ))) "r") "tpl" (get (fromJson (include "sprig.tpl" (dict "a" (list ) ))) "r") "regexReplaceAll" (get (fromJson (include "sprig.regexReplaceAll" (dict "a" (list ) ))) "r") "regexSplit" (get (fromJson (include "sprig.regexSplit" (dict "a" (list ) ))) "r") )) | toJson -}}
{{- break -}}
{{- end -}}
{{- end -}}
Expand All @@ -28,6 +28,18 @@
{{- end -}}
{{- end -}}

{{- define "sprig.regexSplit" -}}
{{- range $_ := (list 1) -}}
{{- $_is_returning := false -}}
{{- $_68_spl__ := (list (mustRegexSplit " " "1 2 3 4 5" -1) nil) -}}
{{- $spl := (index $_68_spl__ 0) -}}
{{- $_ := (index $_68_spl__ 1) -}}
{{- $_is_returning = true -}}
{{- (dict "r" (concat (default (list ) (list (mustRegexSplit " " "1 2 3 4 5" -1) (mustRegexSplit " " "1 2 3 4 5" (1 | int)) (mustRegexSplit " " "1 2 3 4 5" (2 | int)) (mustRegexSplit " " "1 2 3 4 5" (10 | int)))) (list $spl))) | toJson -}}
{{- break -}}
{{- end -}}
{{- end -}}

{{- define "sprig.yaml" -}}
{{- range $_ := (list 1) -}}
{{- $_is_returning := false -}}
Expand Down Expand Up @@ -96,15 +108,15 @@
{{- define "sprig.float" -}}
{{- range $_ := (list 1) -}}
{{- $_is_returning := false -}}
{{- $_155_f__ := (list (float64 "3.2") nil) -}}
{{- $f := ((index $_155_f__ 0) | float64) -}}
{{- $_ := (index $_155_f__ 1) -}}
{{- $_156_integer__ := (list (float64 "3") nil) -}}
{{- $integer := ((index $_156_integer__ 0) | float64) -}}
{{- $_ := (index $_156_integer__ 1) -}}
{{- $_157_invalidInput_err := (list (float64 "abc") nil) -}}
{{- $invalidInput := ((index $_157_invalidInput_err 0) | float64) -}}
{{- $err := (index $_157_invalidInput_err 1) -}}
{{- $_167_f__ := (list (float64 "3.2") nil) -}}
{{- $f := ((index $_167_f__ 0) | float64) -}}
{{- $_ := (index $_167_f__ 1) -}}
{{- $_168_integer__ := (list (float64 "3") nil) -}}
{{- $integer := ((index $_168_integer__ 0) | float64) -}}
{{- $_ := (index $_168_integer__ 1) -}}
{{- $_169_invalidInput_err := (list (float64 "abc") nil) -}}
{{- $invalidInput := ((index $_169_invalidInput_err 0) | float64) -}}
{{- $err := (index $_169_invalidInput_err 1) -}}
{{- $errorHappen := 0.3 -}}
{{- if (ne (toJson $err) "null") -}}
{{- end -}}
Expand All @@ -126,15 +138,15 @@
{{- define "sprig.atoi" -}}
{{- range $_ := (list 1) -}}
{{- $_is_returning := false -}}
{{- $_180_positive__ := (list (atoi "234") nil) -}}
{{- $positive := ((index $_180_positive__ 0) | int) -}}
{{- $_ := (index $_180_positive__ 1) -}}
{{- $_181_negative__ := (list (atoi "-23") nil) -}}
{{- $negative := ((index $_181_negative__ 0) | int) -}}
{{- $_ := (index $_181_negative__ 1) -}}
{{- $_182_invalidInput_err := (list (atoi "paokwdpo") nil) -}}
{{- $invalidInput := ((index $_182_invalidInput_err 0) | int) -}}
{{- $err := (index $_182_invalidInput_err 1) -}}
{{- $_192_positive__ := (list (atoi "234") nil) -}}
{{- $positive := ((index $_192_positive__ 0) | int) -}}
{{- $_ := (index $_192_positive__ 1) -}}
{{- $_193_negative__ := (list (atoi "-23") nil) -}}
{{- $negative := ((index $_193_negative__ 0) | int) -}}
{{- $_ := (index $_193_negative__ 1) -}}
{{- $_194_invalidInput_err := (list (atoi "paokwdpo") nil) -}}
{{- $invalidInput := ((index $_194_invalidInput_err 0) | int) -}}
{{- $err := (index $_194_invalidInput_err 1) -}}
{{- $errorHappen := (0 | int) -}}
{{- if (ne (toJson $err) "null") -}}
{{- end -}}
Expand Down Expand Up @@ -214,12 +226,12 @@
{{- define "sprig.errTypes" -}}
{{- range $_ := (list 1) -}}
{{- $_is_returning := false -}}
{{- $_284_x1_err1 := (list (atoi "1") nil) -}}
{{- $x1 := ((index $_284_x1_err1 0) | int) -}}
{{- $err1 := (index $_284_x1_err1 1) -}}
{{- $_285_x2_err2 := (list (float64 "1.1") nil) -}}
{{- $x2 := ((index $_285_x2_err2 0) | float64) -}}
{{- $err2 := (index $_285_x2_err2 1) -}}
{{- $_296_x1_err1 := (list (atoi "1") nil) -}}
{{- $x1 := ((index $_296_x1_err1 0) | int) -}}
{{- $err1 := (index $_296_x1_err1 1) -}}
{{- $_297_x2_err2 := (list (float64 "1.1") nil) -}}
{{- $x2 := ((index $_297_x2_err2 0) | float64) -}}
{{- $err2 := (index $_297_x2_err2 1) -}}
{{- $_is_returning = true -}}
{{- (dict "r" (list (list $x1 $err1) (list $x2 $err2))) | toJson -}}
{{- break -}}
Expand Down