Updated forceMD5Etag to boolean pointer type to work efficiently

Signed-off-by: Aayush Chouhan <[email protected]>
achouhan09 · Sep 10, 2024 · 0ff1930 · 0ff1930
1 parent 1d40d80
commit 0ff1930
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 21 deletions.
diff --git a/pkg/apis/noobaa/v1alpha1/noobaaaccount_types.go b/pkg/apis/noobaa/v1alpha1/noobaaaccount_types.go
@@ -69,7 +69,7 @@ type NooBaaAccountSpec struct {
 
 	// ForceMd5Etag specifies whether MD5 Etags should be calculated for the account or not
 	// +optional
-	ForceMd5Etag *bool `json:"force_md5_etag,omitempty"`
+	ForceMd5Etag bool `json:"force_md5_etag,omitempty"`
 }
 
 // AccountNsfsConfig is the configuration of NSFS of CreateAccountParams

diff --git a/pkg/apis/noobaa/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/noobaa/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/bucket/bucket.go b/pkg/bucket/bucket.go
@@ -113,7 +113,7 @@ func RunCreate(cmd *cobra.Command, args []string) {
 	maxSize, _ := cmd.Flags().GetString("max-size")
 	maxObjects, _ := cmd.Flags().GetString("max-objects")
 
-	err = nbClient.CreateBucketAPI(nb.CreateBucketParams{Name: bucketName, Tiering: tierName, ForceMd5Etag: forceMd5Etag})
+	err = nbClient.CreateBucketAPI(nb.CreateBucketParams{Name: bucketName, Tiering: tierName, ForceMd5Etag: &forceMd5Etag})
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -139,13 +139,20 @@ func RunUpdate(cmd *cobra.Command, args []string) {
 	maxSize, _ := cmd.Flags().GetString("max-size")
 	maxObjects, _ := cmd.Flags().GetString("max-objects")
 
+	updateParams := nb.CreateBucketParams{
+		Name: bucketName,
+	}
+
+	if cmd.Flags().Changed("force_md5_etag") {
+		updateParams.ForceMd5Etag = &forceMd5Etag
+	}
+
 	quota, updateQuota := prepareQuotaConfig(maxSize, maxObjects)
-	var err error
 	if updateQuota {
-		err = nbClient.UpdateBucketAPI(nb.CreateBucketParams{Name: bucketName, ForceMd5Etag: forceMd5Etag, Quota: &quota})
-	} else {
-		err = nbClient.UpdateBucketAPI(nb.CreateBucketParams{Name: bucketName, ForceMd5Etag: forceMd5Etag})
+		updateParams.Quota = &quota
 	}
+
+	err := nbClient.UpdateBucketAPI(updateParams)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/pkg/nb/types.go b/pkg/nb/types.go
@@ -340,7 +340,7 @@ type CreateSystemReply struct {
 type CreateBucketParams struct {
 	Name         string               `json:"name"`
 	Tiering      string               `json:"tiering,omitempty"`
-	ForceMd5Etag bool                 `json:"force_md5_etag,omitempty"`
+	ForceMd5Etag *bool                `json:"force_md5_etag,omitempty"`
 	BucketClaim  *BucketClaimInfo     `json:"bucket_claim,omitempty"`
 	Namespace    *NamespaceBucketInfo `json:"namespace,omitempty"`
 	Quota        *QuotaConfig         `json:"quota,omitempty"`

diff --git a/pkg/noobaaaccount/noobaaaccount.go b/pkg/noobaaaccount/noobaaaccount.go
@@ -198,7 +198,7 @@ func RunCreate(cmd *cobra.Command, args []string) {
 	noobaaAccount.Name = name
 	noobaaAccount.Namespace = options.Namespace
 	noobaaAccount.Spec.AllowBucketCreate = allowBucketCreate
-	noobaaAccount.Spec.ForceMd5Etag = &forceMd5Etag
+	noobaaAccount.Spec.ForceMd5Etag = forceMd5Etag
 
 	if nsfsAccountConfig {
 		nsfsUID := util.GetFlagIntOrPrompt(cmd, "uid")
@@ -272,11 +272,7 @@ func RunUpdate(cmd *cobra.Command, args []string) {
 	name := args[0]
 
 	newDefaultResource := util.GetFlagStringOrPrompt(cmd, "new_default_resource")
-	var forceMd5EtagPtr *bool = nil
-	if cmd.Flags().Changed("force_md5_etag") {
-		forceMd5Etag, _ := cmd.Flags().GetBool("force_md5_etag")
-		forceMd5EtagPtr = &forceMd5Etag
-	}
+	forceMd5Etag, _ := cmd.Flags().GetBool("force_md5_etag")
 
 	o := util.KubeObject(bundle.File_deploy_crds_noobaa_io_v1alpha1_noobaaaccount_cr_yaml)
 	noobaaAccount := o.(*nbv1.NooBaaAccount)
@@ -294,6 +290,11 @@ func RunUpdate(cmd *cobra.Command, args []string) {
 			newDefaultResource, options.Namespace)
 	}
 
+	var forceMd5EtagPtr *bool = nil
+	if cmd.Flags().Changed("force_md5_etag") {
+		forceMd5EtagPtr = &forceMd5Etag
+	}
+
 	// Checking if noobaaAccount is a CRD account
 	if util.KubeCheck(noobaaAccount) {
 		noobaaAccount.Spec.DefaultResource = newDefaultResource
@@ -305,7 +306,7 @@ func RunUpdate(cmd *cobra.Command, args []string) {
 
 		noobaaAccount.Spec.DefaultResource = newDefaultResource
 		if forceMd5EtagPtr != nil {
-			noobaaAccount.Spec.ForceMd5Etag = forceMd5EtagPtr
+			noobaaAccount.Spec.ForceMd5Etag = forceMd5Etag
 		}
 
 		if !util.KubeUpdate(noobaaAccount) {

diff --git a/pkg/noobaaaccount/reconciler.go b/pkg/noobaaaccount/reconciler.go
@@ -338,7 +338,7 @@ func (r *Reconciler) CreateNooBaaAccount() error {
 		DefaultResource:   r.NooBaaAccount.Spec.DefaultResource,
 		HasLogin:          false,
 		S3Access:          true,
-		ForceMd5Etag:      *r.NooBaaAccount.Spec.ForceMd5Etag,
+		ForceMd5Etag:      r.NooBaaAccount.Spec.ForceMd5Etag,
 		AllowBucketCreate: r.NooBaaAccount.Spec.AllowBucketCreate,
 	}
 
@@ -413,7 +413,7 @@ func (r *Reconciler) UpdateNooBaaAccount() error {
 			Email:               r.NooBaaAccount.Name,
 			DefaultResource:     &r.NooBaaAccount.Spec.DefaultResource,
 			S3Access:            true,
-			ForceMd5Etag:        r.NooBaaAccount.Spec.ForceMd5Etag,
+			ForceMd5Etag:        &r.NooBaaAccount.Spec.ForceMd5Etag,
 			AllowBucketCreation: &r.NooBaaAccount.Spec.AllowBucketCreate,
 		}