Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-13 13:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for CLI flags

Browse Source 
This includes various bug fixes, especially around the area of missing
names for `<kind>/<name>` formats.

Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals
2020-12-14 16:11:46 +01:00
parent 3c1793b6c5
commit 996bfe87ff
20 changed files with 526 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
internal/flags/helm_chart_source.go
View File

@@ -31,42 +31,42 @@ type HelmChartSource struct {
Name string
}
func (h *HelmChartSource) String() string {
if h.Name == "" {
func (s *HelmChartSource) String() string {
if s.Name == "" {
return ""
}
return fmt.Sprintf("%s/%s", h.Kind, h.Name)
return fmt.Sprintf("%s/%s", s.Kind, s.Name)
}
func (h *HelmChartSource) Set(str string) error {
func (s *HelmChartSource) Set(str string) error {
if strings.TrimSpace(str) == "" {
return fmt.Errorf("no helm chart source given, please specify %s",
h.Description())
s.Description())
}
sourceKind, sourceName := utils.ParseObjectKindName(str)
if sourceKind == "" {
if sourceKind == "" || sourceName == "" {
return fmt.Errorf("invalid helm chart source '%s', must be in format <kind>/<name>", str)
}
if !utils.ContainsItemString(supportedHelmChartSourceKinds, sourceKind) {
return fmt.Errorf("source kind '%s' is not supported, can be one of: %s",
return fmt.Errorf("source kind '%s' is not supported, must be one of: %s",
sourceKind, strings.Join(supportedHelmChartSourceKinds, ", "))
}
h.Name = sourceName
h.Kind = sourceKind
s.Name = sourceName
s.Kind = sourceKind
return nil
}
func (h *HelmChartSource) Type() string {
func (s *HelmChartSource) Type() string {
return "helmChartSource"
}
func (h *HelmChartSource) Description() string {
func (s *HelmChartSource) Description() string {
return fmt.Sprintf(
"source that contains the chart in the format '<kind>/<name>',"+
"where kind can be one of: (%s)",
"source that contains the chart in the format '<kind>/<name>', "+
"where kind must be one of: (%s)",
strings.Join(supportedHelmChartSourceKinds, ", "),
)
}