From 3bce362939615b6f1f7353fb4b052b71d87d316e Mon Sep 17 00:00:00 2001
From: SergioLangaritaBenitez <sergiolangaritabenitez@gmail.com>
Date: Thu, 9 Jan 2025 13:20:59 +0100
Subject: [PATCH] change to pass test

---
 pkg/handlers/create.go      | 3 ++-
 pkg/handlers/create_test.go | 2 --
 pkg/handlers/delete.go      | 3 ++-
 pkg/utils/minio.go          | 6 +++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkg/handlers/create.go b/pkg/handlers/create.go
index d9dd4607..e749f223 100644
--- a/pkg/handlers/create.go
+++ b/pkg/handlers/create.go
@@ -44,6 +44,7 @@ const (
 )
 
 var errInput = errors.New("unrecognized input (valid inputs are MinIO and dCache)")
+var overlappingError = "An object key name filtering rule defined with overlapping prefixes"
 
 // Custom logger
 var createLogger = log.New(os.Stdout, "[CREATE-HANDLER] ", log.Flags())
@@ -654,7 +655,7 @@ func enableInputNotification(minIOClient *s3.S3, arnStr string, bucket string, p
 	// Enable the notification
 	_, err = minIOClient.PutBucketNotificationConfiguration(pbncInput)
 
-	if err != nil && !strings.Contains(err.Error(), "An object key name filtering rule defined with overlapping prefixes") {
+	if err != nil && !strings.Contains(err.Error(), overlappingError) {
 		return fmt.Errorf("error enabling bucket notification: %v", err)
 	}
 
diff --git a/pkg/handlers/create_test.go b/pkg/handlers/create_test.go
index acfffd09..1a8039c6 100644
--- a/pkg/handlers/create_test.go
+++ b/pkg/handlers/create_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package handlers
 
 import (
-	"fmt"
 	"strings"
 	"testing"
 
@@ -119,7 +118,6 @@ func TestMakeCreateHandler(t *testing.T) {
 	defer server.Close()
 
 	if w.Code != http.StatusCreated {
-		fmt.Println(w.Body)
 		t.Errorf("expecting code %d, got %d", http.StatusCreated, w.Code)
 	}
 }
diff --git a/pkg/handlers/delete.go b/pkg/handlers/delete.go
index 241676b9..0dee6006 100644
--- a/pkg/handlers/delete.go
+++ b/pkg/handlers/delete.go
@@ -35,6 +35,7 @@ import (
 )
 
 var ALL_USERS_GROUP = "all_users_group"
+var allUserGroupNotExist = "unable to remove bucket from policy \"" + ALL_USERS_GROUP + "\", policy '" + ALL_USERS_GROUP + "' does not exist"
 var deleteLogger = log.New(os.Stdout, "[DELETE-HANDLER] ", log.Flags())
 
 // MakeDeleteHandler makes a handler for deleting services
@@ -86,7 +87,7 @@ func MakeDeleteHandler(cfg *types.Config, back types.ServerlessBackend) gin.Hand
 
 		// Delete service buckets
 		err = deleteBuckets(service, cfg, minIOAdminClient)
-		if err != nil {
+		if err != nil && !strings.Contains(err.Error(), allUserGroupNotExist) {
 			c.String(http.StatusInternalServerError, "Error deleting service buckets: ", err)
 		}
 
diff --git a/pkg/utils/minio.go b/pkg/utils/minio.go
index 36f47bae..0b2bb7fb 100644
--- a/pkg/utils/minio.go
+++ b/pkg/utils/minio.go
@@ -310,7 +310,11 @@ func (minIOAdminClient *MinIOAdminClient) CreateAddPolicy(bucketName string, pol
 		json.Unmarshal(policyInfo.Policy, actualPolicy)
 
 		// Add new resource and create policy
-		actualPolicy.Statement[0].Resource = append(actualPolicy.Statement[0].Resource, rs)
+		actualPolicy.Statement = []Statement{
+			{
+				Resource: []string{rs},
+			},
+		}
 
 		policy, jsonErr = json.Marshal(actualPolicy)
 		if jsonErr != nil {