cybercyst/carapace-bin
1
0
Fork 0
mirror of https://github.com/rsteube/carapace-bin.git synced 2025-05-05 15:32:53 +00:00
Code Issues Projects Releases Wiki Activity

helm: fix action signature

Browse Source
This commit is contained in:
rsteube 2024-12-24 19:07:39 +01:00
parent 5964c9f06a
commit 3e7dc814e4
8 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
completers/helm_completer/cmd/install.go
View File

@ -76,7 +76,7 @@ func init() {
"version": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if len(c.Args) > 1 {
if splitted := strings.Split(c.Args[1], "/"); len(splitted) == 2 {
return helm.ActionChartVersions(splitted[0], splitted[1])
return helm.ActionChartVersions(helm.ChartVersionOpts{Repo: splitted[0], Chart: splitted[1]})
}
}
return carapace.ActionValues()

2
completers/helm_completer/cmd/pull.go
View File

@ -45,7 +45,7 @@ func init() {
"version": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if len(c.Args) > 0 {
if splitted := strings.Split(c.Args[0], "/"); len(splitted) == 2 {
return helm.ActionChartVersions(splitted[0], splitted[1])
return helm.ActionChartVersions(helm.ChartVersionOpts{Repo: splitted[0], Chart: splitted[1]})
}
}
return carapace.ActionValues()

2
completers/helm_completer/cmd/show_all.go
View File

@ -39,7 +39,7 @@ func init() {
"version": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if len(c.Args) > 0 {
if splitted := strings.Split(c.Args[0], "/"); len(splitted) == 2 {
return helm.ActionChartVersions(splitted[0], splitted[1])
return helm.ActionChartVersions(helm.ChartVersionOpts{Repo: splitted[0], Chart: splitted[1]})
}
}
return carapace.ActionValues()

2
completers/helm_completer/cmd/show_chart.go
View File

@ -39,7 +39,7 @@ func init() {
"version": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if len(c.Args) > 0 {
if splitted := strings.Split(c.Args[0], "/"); len(splitted) == 2 {
return helm.ActionChartVersions(splitted[0], splitted[1])
return helm.ActionChartVersions(helm.ChartVersionOpts{Repo: splitted[0], Chart: splitted[1]})
}
}
return carapace.ActionValues()

2
completers/helm_completer/cmd/show_readme.go
View File

@ -39,7 +39,7 @@ func init() {
"version": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if len(c.Args) > 0 {
if splitted := strings.Split(c.Args[0], "/"); len(splitted) == 2 {
return helm.ActionChartVersions(splitted[0], splitted[1])
return helm.ActionChartVersions(helm.ChartVersionOpts{Repo: splitted[0], Chart: splitted[1]})
}
}
return carapace.ActionValues()

2
completers/helm_completer/cmd/show_values.go
View File

@ -40,7 +40,7 @@ func init() {
"version": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if len(c.Args) > 0 {
if splitted := strings.Split(c.Args[0], "/"); len(splitted) == 2 {
return helm.ActionChartVersions(splitted[0], splitted[1])
return helm.ActionChartVersions(helm.ChartVersionOpts{Repo: splitted[0], Chart: splitted[1]})
}
}
return carapace.ActionValues()

2
completers/helm_completer/cmd/upgrade.go
View File

@ -80,7 +80,7 @@ func init() {
"version": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if len(c.Args) > 1 {
if splitted := strings.Split(c.Args[1], "/"); len(splitted) == 2 {
return helm.ActionChartVersions(splitted[0], splitted[1])
return helm.ActionChartVersions(helm.ChartVersionOpts{Repo: splitted[0], Chart: splitted[1]})
}
}
return carapace.ActionValues()

11
pkg/actions/tools/helm/repo.go
View File

@ -88,10 +88,15 @@ func ActionCharts(repo string) carapace.Action {
})
}
type ChartVersionOpts struct {
Repo string
Chart string
}
// ActionChartVersions completes chart versions
func ActionChartVersions(repo string, chart string) carapace.Action {
func ActionChartVersions(opts ChartVersionOpts) carapace.Action {
return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
index, err := loadIndex(repo)
index, err := loadIndex(opts.Repo)
if err != nil {
return carapace.ActionMessage(err.Error())
}
@ -99,7 +104,7 @@ func ActionChartVersions(repo string, chart string) carapace.Action {
vals := make([]string, 0)
for _, charts := range index.Entries {
for _, c := range charts {
if c.Name == chart {
if c.Name == opts.Chart {
vals = append(vals, c.Version)
}
}