From b3ef410fb7ef62a845ff2acafab3a878d933c598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CAnton?= Date: Mon, 19 Oct 2020 13:05:56 +0300 Subject: [PATCH] Add source bucket provider flag --- cmd/gotk/create_source_bucket.go | 12 ++--- cmd/gotk/main.go | 4 -- go.sum | 1 + internal/flags/helm_chart_source.go | 6 +-- internal/flags/kustomization_source.go | 4 +- internal/flags/source_bucket_provider.go | 58 ++++++++++++++++++++++++ 6 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 internal/flags/source_bucket_provider.go diff --git a/cmd/gotk/create_source_bucket.go b/cmd/gotk/create_source_bucket.go index 7a467e87..9511ab54 100644 --- a/cmd/gotk/create_source_bucket.go +++ b/cmd/gotk/create_source_bucket.go @@ -31,6 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" + "github.com/fluxcd/toolkit/internal/flags" "github.com/fluxcd/toolkit/internal/utils" ) @@ -62,7 +63,7 @@ For Buckets with static authentication, the credentials are stored in a Kubernet var ( sourceBucketName string - sourceBucketProvider string + sourceBucketProvider = flags.SourceBucketProvider(sourcev1.GenericBucketProvider) sourceBucketEndpoint string sourceBucketAccessKey string sourceBucketSecretKey string @@ -71,7 +72,7 @@ var ( ) func init() { - createSourceBucketCmd.Flags().StringVar(&sourceBucketProvider, "provider", sourcev1.GenericBucketProvider, "the S3 compatible storage provider name, can be 'generic' or 'aws'") + createSourceBucketCmd.Flags().Var(&sourceBucketProvider, "provider", sourceBucketProvider.Description()) createSourceBucketCmd.Flags().StringVar(&sourceBucketName, "bucket-name", "", "the bucket name") createSourceBucketCmd.Flags().StringVar(&sourceBucketEndpoint, "endpoint", "", "the bucket endpoint address") createSourceBucketCmd.Flags().StringVar(&sourceBucketAccessKey, "access-key", "", "the bucket access key") @@ -89,11 +90,6 @@ func createSourceBucketCmdRun(cmd *cobra.Command, args []string) error { name := args[0] secretName := fmt.Sprintf("bucket-%s", name) - if !utils.ContainsItemString(supportedSourceBucketProviders, sourceBucketProvider) { - return fmt.Errorf("Bucket provider %s is not supported, can be %v", - sourceBucketProvider, supportedSourceBucketProviders) - } - if sourceBucketName == "" { return fmt.Errorf("bucket-name is required") } @@ -121,7 +117,7 @@ func createSourceBucketCmdRun(cmd *cobra.Command, args []string) error { }, Spec: sourcev1.BucketSpec{ BucketName: sourceBucketName, - Provider: sourceBucketProvider, + Provider: sourceBucketProvider.String(), Insecure: sourceBucketInsecure, Endpoint: sourceBucketEndpoint, Region: sourceBucketRegion, diff --git a/cmd/gotk/main.go b/cmd/gotk/main.go index afd1b9b2..851e2fdb 100644 --- a/cmd/gotk/main.go +++ b/cmd/gotk/main.go @@ -26,8 +26,6 @@ import ( "github.com/spf13/cobra/doc" _ "k8s.io/client-go/plugin/pkg/client/auth" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" - gotklog "github.com/fluxcd/toolkit/pkg/log" ) @@ -109,8 +107,6 @@ var ( defaultVersion = "latest" defaultNamespace = "gotk-system" defaultNotification = "notification-controller" - - supportedSourceBucketProviders = []string{sourcev1.GenericBucketProvider, sourcev1.AmazonBucketProvider} ) func init() { diff --git a/go.sum b/go.sum index 4cfbab64..93aa134f 100644 --- a/go.sum +++ b/go.sum @@ -127,6 +127,7 @@ github.com/fluxcd/pkg/ssh v0.0.5 h1:rnbFZ7voy2JBlUfMbfyqArX2FYaLNpDhccGFC3qW83A= github.com/fluxcd/pkg/ssh v0.0.5/go.mod h1:7jXPdXZpc0ttMNz2kD9QuMi3RNn/e0DOFbj0Tij/+Hs= github.com/fluxcd/pkg/untar v0.0.5 h1:UGI3Ch1UIEIaqQvMicmImL1s9npQa64DJ/ozqHKB7gk= github.com/fluxcd/pkg/untar v0.0.5/go.mod h1:O6V9+rtl8c1mHBafgqFlJN6zkF1HS5SSYn7RpQJ/nfw= +github.com/fluxcd/source-controller v0.1.1 h1:KsVvqvV5wFILleUmWlLADfNVjCdhBQfiPw+HdMTvPRM= github.com/fluxcd/source-controller/api v0.1.1 h1:BYxl9qc8pCx3/Bn1885TlkJPwvXqz+rAL9mzpnCrj9A= github.com/fluxcd/source-controller/api v0.1.1/go.mod h1:1ac/vj49YVPKF+xBHTo/9pfFj64TcLc1RLaxi4MwVEM= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= diff --git a/internal/flags/helm_chart_source.go b/internal/flags/helm_chart_source.go index 4531daa7..702f4cd9 100644 --- a/internal/flags/helm_chart_source.go +++ b/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 /", 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 '/',"+ - "where kind can be one of: %s", + "where kind can be one of: (%s)", strings.Join(supportedHelmChartSourceKinds, ", "), ) } diff --git a/internal/flags/kustomization_source.go b/internal/flags/kustomization_source.go index f7b637f9..b581f92f 100644 --- a/internal/flags/kustomization_source.go +++ b/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 '[/]',"+ - "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, ", "), ) } diff --git a/internal/flags/source_bucket_provider.go b/internal/flags/source_bucket_provider.go new file mode 100644 index 00000000..63fa2f17 --- /dev/null +++ b/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, ", "), + ) +}