fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce Bucket provider constants with the common part as a prefix 

Signed-off-by: Matheus Pimenta <matheuscscp@gmail.com>
This commit is contained in:
Matheus Pimenta 2024-08-22 14:38:26 -03:00
parent b2f08f59d3
commit 02d492bc43
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/v1beta2/bucket_types.go
View File

@ -33,17 +33,34 @@ const (
) )
const ( const (
// BucketProviderGeneric for any S3 API compatible storage Bucket.
BucketProviderGeneric string = "generic"
// BucketProviderAmazon for an AWS S3 object storage Bucket.
// Provides support for retrieving credentials from the AWS EC2 service.
BucketProviderAmazon string = "aws"
// BucketProviderGoogle for a Google Cloud Storage Bucket.
// Provides support for authentication using a workload identity.
BucketProviderGoogle string = "gcp"
// BucketProviderAzure for an Azure Blob Storage Bucket.
// Provides support for authentication using a Service Principal,
// Managed Identity or Shared Key.
BucketProviderAzure string = "azure"
// GenericBucketProvider for any S3 API compatible storage Bucket. // GenericBucketProvider for any S3 API compatible storage Bucket.
// Deprecated: use BucketProviderGeneric.
GenericBucketProvider string = "generic" GenericBucketProvider string = "generic"
// AmazonBucketProvider for an AWS S3 object storage Bucket. // AmazonBucketProvider for an AWS S3 object storage Bucket.
// Provides support for retrieving credentials from the AWS EC2 service. // Provides support for retrieving credentials from the AWS EC2 service.
// Deprecated: use BucketProviderAmazon.
AmazonBucketProvider string = "aws" AmazonBucketProvider string = "aws"
// GoogleBucketProvider for a Google Cloud Storage Bucket. // GoogleBucketProvider for a Google Cloud Storage Bucket.
// Provides support for authentication using a workload identity. // Provides support for authentication using a workload identity.
// Deprecated: use BucketProviderGoogle.
GoogleBucketProvider string = "gcp" GoogleBucketProvider string = "gcp"
// AzureBucketProvider for an Azure Blob Storage Bucket. // AzureBucketProvider for an Azure Blob Storage Bucket.
// Provides support for authentication using a Service Principal, // Provides support for authentication using a Service Principal,
// Managed Identity or Shared Key. // Managed Identity or Shared Key.
// Deprecated: use BucketProviderAzure.
AzureBucketProvider string = "azure" AzureBucketProvider string = "azure"
) )

4
internal/controller/bucket_controller.go
View File

@ -441,7 +441,7 @@ func (r *BucketReconciler) reconcileSource(ctx context.Context, sp *patch.Serial
// Construct provider client // Construct provider client
var provider BucketProvider var provider BucketProvider
switch obj.Spec.Provider { switch obj.Spec.Provider {
case bucketv1.GoogleBucketProvider: case bucketv1.BucketProviderGoogle:
if err = gcp.ValidateSecret(secret); err != nil { if err = gcp.ValidateSecret(secret); err != nil {
e := serror.NewGeneric(err, sourcev1.AuthenticationFailedReason) e := serror.NewGeneric(err, sourcev1.AuthenticationFailedReason)
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, "%s", e) conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, "%s", e)
@ -459,7 +459,7 @@ func (r *BucketReconciler) reconcileSource(ctx context.Context, sp *patch.Serial
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, "%s", e) conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, "%s", e)
return sreconcile.ResultEmpty, e return sreconcile.ResultEmpty, e
} }
case bucketv1.AzureBucketProvider: case bucketv1.BucketProviderAzure:
if err = azure.ValidateSecret(secret); err != nil { if err = azure.ValidateSecret(secret); err != nil {
e := serror.NewGeneric(err, sourcev1.AuthenticationFailedReason) e := serror.NewGeneric(err, sourcev1.AuthenticationFailedReason)
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, "%s", e) conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, "%s", e)

2
internal/controller/bucket_controller_test.go
View File

@ -1314,7 +1314,7 @@ func TestBucketReconciler_reconcileSource_gcs(t *testing.T) {
Spec: bucketv1.BucketSpec{ Spec: bucketv1.BucketSpec{
BucketName: tt.bucketName, BucketName: tt.bucketName,
Timeout: &metav1.Duration{Duration: timeout}, Timeout: &metav1.Duration{Duration: timeout},
Provider: bucketv1.GoogleBucketProvider, Provider: "gcp",
}, },
} }

8
pkg/minio/minio.go
View File

@ -104,9 +104,9 @@ func NewClient(bucket *sourcev1.Bucket, opts ...Option) (*MinioClient, error) {
switch bucketProvider := bucket.Spec.Provider; { switch bucketProvider := bucket.Spec.Provider; {
case o.secret != nil: case o.secret != nil:
minioOpts.Creds = newCredsFromSecret(o.secret) minioOpts.Creds = newCredsFromSecret(o.secret)
case bucketProvider == sourcev1.AmazonBucketProvider: case bucketProvider == sourcev1.BucketProviderAmazon:
minioOpts.Creds = newAWSCreds(bucket, o.proxyURL) minioOpts.Creds = newAWSCreds(bucket, o.proxyURL)
case bucketProvider == sourcev1.GenericBucketProvider: case bucketProvider == sourcev1.BucketProviderGeneric:
minioOpts.Creds = newGenericCreds(bucket, &o) minioOpts.Creds = newGenericCreds(bucket, &o)
} }
@ -241,7 +241,7 @@ func ValidateSTSProvider(bucketProvider string, sts *sourcev1.BucketSTSSpec) err
sts.Provider) sts.Provider)
switch bucketProvider { switch bucketProvider {
case sourcev1.AmazonBucketProvider: case sourcev1.BucketProviderAmazon:
switch sts.Provider { switch sts.Provider {
case sourcev1.STSProviderAmazon: case sourcev1.STSProviderAmazon:
if sts.SecretRef != nil { if sts.SecretRef != nil {
@ -254,7 +254,7 @@ func ValidateSTSProvider(bucketProvider string, sts *sourcev1.BucketSTSSpec) err
default: default:
return errProviderIncompatbility return errProviderIncompatbility
} }
case sourcev1.GenericBucketProvider: case sourcev1.BucketProviderGeneric:
switch sts.Provider { switch sts.Provider {
case sourcev1.STSProviderLDAP: case sourcev1.STSProviderLDAP:
return nil return nil