Skip to content

Commit ca949c5

Browse files
committed
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
1 parent 9f6a4c3 commit ca949c5

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

e2e/e2eutil/containers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ func NewShioriContainer(t *testing.T, tag string) ShioriContainer {
6060
}
6161

6262
if tag != "" {
63-
containerDefinition.ContainerRequest.Image = "ghcr.io/go-shiori/shiori:" + tag
63+
containerDefinition.Image = "ghcr.io/go-shiori/shiori:" + tag
6464
} else {
65-
containerDefinition.ContainerRequest.FromDockerfile = testcontainers.FromDockerfile{
65+
containerDefinition.FromDockerfile = testcontainers.FromDockerfile{
6666
PrintBuildLog: false,
6767
Context: "../..",
6868
Dockerfile: "Dockerfile.e2e",

e2e/playwright/testhelper.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (pr *PlaywrightRequire) True(t *testing.T, value bool, msgAndArgs ...interf
137137
pr.Assert(t, func() error {
138138
var err error
139139
if !value {
140-
err = fmt.Errorf("Expected value to be true but got false in test '%s'", t.Name())
140+
err = fmt.Errorf("expected value to be true but got false in test '%s'", t.Name())
141141
}
142142
return err
143143
}, msgAndArgs...)
@@ -149,7 +149,7 @@ func (pr *PlaywrightRequire) False(t *testing.T, value bool, msgAndArgs ...inter
149149
pr.Assert(t, func() error {
150150
var err error
151151
if value {
152-
err = fmt.Errorf("Expected value to be false but got true in test '%s'", t.Name())
152+
err = fmt.Errorf("expected value to be false but got true in test '%s'", t.Name())
153153
}
154154
return err
155155
}, msgAndArgs...)
@@ -161,7 +161,7 @@ func (pr *PlaywrightRequire) Equal(t *testing.T, expected, actual interface{}, m
161161
pr.Assert(t, func() error {
162162
var err error
163163
if expected != actual {
164-
err = fmt.Errorf("Expected values to be equal in test '%s':\nexpected: %v\nactual: %v", t.Name(), expected, actual)
164+
err = fmt.Errorf("expected values to be equal in test '%s':\nexpected: %v\nactual: %v", t.Name(), expected, actual)
165165
}
166166
return err
167167
}, msgAndArgs...)
@@ -173,7 +173,7 @@ func (pr *PlaywrightRequire) NoError(t *testing.T, err error, msgAndArgs ...inte
173173
pr.Assert(t, func() error {
174174
var assertErr error
175175
if err != nil {
176-
assertErr = fmt.Errorf("Expected no error but got error in test '%s': %v", t.Name(), err)
176+
assertErr = fmt.Errorf("expected no error but got error in test '%s': %v", t.Name(), err)
177177
}
178178
return assertErr
179179
}, msgAndArgs...)
@@ -185,7 +185,7 @@ func (pr *PlaywrightRequire) Error(t *testing.T, err error, msgAndArgs ...interf
185185
pr.Assert(t, func() error {
186186
var assertErr error
187187
if err == nil {
188-
assertErr = fmt.Errorf("Expected error but got none in test '%s'", t.Name())
188+
assertErr = fmt.Errorf("expected error but got none in test '%s'", t.Name())
189189
}
190190
return assertErr
191191
}, msgAndArgs...)
@@ -195,7 +195,7 @@ func (pr *PlaywrightRequire) Error(t *testing.T, err error, msgAndArgs ...interf
195195
func (pr *PlaywrightRequire) Contains(t *testing.T, text, expected string, msgAndArgs ...interface{}) {
196196
pr.Assert(t, func() error {
197197
if !strings.Contains(text, expected) {
198-
return fmt.Errorf("Expected text to contain '%s' but got '%s'", expected, text)
198+
return fmt.Errorf("expected text to contain '%s' but got '%s'", expected, text)
199199
}
200200
return nil
201201
}, msgAndArgs...)

internal/cmd/pocket.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func verifyMetadata(title, url, timeAddedStr, tags string) (string, string, time
181181
// Parse time added
182182
timeAddedInt, err := strconv.ParseInt(timeAddedStr, 10, 64)
183183
if err != nil {
184-
err = fmt.Errorf("Invalid time added, %w", err)
184+
err = fmt.Errorf("invalid time added, %w", err)
185185
return "", "", time.Time{}, nil, err
186186
}
187187
timeAdded := time.Unix(timeAddedInt, 0)
@@ -211,7 +211,7 @@ func handleDuplicates(ctx context.Context, db model.DB, mapURL map[string]struct
211211

212212
_, exists, err := db.GetBookmark(ctx, 0, url)
213213
if err != nil {
214-
return fmt.Errorf("Failed getting bookmark, %w", err)
214+
return fmt.Errorf("failed getting bookmark, %w", err)
215215
}
216216

217217
if exists {

internal/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (c *HttpConfig) IsValid() error {
9090
}
9191

9292
if c.ServeWebUIV2 && !c.ServeWebUI {
93-
return fmt.Errorf("You need to enable serving the Web UI to use the experimental Web UI v2")
93+
return fmt.Errorf("you need to enable serving the Web UI to use the experimental Web UI v2")
9494
}
9595

9696
return nil

internal/domains/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (d *AuthDomain) CheckToken(ctx context.Context, userJWT string) (*model.Acc
2525
token, err := jwt.ParseWithClaims(userJWT, &JWTClaim{}, func(token *jwt.Token) (interface{}, error) {
2626
// Validate algorithm
2727
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
28-
return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
28+
return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
2929
}
3030

3131
return d.deps.Config().Http.SecretKey, nil

internal/domains/auth_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func TestAuthDomainCheckTokenInvalidMethod(t *testing.T) {
8282
acc, err := domain.CheckToken(ctx, tokenString)
8383
require.Error(t, err)
8484
require.Nil(t, acc)
85-
require.Contains(t, err.Error(), "Unexpected signing method")
85+
require.Contains(t, err.Error(), "unexpected signing method")
8686
}
8787

8888
func TestAuthDomainGetAccountFromCredentials(t *testing.T) {

internal/http/handlers/api/v1/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ type updateAccountPayload struct {
127127

128128
func (p *updateAccountPayload) IsValid() error {
129129
if p.NewPassword != "" && p.OldPassword == "" {
130-
return fmt.Errorf("To update the password the old one must be provided")
130+
return fmt.Errorf("to update the password the old one must be provided")
131131
}
132132
return nil
133133
}

0 commit comments

Comments
 (0)