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

Add validation for bucket providers

Browse Source
This commit is contained in:
stefanprodan
2020-09-23 12:23:39 +03:00
parent 83bd245bfd
commit 34147d7694
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/gotk/create_source_bucket.go
View File

@@ -70,7 +70,7 @@ var (
) )
func init() { func init() {
createSourceBucketCmd.Flags().StringVar(&sourceBucketProvider, "provider", "generic", "the S3 compatible storage provider name, can be 'generic' or 'aws'") createSourceBucketCmd.Flags().StringVar(&sourceBucketProvider, "provider", sourcev1.GenericBucketProvider, "the S3 compatible storage provider name, can be 'generic' or 'aws'")
createSourceBucketCmd.Flags().StringVar(&sourceBucketName, "bucket-name", "", "the bucket name") createSourceBucketCmd.Flags().StringVar(&sourceBucketName, "bucket-name", "", "the bucket name")
createSourceBucketCmd.Flags().StringVar(&sourceBucketEndpoint, "endpoint", "", "the bucket endpoint address") createSourceBucketCmd.Flags().StringVar(&sourceBucketEndpoint, "endpoint", "", "the bucket endpoint address")
createSourceBucketCmd.Flags().StringVar(&sourceBucketAccessKey, "access-key", "", "the bucket access key") createSourceBucketCmd.Flags().StringVar(&sourceBucketAccessKey, "access-key", "", "the bucket access key")
@@ -88,8 +88,9 @@ func createSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
name := args[0] name := args[0]
secretName := fmt.Sprintf("bucket-%s", name) secretName := fmt.Sprintf("bucket-%s", name)
if sourceBucketProvider == "" { if !utils.containsItemString(supportedSourceBucketProviders, sourceBucketProvider) {
return fmt.Errorf("provider is required") return fmt.Errorf("bucket provider %s is not supported, can be %v",
sourceBucketProvider, supportedSourceBucketProviders)
} }
if sourceBucketName == "" { if sourceBucketName == "" {
@@ -186,13 +187,13 @@ func createSourceBucketCmdRun(cmd *cobra.Command, args []string) error {
} }
err = kubeClient.Get(ctx, namespacedName, &bucket) err = kubeClient.Get(ctx, namespacedName, &bucket)
if err != nil { if err != nil {
return fmt.Errorf("helm index failed: %w", err) return fmt.Errorf("could not retrieve bucket: %w", err)
} }
if bucket.Status.Artifact != nil { if bucket.Status.Artifact != nil {
logger.Successf("fetched revision: %s", bucket.Status.Artifact.Revision) logger.Successf("fetched revision: %s", bucket.Status.Artifact.Revision)
} else { } else {
return fmt.Errorf("index download failed, artifact not found") return fmt.Errorf("download failed, artifact not found")
} }
return nil return nil

17
cmd/gotk/main.go
View File

@@ -106,14 +106,15 @@ var (
) )
var ( var (
defaultComponents = []string{"source-controller", "kustomize-controller", "helm-controller", "notification-controller"} defaultComponents = []string{"source-controller", "kustomize-controller", "helm-controller", "notification-controller"}
defaultVersion = "latest" defaultVersion = "latest"
defaultNamespace = "gitops-system" defaultNamespace = "gitops-system"
defaultNotification = "notification-controller" defaultNotification = "notification-controller"
supportedArch = []string{"amd64", "arm", "arm64"} supportedLogLevels = []string{"debug", "info", "error"}
supportedDecryptionProviders = []string{"sops"} supportedArch = []string{"amd64", "arm", "arm64"}
supportedHelmChartSourceKinds = []string{sourcev1.HelmRepositoryKind, sourcev1.GitRepositoryKind} supportedDecryptionProviders = []string{"sops"}
supportedLogLevels = []string{"debug", "info", "error"} supportedHelmChartSourceKinds = []string{sourcev1.HelmRepositoryKind, sourcev1.GitRepositoryKind}
supportedSourceBucketProviders = []string{sourcev1.GenericBucketProvider, sourcev1.AmazonBucketProvider}
) )
func init() { func init() {