fix: infinite nested errors (#342)

celestiaorg · May 16, 2024 · bf34125 · bf34125
1 parent 41c8482
commit bf34125
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 0 deletions.
diff --git a/pkg/builder/docker/errors.go b/pkg/builder/docker/errors.go
@@ -11,6 +11,10 @@ type Error struct {
 }
 
 func (e *Error) Error() string {
+	if e.Err == e {
+		return e.Message
+	}
+
 	if e.Err != nil {
 		return fmt.Sprintf("%s: %v", e.Message, e.Err)
 	}

diff --git a/pkg/builder/errors.go b/pkg/builder/errors.go
@@ -11,6 +11,10 @@ type Error struct {
 }
 
 func (e *Error) Error() string {
+	if e.Err == e {
+		return e.Message
+	}
+
 	if e.Err != nil {
 		return fmt.Sprintf("%s: %v", e.Message, e.Err)
 	}

diff --git a/pkg/builder/kaniko/errors.go b/pkg/builder/kaniko/errors.go
@@ -11,6 +11,10 @@ type Error struct {
 }
 
 func (e *Error) Error() string {
+	if e.Err == e {
+		return e.Message
+	}
+
 	if e.Err != nil {
 		return fmt.Sprintf("%s: %v", e.Message, e.Err)
 	}

diff --git a/pkg/container/errors.go b/pkg/container/errors.go
@@ -12,6 +12,10 @@ type Error struct {
 }
 
 func (e *Error) Error() string {
+	if e.Err == e {
+		return e.Message
+	}
+
 	msg := fmt.Sprintf(e.Message, e.Params...)
 	if e.Err != nil {
 		return fmt.Sprintf("%s: %v", msg, e.Err)

diff --git a/pkg/k8s/errors.go b/pkg/k8s/errors.go
@@ -12,6 +12,10 @@ type Error struct {
 }
 
 func (e *Error) Error() string {
+	if e.Err == e {
+		return e.Message
+	}
+
 	msg := fmt.Sprintf(e.Message, e.Params...)
 	if e.Err != nil {
 		return fmt.Sprintf("%s: %v", msg, e.Err)

diff --git a/pkg/knuu/errors.go b/pkg/knuu/errors.go
@@ -12,6 +12,10 @@ type Error struct {
 }
 
 func (e *Error) Error() string {
+	if e.Err == e {
+		return e.Message
+	}
+
 	msg := fmt.Sprintf(e.Message, e.Params...)
 	if e.Err != nil {
 		return fmt.Sprintf("%s: %v", msg, e.Err)

diff --git a/pkg/minio/errors.go b/pkg/minio/errors.go
@@ -12,6 +12,10 @@ type Error struct {
 }
 
 func (e *Error) Error() string {
+	if e.Err == e {
+		return e.Message
+	}
+
 	msg := fmt.Sprintf(e.Message, e.Params...)
 	if e.Err != nil {
 		return fmt.Sprintf("%s: %v", msg, e.Err)