Add source bucket provider flag

internal/flags/helm_chart_source.go

@@ -48,8 +48,8 @@ func (h *HelmChartSource) Set(str string) error {
 	if sourceKind == "" {
 		return fmt.Errorf("invalid helm chart source '%s', must be in format <kind>/<name>", str)
 	}
-	if !utils.ContainsItemString(supportedKustomizationSourceKinds, sourceKind) {
-		return fmt.Errorf("source kind '%s' is not supported, can be one of: %v",
+	if !utils.ContainsItemString(supportedHelmChartSourceKinds, sourceKind) {
+		return fmt.Errorf("source kind '%s' is not supported, can be one of: %s",
 			sourceKind, strings.Join(supportedHelmChartSourceKinds, ", "))
 	}
 
@@ -66,7 +66,7 @@ func (h *HelmChartSource) Type() string {
 func (h *HelmChartSource) Description() string {
 	return fmt.Sprintf(
 		"source that contains the chart in the format '<kind>/<name>',"+
-			"where kind can be one of: %s",
+			"where kind can be one of: (%s)",
 		strings.Join(supportedHelmChartSourceKinds, ", "),
 	)
 }

internal/flags/kustomization_source.go

@@ -49,7 +49,7 @@ func (k *KustomizationSource) Set(str string) error {
 		sourceKind = sourcev1.GitRepositoryKind
 	}
 	if !utils.ContainsItemString(supportedKustomizationSourceKinds, sourceKind) {
-		return fmt.Errorf("source kind '%s' is not supported, can be one of: %v",
+		return fmt.Errorf("source kind '%s' is not supported, can be one of: %s",
 			sourceKind, strings.Join(supportedKustomizationSourceKinds, ", "))
 	}
 
@@ -66,7 +66,7 @@ func (k *KustomizationSource) Type() string {
 func (k *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",
+			"where kind can be one of: (%s), if kind is not specified it defaults to GitRepository",
 		strings.Join(supportedKustomizationSourceKinds, ", "),
 	)
 }

internal/flags/source_bucket_provider.go

@@ -0,0 +1,58 @@
+/*
+Copyright 2020 The Flux CD contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package flags
+
+import (
+	"fmt"
+	"strings"
+
+	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
+	"github.com/fluxcd/toolkit/internal/utils"
+)
+
+var supportedSourceBucketProviders = []string{sourcev1.GenericBucketProvider, sourcev1.AmazonBucketProvider}
+
+type SourceBucketProvider string
+
+func (s *SourceBucketProvider) String() string {
+	return string(*s)
+}
+
+func (s *SourceBucketProvider) Set(str string) error {
+	if strings.TrimSpace(str) == "" {
+		return fmt.Errorf("no source bucket provider given, please specify %s",
+			s.Description())
+	}
+
+	if !utils.ContainsItemString(supportedSourceBucketProviders, str) {
+		return fmt.Errorf("source bucket provider '%s' is not supported, can be one of: %v",
+			str, strings.Join(supportedSourceBucketProviders, ", "))
+	}
+
+	return nil
+}
+
+func (s *SourceBucketProvider) Type() string {
+	return "sourceBucketProvider"
+}
+
+func (s *SourceBucketProvider) Description() string {
+	return fmt.Sprintf(
+		"the S3 compatible storage provider name, available options are: (%s)",
+		strings.Join(supportedSourceBucketProviders, ", "),
+	)
+}