refactor: improve error formatting

thde · thde · commit 06f7f37a85e8 · 2026-02-10T15:55:49.000+01:00
diff --git a/api/util/bucket_test.go b/api/util/bucket_test.go
@@ -1,6 +1,7 @@
 package util
 
 import (
+	"strings"
 	"testing"
 
 	storage "github.com/ninech/apis/storage/v1alpha1"
@@ -298,7 +299,7 @@ func TestParseCORSLooseWithMask(t *testing.T) {
 
 			if tt.wantErr != "" {
 				assert.Error(t, err)
-				assert.Contains(t, err.Error(), tt.wantErr)
+				assert.Contains(t, strings.ToLower(err.Error()), strings.ToLower(tt.wantErr))
 				return
 			}
 			assert.NoError(t, err)
diff --git a/auth/set_project.go b/auth/set_project.go
@@ -42,7 +42,7 @@ func (s *SetProjectCmd) Run(ctx context.Context, client *api.Client) error {
 			org,
 		)
 		if err := trySwitchOrg(ctx, client, s.Name); err != nil {
-			return fmt.Errorf("failed to switch organization: %w", err)
+			return err
 		}
 
 		org, err = client.Organization()
diff --git a/auth/set_project_test.go b/auth/set_project_test.go
@@ -3,6 +3,7 @@ package auth
 import (
 	"context"
 	"errors"
+	"strings"
 	"testing"
 
 	management "github.com/ninech/apis/management/v1alpha1"
@@ -116,7 +117,7 @@ func TestOrgFromProjectAPIErrors(t *testing.T) {
 			is.NoError(err)
 
 			_, err = orgFromProject(t.Context(), apiClient, "test-prod")
-			is.ErrorContains(err, tc.wantErrContain)
+			is.Contains(strings.ToLower(err.Error()), strings.ToLower(tc.wantErrContain))
 		})
 	}
 }
diff --git a/get/all_test.go b/get/all_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"strings"
 	"testing"
 
 	apps "github.com/ninech/apis/apps/v1alpha1"
@@ -322,7 +323,7 @@ dev      pear    Release      apps.nine.ch
 			if testCase.errorExpected {
 				require.Error(t, err)
 				for _, s := range testCase.errorContains {
-					assert.Contains(t, err.Error(), s)
+					assert.Contains(t, strings.ToLower(err.Error()), strings.ToLower(s))
 				}
 				return
 			}
diff --git a/get/bucket_test.go b/get/bucket_test.go
@@ -3,6 +3,7 @@ package get
 import (
 	"bytes"
 	"context"
+	"strings"
 	"testing"
 	"time"
 
@@ -258,7 +259,7 @@ func TestBucketGet(t *testing.T) {
 			if tt.wantErr {
 				require.Error(t, err)
 				for _, s := range tt.wantContain {
-					assert.Contains(t, err.Error(), s, "missing expected substring %q in error:\n%s", s, err)
+					assert.Contains(t, strings.ToLower(err.Error()), strings.ToLower(s), "missing expected substring %q in error:\n%s", s, err)
 				}
 				return
 			}
diff --git a/get/bucketuser_test.go b/get/bucketuser_test.go
@@ -136,7 +136,7 @@ func TestBucketUser(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("bucketUserCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/cloudvm_test.go b/get/cloudvm_test.go
@@ -135,7 +135,7 @@ func TestCloudVM(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("cloudVMCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/database_test.go b/get/database_test.go
@@ -170,7 +170,7 @@ func TestDatabase(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("postgresDatabaseCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/keyvaluestore_test.go b/get/keyvaluestore_test.go
@@ -175,7 +175,7 @@ func TestKeyValueStore(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("keyValueStoreCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/mysql_test.go b/get/mysql_test.go
@@ -170,7 +170,7 @@ func TestMySQL(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("mySQLCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/opensearch_test.go b/get/opensearch_test.go
@@ -249,7 +249,7 @@ func TestOpenSearch(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("openSearchCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/postgres_test.go b/get/postgres_test.go
@@ -169,7 +169,7 @@ func TestPostgres(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("postgresCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/project_config_test.go b/get/project_config_test.go
@@ -2,6 +2,7 @@ package get
 
 import (
 	"bytes"
+	"strings"
 	"testing"
 	"time"
 
@@ -139,7 +140,7 @@ func TestProjectConfigs(t *testing.T) {
 			if len(tc.errorContains) > 0 {
 				require.Error(t, err)
 				for _, s := range tc.errorContains {
-					assert.Contains(t, err.Error(), s)
+					assert.Contains(t, strings.ToLower(err.Error()), strings.ToLower(s))
 				}
 				return
 			}
diff --git a/get/project_test.go b/get/project_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"strings"
 	"testing"
 
 	management "github.com/ninech/apis/management/v1alpha1"
@@ -20,10 +21,10 @@ func TestProject(t *testing.T) {
 	organization := "evilcorp"
 
 	for name, testCase := range map[string]struct {
-		projects     []client.Object
-		displayNames []string
-		name         string
-		outputFormat outputFormat
+		projects      []client.Object
+		displayNames  []string
+		name          string
+		outputFormat  outputFormat
 		allProjects   bool
 		output        string
 		errorContains []string
@@ -168,7 +169,7 @@ dev      <none>
 			if len(testCase.errorContains) > 0 {
 				require.Error(t, err)
 				for _, s := range testCase.errorContains {
-					assert.Contains(t, err.Error(), s)
+					assert.Contains(t, strings.ToLower(err.Error()), strings.ToLower(s))
 				}
 				return
 			}
diff --git a/get/releases_test.go b/get/releases_test.go
@@ -182,7 +182,7 @@ func TestReleases(t *testing.T) {
 			}
 			if tc.wantErr {
 				for _, substr := range tc.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("releasesCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/get/serviceconnection_test.go b/get/serviceconnection_test.go
@@ -132,7 +132,7 @@ func TestServiceConnection(t *testing.T) {
 			}
 			if tt.wantErr {
 				for _, substr := range tt.wantContain {
-					if !strings.Contains(err.Error(), substr) {
+					if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {
 						t.Errorf("serviceConnectionCmd.Run() error did not contain %q, err = %v", substr, err)
 					}
 				}
diff --git a/internal/cli/error.go b/internal/cli/error.go
@@ -3,6 +3,8 @@ package cli
 import (
 	"fmt"
 	"strings"
+
+	"github.com/ninech/nctl/internal/format"
 )
 
 // Exit codes following the square/exit convention.
@@ -36,7 +38,8 @@ type Error struct {
 func (e *Error) Error() string {
 	sb := strings.Builder{}
 	if e.Err != nil {
-		sb.WriteString(e.Err.Error())
+		s := e.Err.Error()
+		sb.WriteString(format.Failuref("💥", "%s", strings.ToUpper(s[:1])+s[1:]))
 	}
 
 	if len(e.Context) > 0 {
diff --git a/internal/cli/error_test.go b/internal/cli/error_test.go
@@ -2,6 +2,7 @@ package cli
 
 import (
 	"errors"
+	"strings"
 	"testing"
 
 	"github.com/alecthomas/kong"
@@ -109,7 +110,7 @@ func TestErrorOutput(t *testing.T) {
 			t.Parallel()
 			got := tt.err.Error()
 			for _, want := range tt.contains {
-				if !containsSubstring(got, want) {
+				if !strings.Contains(strings.ToLower(got), strings.ToLower(want)) {
 					t.Errorf("Error() output missing %q\ngot: %s", want, got)
 				}
 			}
@@ -140,16 +141,3 @@ func TestErrorWithContextNil(t *testing.T) {
 		t.Errorf("ErrorWithContext(nil) = %v, want nil", got)
 	}
 }
-
-func containsSubstring(s, substr string) bool {
-	return len(substr) == 0 || len(s) >= len(substr) && containsAt(s, substr)
-}
-
-func containsAt(s, substr string) bool {
-	for i := 0; i <= len(s)-len(substr); i++ {
-		if s[i:i+len(substr)] == substr {
-			return true
-		}
-	}
-	return false
-}
diff --git a/internal/format/print.go b/internal/format/print.go
@@ -65,8 +65,8 @@ func success(icon, message string) string {
 	return fmt.Sprintf(" %s %s %s", SuccessChar, message, icon)
 }
 
-// failuref is a formatted message for indicating a failed step.
-func failuref(icon, format string, a ...any) string {
+// Failuref is a formatted message for indicating a failed step.
+func Failuref(icon, format string, a ...any) string {
 	return fmt.Sprintf(" %s %s %s", FailureChar, fmt.Sprintf(format, a...), icon)
 }
 
diff --git a/internal/format/writer.go b/internal/format/writer.go
@@ -59,7 +59,7 @@ func (w *Writer) Warningf(format string, a ...any) {
 
 // Failuref is a formatted message for indicating a failure.
 func (w *Writer) Failuref(icon string, format string, a ...any) {
-	fmt.Fprint(w.writer(), failuref(icon, format, a...)+"\n")
+	fmt.Fprint(w.writer(), Failuref(icon, format, a...)+"\n")
 }
 
 // Infof is a formatted message for providing information.

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (s SetProjectCmd) Run(ctx context.Context, client api.Client) error {`
`42`	`42`	`org,`
`43`	`43`	`)`
`44`	`44`	`if err := trySwitchOrg(ctx, client, s.Name); err != nil {`
`45`		`- return fmt.Errorf("failed to switch organization: %w", err)`
	`45`	`+ return err`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`org, err = client.Organization()`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package auth`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"errors"`
	`6`	`+ "strings"`
`6`	`7`	`"testing"`
`7`	`8`
`8`	`9`	`management "github.com/ninech/apis/management/v1alpha1"`
`@@ -116,7 +117,7 @@ func TestOrgFromProjectAPIErrors(t *testing.T) {`
`116`	`117`	`is.NoError(err)`
`117`	`118`
`118`	`119`	`_, err = orgFromProject(t.Context(), apiClient, "test-prod")`
`119`		`- is.ErrorContains(err, tc.wantErrContain)`
	`120`	`+ is.Contains(strings.ToLower(err.Error()), strings.ToLower(tc.wantErrContain))`
`120`	`121`	`})`
`121`	`122`	`}`
`122`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func TestBucketUser(t *testing.T) {`
`136`	`136`	`}`
`137`	`137`	`if tt.wantErr {`
`138`	`138`	`for _, substr := range tt.wantContain {`
`139`		`- if !strings.Contains(err.Error(), substr) {`
	`139`	`+ if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {`
`140`	`140`	`t.Errorf("bucketUserCmd.Run() error did not contain %q, err = %v", substr, err)`
`141`	`141`	`}`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func TestCloudVM(t *testing.T) {`
`135`	`135`	`}`
`136`	`136`	`if tt.wantErr {`
`137`	`137`	`for _, substr := range tt.wantContain {`
`138`		`- if !strings.Contains(err.Error(), substr) {`
	`138`	`+ if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {`
`139`	`139`	`t.Errorf("cloudVMCmd.Run() error did not contain %q, err = %v", substr, err)`
`140`	`140`	`}`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func TestDatabase(t *testing.T) {`
`170`	`170`	`}`
`171`	`171`	`if tt.wantErr {`
`172`	`172`	`for _, substr := range tt.wantContain {`
`173`		`- if !strings.Contains(err.Error(), substr) {`
	`173`	`+ if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {`
`174`	`174`	`t.Errorf("postgresDatabaseCmd.Run() error did not contain %q, err = %v", substr, err)`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func TestKeyValueStore(t *testing.T) {`
`175`	`175`	`}`
`176`	`176`	`if tt.wantErr {`
`177`	`177`	`for _, substr := range tt.wantContain {`
`178`		`- if !strings.Contains(err.Error(), substr) {`
	`178`	`+ if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {`
`179`	`179`	`t.Errorf("keyValueStoreCmd.Run() error did not contain %q, err = %v", substr, err)`
`180`	`180`	`}`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func TestMySQL(t *testing.T) {`
`170`	`170`	`}`
`171`	`171`	`if tt.wantErr {`
`172`	`172`	`for _, substr := range tt.wantContain {`
`173`		`- if !strings.Contains(err.Error(), substr) {`
	`173`	`+ if !strings.Contains(strings.ToLower(err.Error()), strings.ToLower(substr)) {`
`174`	`174`	`t.Errorf("mySQLCmd.Run() error did not contain %q, err = %v", substr, err)`
`175`	`175`	`}`
`176`	`176`	`}`