From 8c36fd3bd2a6ce55bad10ced81d761f8e03e719e Mon Sep 17 00:00:00 2001
From: Artem Torubarov <artem.torubarov@clyso.com>
Date: Tue, 29 Oct 2024 10:14:33 +0100
Subject: [PATCH 1/2] check if bucket exists

Signed-off-by: Artem Torubarov <artem.torubarov@clyso.com>
---
 service/worker/handler/bucket_handlers.go | 66 +++++++++++++++--------
 test/migration/init_test.go               |  2 +-
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/service/worker/handler/bucket_handlers.go b/service/worker/handler/bucket_handlers.go
index 810f6c8..4a11697 100644
--- a/service/worker/handler/bucket_handlers.go
+++ b/service/worker/handler/bucket_handlers.go
@@ -69,30 +69,9 @@ func (s *svc) HandleBucketCreate(ctx context.Context, t *asynq.Task) (err error)
 	}
 
 	// 1. create bucket
-	_, err = toClient.AWS().CreateBucketWithContext(ctx, &s3.CreateBucketInput{
-		Bucket: &p.Bucket,
-		CreateBucketConfiguration: &s3.CreateBucketConfiguration{
-			LocationConstraint: &p.Location,
-		},
-	})
-	if err != nil && (dom.ErrContains(err, "region", "location")) {
-		defaultRegion := toClient.Config().DefaultRegion
-		if defaultRegion == "" {
-			defaultRegion = s.clients.DefaultRegion()
-		}
-		logger.Warn().Msgf("unable to create bucket: invalid region %q: retry with default region %q", p.Location, defaultRegion)
-		_, err = toClient.AWS().CreateBucketWithContext(ctx, &s3.CreateBucketInput{
-			Bucket: &p.Bucket,
-			CreateBucketConfiguration: &s3.CreateBucketConfiguration{
-				LocationConstraint: &defaultRegion,
-			},
-		})
-	}
+	err = s.createBucketIfNotExists(ctx, toClient, p)
 	if err != nil {
-		if !dom.ErrContains(err, "BucketAlreadyExists") {
-			return err
-		}
-		// else BucketAlreadyExists - ok
+		return err
 	}
 
 	// 2. copy tags
@@ -145,6 +124,47 @@ func (s *svc) HandleBucketCreate(ctx context.Context, t *asynq.Task) (err error)
 	return nil
 }
 
+func (s *svc) createBucketIfNotExists(ctx context.Context, toClient s3client.Client, p tasks.BucketCreatePayload) error {
+	ctx = log.WithBucket(ctx, p.Bucket)
+	logger := zerolog.Ctx(ctx)
+	// check if bucket already exists:
+	_, err := toClient.AWS().HeadBucketWithContext(ctx, &s3.HeadBucketInput{
+		Bucket: &p.Bucket,
+	})
+	if err == nil {
+		// already exists
+		return nil
+	}
+
+	// create bucket
+	_, err = toClient.AWS().CreateBucketWithContext(ctx, &s3.CreateBucketInput{
+		Bucket: &p.Bucket,
+		CreateBucketConfiguration: &s3.CreateBucketConfiguration{
+			LocationConstraint: &p.Location,
+		},
+	})
+	if err != nil && (dom.ErrContains(err, "region", "location")) {
+		defaultRegion := toClient.Config().DefaultRegion
+		if defaultRegion == "" {
+			defaultRegion = s.clients.DefaultRegion()
+		}
+		logger.Warn().Msgf("unable to create bucket: invalid region %q: retry with default region %q", p.Location, defaultRegion)
+		_, err = toClient.AWS().CreateBucketWithContext(ctx, &s3.CreateBucketInput{
+			Bucket: &p.Bucket,
+			CreateBucketConfiguration: &s3.CreateBucketConfiguration{
+				LocationConstraint: &defaultRegion,
+			},
+		})
+	}
+	if err != nil {
+		if !dom.ErrContains(err, "BucketAlreadyExists") {
+			return err
+		}
+		// else BucketAlreadyExists - ok
+	}
+	return nil
+}
+
 func (s *svc) bucketCopyLC(ctx context.Context, fromClient, toClient s3client.Client, p tasks.BucketCreatePayload) error {
 	logger := zerolog.Ctx(ctx)
 	if !features.Lifecycle(ctx) {
diff --git a/test/migration/init_test.go b/test/migration/init_test.go
index 8c8a3a0..2dbc95f 100644
--- a/test/migration/init_test.go
+++ b/test/migration/init_test.go
@@ -203,7 +203,7 @@ func TestMain(m *testing.M) {
 	go func() {
 		app := dom.AppInfo{
 			Version: "test",
-			App:     "proxy",
+			App:     "worker",
 			AppID:   xid.New().String(),
 		}
 		workerCtx, cancelFn := context.WithCancel(ctx)

From a586a2fc6845004668340a5037630a8673eaf2d2 Mon Sep 17 00:00:00 2001
From: Artem Torubarov <artem.torubarov@clyso.com>
Date: Tue, 29 Oct 2024 10:17:01 +0100
Subject: [PATCH 2/2] change codeowners

Signed-off-by: Artem Torubarov <artem.torubarov@clyso.com>
---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9262b74..39d14b6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
-* @schucly @arttor @fa-at-pulsit
+* @schucly @arttor @fa-at-pulsit @aiivashchenko