[Feature] Unify errors (#1937)

Author: ajanikow

CHANGELOG.md

@@ -8,6 +8,7 @@
 - (Documentation) Add Required & Skip in Docs
 - (Feature) (Platform) ECS Storage
 - (Bugfix) (Platform) Prevent NPE in case of missing Helm Release 
+- (Feature) Unify Errors
 
 ## [1.2.50](https://github.com/arangodb/kube-arangodb/tree/1.2.50) (2025-07-04)
 - (Feature) (Platform) MetaV1 Integration Service

pkg/apis/deployment/v1/server_group_volume_test.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import (
 	core "k8s.io/api/core/v1"
 
 	shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	"github.com/arangodb/kube-arangodb/pkg/util/errors"
 )
 
 const (
@@ -192,12 +193,12 @@ func Test_Volume_Validation(t *testing.T) {
 			if c.fail {
 				require.Error(t, err)
 
-				mergedErr, ok := err.(shared.MergedErrors)
+				mergedErr, ok := err.(errors.Array)
 				require.True(t, ok, "Is not MergedError type")
 
-				require.Equal(t, len(mergedErr.Errors()), len(c.failedFields), "Count of expected fields and merged errors does not match")
+				require.Equal(t, len(mergedErr), len(c.failedFields), "Count of expected fields and merged errors does not match")
 
-				for _, fieldError := range mergedErr.Errors() {
+				for _, fieldError := range mergedErr {
 					resourceErr, ok := fieldError.(shared.ResourceError)
 					if !ok {
 						resourceErr = shared.ResourceError{

pkg/apis/deployment/v2alpha1/server_group_volume_test.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import (
 	core "k8s.io/api/core/v1"
 
 	shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
+	"github.com/arangodb/kube-arangodb/pkg/util/errors"
 )
 
 const (
@@ -192,12 +193,12 @@ func Test_Volume_Validation(t *testing.T) {
 			if c.fail {
 				require.Error(t, err)
 
-				mergedErr, ok := err.(shared.MergedErrors)
+				mergedErr, ok := err.(errors.Array)
 				require.True(t, ok, "Is not MergedError type")
 
-				require.Equal(t, len(mergedErr.Errors()), len(c.failedFields), "Count of expected fields and merged errors does not match")
+				require.Equal(t, len(mergedErr), len(c.failedFields), "Count of expected fields and merged errors does not match")
 
-				for _, fieldError := range mergedErr.Errors() {
+				for _, fieldError := range mergedErr {
 					resourceErr, ok := fieldError.(shared.ResourceError)
 					if !ok {
 						resourceErr = shared.ResourceError{

pkg/apis/shared/errors.go

@@ -23,7 +23,8 @@ package shared
 import (
 	"fmt"
 	"io"
-	goStrings "strings"
+
+	"github.com/arangodb/kube-arangodb/pkg/util/errors"
 )
 
 type ResourceError struct {
@@ -84,38 +85,16 @@ func PrefixResourceErrors(prefix string, errs ...error) error {
 
 	for _, err := range errs {
 		switch errType := err.(type) {
-		case MergedErrors:
-			for _, subError := range errType.errors {
+		case errors.Array:
+			for _, subError := range errType {
 				prefixed = append(prefixed, PrefixResourceError(prefix, subError))
 			}
 		default:
 			prefixed = append(prefixed, PrefixResourceError(prefix, err))
 		}
 	}
 
-	return WithErrors(prefixed...)
-}
-
-type MergedErrors struct {
-	errors []error
-}
-
-func (m MergedErrors) Error() string {
-	errStrings := make([]string, 0, len(m.errors))
-
-	for _, err := range m.errors {
-		if err == nil {
-			continue
-		}
-
-		errStrings = append(errStrings, err.Error())
-	}
-
-	return fmt.Sprintf("Received %d errors: %s", len(errStrings), goStrings.Join(errStrings, ", "))
-}
-
-func (m MergedErrors) Errors() []error {
-	return m.errors
+	return errors.Errors(prefixed...)
 }
 
 // WithErrors filter out nil errors
@@ -128,18 +107,12 @@ func WithErrors(errs ...error) error {
 		}
 
 		switch errType := err.(type) {
-		case MergedErrors:
-			filteredErrs = append(filteredErrs, errType.errors...)
+		case errors.Array:
+			filteredErrs = append(filteredErrs, errType...)
 		default:
 			filteredErrs = append(filteredErrs, err)
 		}
 	}
 
-	if len(filteredErrs) == 0 {
-		return nil
-	}
-
-	return MergedErrors{
-		errors: filteredErrs,
-	}
+	return errors.Errors(filteredErrs...)
 }

pkg/util/errors/errors_array.go

@@ -21,10 +21,25 @@
 package errors
 
 import (
+	"errors"
 	"fmt"
+	"io"
 	goStrings "strings"
 )
 
+func ExpandArray(err error) []error {
+	if err == nil {
+		return nil
+	}
+
+	var v Array
+	if errors.As(err, &v) {
+		return v
+	}
+
+	return []error{err}
+}
+
 type Array []error
 
 func (a Array) Error() string {
@@ -37,6 +52,25 @@ func (a Array) Error() string {
 	return fmt.Sprintf("Received %d errors: %s", len(q), goStrings.Join(q, ", "))
 }
 
+// Format formats error with verbs
+func (p Array) Format(s fmt.State, verb rune) {
+	switch verb {
+	case 'v':
+		if s.Flag('+') {
+			fmt.Fprintf(s, "%s\n", p.Error())
+			for _, err := range p {
+				fmt.Fprintf(s, "%+v\n", err)
+			}
+			return
+		}
+		fallthrough
+	case 's':
+		io.WriteString(s, p.Error())
+	case 'q':
+		fmt.Fprintf(s, "%q", p.Error())
+	}
+}
+
 func Errors(errs ...error) error {
 	f := make(Array, 0, len(errs))
 
@@ -45,7 +79,7 @@ func Errors(errs ...error) error {
 			continue
 		}
 
-		f = append(f, err)
+		f = append(f, ExpandArray(err)...)
 	}
 
 	if len(f) == 0 {