Merge pull request #1509 from vh05/dfbugs-1297

vh05 · web-flow · commit 1bf199ca7d06 · 2025-01-16T18:08:45.000+05:30
Setting noobaa account state "rejected"
diff --git a/pkg/noobaaaccount/reconciler.go b/pkg/noobaaaccount/reconciler.go
@@ -353,7 +353,8 @@ func (r *Reconciler) CreateNooBaaAccount() error {
 
 	accountInfo, err := r.NBClient.CreateAccountAPI(createAccountParams)
 	if err != nil {
-		return err
+		return util.NewPersistentError("InvalidCreateAccountParams",
+			fmt.Sprintf("%v", err.Error()))
 	}
 
 	annotationValue, exists := util.GetAnnotationValue(r.NooBaaAccount.Annotations, "remote-operator")
@@ -428,7 +429,8 @@ func (r *Reconciler) UpdateNooBaaAccount() error {
 
 		err := r.NBClient.UpdateAccountS3Access(updateAccountS3AccessParams)
 		if err != nil {
-			return err
+			return util.NewPersistentError("InvalidUpdateAccountS3AccessParams",
+				fmt.Sprintf("%v", err.Error()))
 		}
 		log.Infof("✅ Successfully updated account %q", r.NooBaaAccount.Name)
 	}

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,8 @@ func (r *Reconciler) CreateNooBaaAccount() error {`
`353`	`353`
`354`	`354`	`accountInfo, err := r.NBClient.CreateAccountAPI(createAccountParams)`
`355`	`355`	`if err != nil {`
`356`		`- return err`
	`356`	`+ return util.NewPersistentError("InvalidCreateAccountParams",`
	`357`	`+ fmt.Sprintf("%v", err.Error()))`
`357`	`358`	`}`
`358`	`359`
`359`	`360`	`annotationValue, exists := util.GetAnnotationValue(r.NooBaaAccount.Annotations, "remote-operator")`
`@@ -428,7 +429,8 @@ func (r *Reconciler) UpdateNooBaaAccount() error {`
`428`	`429`
`429`	`430`	`err := r.NBClient.UpdateAccountS3Access(updateAccountS3AccessParams)`
`430`	`431`	`if err != nil {`
`431`		`- return err`
	`432`	`+ return util.NewPersistentError("InvalidUpdateAccountS3AccessParams",`
	`433`	`+ fmt.Sprintf("%v", err.Error()))`
`432`	`434`	`}`
`433`	`435`	`log.Infof("✅ Successfully updated account %q", r.NooBaaAccount.Name)`
`434`	`436`	`}`