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

32
internal/flags/kustomization_source.go
View File

@@ -31,42 +31,48 @@ type KustomizationSource struct {
Name string
}
func (k *KustomizationSource) String() string {
if k.Name == "" {
func (s *KustomizationSource) String() string {
if s.Name == "" {
return ""
}
return fmt.Sprintf("%s/%s", k.Kind, k.Name)
return fmt.Sprintf("%s/%s", s.Kind, s.Name)
}
func (k *KustomizationSource) Set(str string) error {
func (s *KustomizationSource) Set(str string) error {
if strings.TrimSpace(str) == "" {
return fmt.Errorf("no kustomization source given, please specify %s",
k.Description())
return fmt.Errorf("no Kustomization source given, please specify %s",
s.Description())
}
sourceKind, sourceName := utils.ParseObjectKindName(str)
if sourceName == "" {
return fmt.Errorf("no name given for source of kind '%s'", sourceKind)
}
if sourceKind == "" {
if utils.ContainsItemString(supportedKustomizationSourceKinds, sourceName) {
return fmt.Errorf("no name given for source of kind '%s'", sourceName)
}
sourceKind = sourcev1.GitRepositoryKind
}
if !utils.ContainsItemString(supportedKustomizationSourceKinds, 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(supportedKustomizationSourceKinds, ", "))
}
k.Name = sourceName
k.Kind = sourceKind
s.Name = sourceName
s.Kind = sourceKind
return nil
}
func (k *KustomizationSource) Type() string {
func (s *KustomizationSource) Type() string {
return "kustomizationSource"
}
func (k *KustomizationSource) Description() string {
func (s *KustomizationSource) Description() string {
return fmt.Sprintf(
"source that contains the Kubernetes manifests in the format '[<kind>/]<name>',"+
"where kind can be one of: (%s), if kind is not specified it defaults to GitRepository",
"source that contains the Kubernetes manifests in the format '[<kind>/]<name>', "+
"where kind must be one of: (%s), if kind is not specified it defaults to GitRepository",
strings.Join(supportedKustomizationSourceKinds, ", "),
)
}