From ca949c5dabbd23e1e3a11ce9afae2dd766eb0f60 Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Wed, 30 Jul 2025 17:48:13 +0200 Subject: [PATCH] fix: resolve linting errors and e2e test failures - Fix ST1005 linting errors by lowercasing error message strings - Fix QF1008 linting errors by removing embedded field selectors in containers.go - Update Alpine version from 3.22 to 3.21 in Makefile to fix Docker image resolution - Update corresponding test expectations for error message changes --- e2e/e2eutil/containers.go | 4 ++-- e2e/playwright/testhelper.go | 12 ++++++------ internal/cmd/pocket.go | 4 ++-- internal/config/config.go | 2 +- internal/domains/auth.go | 2 +- internal/domains/auth_test.go | 2 +- internal/http/handlers/api/v1/auth.go | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/e2e/e2eutil/containers.go b/e2e/e2eutil/containers.go index c6c0ab7e..4398d82f 100644 --- a/e2e/e2eutil/containers.go +++ b/e2e/e2eutil/containers.go @@ -60,9 +60,9 @@ func NewShioriContainer(t *testing.T, tag string) ShioriContainer { } if tag != "" { - containerDefinition.ContainerRequest.Image = "ghcr.io/go-shiori/shiori:" + tag + containerDefinition.Image = "ghcr.io/go-shiori/shiori:" + tag } else { - containerDefinition.ContainerRequest.FromDockerfile = testcontainers.FromDockerfile{ + containerDefinition.FromDockerfile = testcontainers.FromDockerfile{ PrintBuildLog: false, Context: "../..", Dockerfile: "Dockerfile.e2e", diff --git a/e2e/playwright/testhelper.go b/e2e/playwright/testhelper.go index 7769eb99..60338271 100644 --- a/e2e/playwright/testhelper.go +++ b/e2e/playwright/testhelper.go @@ -137,7 +137,7 @@ func (pr *PlaywrightRequire) True(t *testing.T, value bool, msgAndArgs ...interf pr.Assert(t, func() error { var err error if !value { - err = fmt.Errorf("Expected value to be true but got false in test '%s'", t.Name()) + err = fmt.Errorf("expected value to be true but got false in test '%s'", t.Name()) } return err }, msgAndArgs...) @@ -149,7 +149,7 @@ func (pr *PlaywrightRequire) False(t *testing.T, value bool, msgAndArgs ...inter pr.Assert(t, func() error { var err error if value { - err = fmt.Errorf("Expected value to be false but got true in test '%s'", t.Name()) + err = fmt.Errorf("expected value to be false but got true in test '%s'", t.Name()) } return err }, msgAndArgs...) @@ -161,7 +161,7 @@ func (pr *PlaywrightRequire) Equal(t *testing.T, expected, actual interface{}, m pr.Assert(t, func() error { var err error if expected != actual { - err = fmt.Errorf("Expected values to be equal in test '%s':\nexpected: %v\nactual: %v", t.Name(), expected, actual) + err = fmt.Errorf("expected values to be equal in test '%s':\nexpected: %v\nactual: %v", t.Name(), expected, actual) } return err }, msgAndArgs...) @@ -173,7 +173,7 @@ func (pr *PlaywrightRequire) NoError(t *testing.T, err error, msgAndArgs ...inte pr.Assert(t, func() error { var assertErr error if err != nil { - assertErr = fmt.Errorf("Expected no error but got error in test '%s': %v", t.Name(), err) + assertErr = fmt.Errorf("expected no error but got error in test '%s': %v", t.Name(), err) } return assertErr }, msgAndArgs...) @@ -185,7 +185,7 @@ func (pr *PlaywrightRequire) Error(t *testing.T, err error, msgAndArgs ...interf pr.Assert(t, func() error { var assertErr error if err == nil { - assertErr = fmt.Errorf("Expected error but got none in test '%s'", t.Name()) + assertErr = fmt.Errorf("expected error but got none in test '%s'", t.Name()) } return assertErr }, msgAndArgs...) @@ -195,7 +195,7 @@ func (pr *PlaywrightRequire) Error(t *testing.T, err error, msgAndArgs ...interf func (pr *PlaywrightRequire) Contains(t *testing.T, text, expected string, msgAndArgs ...interface{}) { pr.Assert(t, func() error { if !strings.Contains(text, expected) { - return fmt.Errorf("Expected text to contain '%s' but got '%s'", expected, text) + return fmt.Errorf("expected text to contain '%s' but got '%s'", expected, text) } return nil }, msgAndArgs...) diff --git a/internal/cmd/pocket.go b/internal/cmd/pocket.go index 884dfd32..3fb7b2c3 100644 --- a/internal/cmd/pocket.go +++ b/internal/cmd/pocket.go @@ -181,7 +181,7 @@ func verifyMetadata(title, url, timeAddedStr, tags string) (string, string, time // Parse time added timeAddedInt, err := strconv.ParseInt(timeAddedStr, 10, 64) if err != nil { - err = fmt.Errorf("Invalid time added, %w", err) + err = fmt.Errorf("invalid time added, %w", err) return "", "", time.Time{}, nil, err } timeAdded := time.Unix(timeAddedInt, 0) @@ -211,7 +211,7 @@ func handleDuplicates(ctx context.Context, db model.DB, mapURL map[string]struct _, exists, err := db.GetBookmark(ctx, 0, url) if err != nil { - return fmt.Errorf("Failed getting bookmark, %w", err) + return fmt.Errorf("failed getting bookmark, %w", err) } if exists { diff --git a/internal/config/config.go b/internal/config/config.go index 90a05999..8ca76554 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -90,7 +90,7 @@ func (c *HttpConfig) IsValid() error { } if c.ServeWebUIV2 && !c.ServeWebUI { - return fmt.Errorf("You need to enable serving the Web UI to use the experimental Web UI v2") + return fmt.Errorf("you need to enable serving the Web UI to use the experimental Web UI v2") } return nil diff --git a/internal/domains/auth.go b/internal/domains/auth.go index 9a46ee80..8c4c1d8c 100644 --- a/internal/domains/auth.go +++ b/internal/domains/auth.go @@ -25,7 +25,7 @@ func (d *AuthDomain) CheckToken(ctx context.Context, userJWT string) (*model.Acc token, err := jwt.ParseWithClaims(userJWT, &JWTClaim{}, func(token *jwt.Token) (interface{}, error) { // Validate algorithm if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok { - return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"]) + return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"]) } return d.deps.Config().Http.SecretKey, nil diff --git a/internal/domains/auth_test.go b/internal/domains/auth_test.go index de2d2548..9fb51254 100644 --- a/internal/domains/auth_test.go +++ b/internal/domains/auth_test.go @@ -82,7 +82,7 @@ func TestAuthDomainCheckTokenInvalidMethod(t *testing.T) { acc, err := domain.CheckToken(ctx, tokenString) require.Error(t, err) require.Nil(t, acc) - require.Contains(t, err.Error(), "Unexpected signing method") + require.Contains(t, err.Error(), "unexpected signing method") } func TestAuthDomainGetAccountFromCredentials(t *testing.T) { diff --git a/internal/http/handlers/api/v1/auth.go b/internal/http/handlers/api/v1/auth.go index 6c6ae0ff..b3fbc450 100644 --- a/internal/http/handlers/api/v1/auth.go +++ b/internal/http/handlers/api/v1/auth.go @@ -127,7 +127,7 @@ type updateAccountPayload struct { func (p *updateAccountPayload) IsValid() error { if p.NewPassword != "" && p.OldPassword == "" { - return fmt.Errorf("To update the password the old one must be provided") + return fmt.Errorf("to update the password the old one must be provided") } return nil }