From f6db6ce86163dcb4b5ec4bd99b8a3842dd0c60bb Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Thu, 15 Jun 2023 13:17:43 +0100 Subject: [PATCH] feat: fix for s3 cache from operator Signed-off-by: Alex Jones --- pkg/cache/cache.go | 4 +--- pkg/cache/s3_based.go | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index f004fc9633..96f69fcc3d 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -48,9 +48,7 @@ func AddRemoteCache(bucketName string, region string) error { if err != nil { return err } - if cacheInfo.BucketName != "" { - return errors.New("Error: a cache is already configured, please remove it first") - } + cacheInfo.BucketName = bucketName cacheInfo.Region = region viper.Set("cache", cacheInfo) diff --git a/pkg/cache/s3_based.go b/pkg/cache/s3_based.go index e23f599bff..9fa52a492d 100644 --- a/pkg/cache/s3_based.go +++ b/pkg/cache/s3_based.go @@ -102,12 +102,9 @@ func NewS3Cache(nocache bool) ICache { Bucket: aws.String(cache.BucketName), }) if err != nil { - _, err = s.CreateBucket(&s3.CreateBucketInput{ + _, _ = s.CreateBucket(&s3.CreateBucketInput{ Bucket: aws.String(cache.BucketName), }) - if err != nil { - panic(err) - } } return &S3Cache{