Skip to content

Commit 68ebce8

Browse files
committed
[lint] minor fixes
1 parent f2014b9 commit 68ebce8

File tree

35 files changed

+102
-105
lines changed

35 files changed

+102
-105
lines changed

Dockerfile.goreleaser

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3
1+
FROM alpine:3.22
22

33
ARG TARGETPLATFORM
44
ARG BINARY_NAME

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ ifeq ($(OS),Windows_NT)
77
extension = .exe
88
endif
99

10-
.PHONY: all fmt lint test coverage benchmark deps release clean help
10+
.PHONY: \
11+
all fmt lint test coverage benchmark deps release clean help \
12+
init init-dev ngrok air db-upgrade db-upgrade-raw run test-e2e build install \
13+
docker-build docker docker-dev docker-clean
1114

1215
all: fmt lint test benchmark ## Run all tests and checks
1316

@@ -84,5 +87,3 @@ docker-dev:
8487

8588
docker-clean:
8689
docker compose -f deployments/docker-compose/docker-compose.yml down --volumes
87-
88-
.PHONY: init init-dev ngrok air db-upgrade db-upgrade-raw run test-e2e build install docker-build docker docker-dev docker-clean

internal/sms-gateway/cache/factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func NewFactory(config Config) (Factory, error) {
2828

2929
u, err := url.Parse(config.URL)
3030
if err != nil {
31-
return nil, fmt.Errorf("%w: can't parse url: %w", ErrInvalidConfig, err)
31+
return nil, fmt.Errorf("%w: failed to parse url: %w", ErrInvalidConfig, err)
3232
}
3333

3434
switch u.Scheme {

internal/sms-gateway/handlers/devices/3rdparty.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func NewThirdPartyController(
5050
func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
5151
devices, err := h.devicesSvc.Select(user.ID)
5252
if err != nil {
53-
return fmt.Errorf("can't select devices: %w", err)
53+
return fmt.Errorf("failed to select devices: %w", err)
5454
}
5555

5656
response := slices.Map(devices, converters.DeviceToDTO)
@@ -80,7 +80,7 @@ func (h *ThirdPartyController) remove(user models.User, c *fiber.Ctx) error {
8080
return fiber.NewError(fiber.StatusNotFound, err.Error())
8181
}
8282
if err != nil {
83-
return fmt.Errorf("can't remove device: %w", err)
83+
return fmt.Errorf("failed to remove device: %w", err)
8484
}
8585

8686
return c.SendStatus(fiber.StatusNoContent)

internal/sms-gateway/handlers/messages/3rdparty.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (h *ThirdPartyController) post(user models.User, c *fiber.Ctx) error {
144144
return fiber.NewError(fiber.StatusConflict, err.Error())
145145
}
146146

147-
return fmt.Errorf("can't enqueue message: %w", err)
147+
return fmt.Errorf("failed to enqueue message: %w", err)
148148
}
149149

150150
location, err := c.GetRouteURL(route3rdPartyGetMessage, fiber.Map{

internal/sms-gateway/handlers/messages/mobile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (h *MobileController) list(device models.Device, c *fiber.Ctx) error {
6464

6565
msgs, err := h.messagesSvc.SelectPending(device.ID, params.OrderOrDefault())
6666
if err != nil {
67-
return fmt.Errorf("can't get messages: %w", err)
67+
return fmt.Errorf("failed to get messages: %w", err)
6868
}
6969

7070
return c.JSON(

internal/sms-gateway/handlers/mobile.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ func (h *mobileHandler) postDevice(c *fiber.Ctx) error {
117117

118118
user, err = h.authSvc.RegisterUser(login, password)
119119
if err != nil {
120-
return fmt.Errorf("can't create user: %w", err)
120+
return fmt.Errorf("failed to create user: %w", err)
121121
}
122122
}
123123

124124
device, err := h.authSvc.RegisterDevice(*user, req.Name, req.PushToken)
125125
if err != nil {
126-
return fmt.Errorf("can't register device: %w", err)
126+
return fmt.Errorf("failed to register device: %w", err)
127127
}
128128

129129
return c.Status(fiber.StatusCreated).
@@ -160,8 +160,8 @@ func (h *mobileHandler) patchDevice(device models.Device, c *fiber.Ctx) error {
160160
}
161161

162162
if err := h.devicesSvc.UpdatePushToken(req.Id, req.PushToken); err != nil {
163-
h.Logger.Error("can't update device", zap.Error(err), zap.String("device_id", req.Id))
164-
return fiber.NewError(fiber.StatusInternalServerError, "can't update device")
163+
h.Logger.Error("failed to update device", zap.Error(err), zap.String("device_id", req.Id))
164+
return fiber.NewError(fiber.StatusInternalServerError, "failed to update device")
165165
}
166166

167167
return c.SendStatus(fiber.StatusNoContent)

internal/sms-gateway/handlers/settings/3rdparty.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func NewThirdPartyController(params thirdPartyControllerParams) *ThirdPartyContr
5757
func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
5858
settings, err := h.settingsSvc.GetSettings(user.ID, true)
5959
if err != nil {
60-
return fmt.Errorf("can't get settings: %w", err)
60+
return fmt.Errorf("failed to get settings: %w", err)
6161
}
6262

6363
return c.JSON(settings)
@@ -91,7 +91,7 @@ func (h *ThirdPartyController) put(user models.User, c *fiber.Ctx) error {
9191
updated, err := h.settingsSvc.ReplaceSettings(user.ID, settings)
9292

9393
if err != nil {
94-
return fmt.Errorf("can't update settings: %w", err)
94+
return fmt.Errorf("failed to update settings: %w", err)
9595
}
9696

9797
return c.JSON(updated)
@@ -124,7 +124,7 @@ func (h *ThirdPartyController) patch(user models.User, c *fiber.Ctx) error {
124124

125125
updated, err := h.settingsSvc.UpdateSettings(user.ID, settings)
126126
if err != nil {
127-
return fmt.Errorf("can't update settings: %w", err)
127+
return fmt.Errorf("failed to update settings: %w", err)
128128
}
129129

130130
return c.JSON(updated)

internal/sms-gateway/handlers/settings/mobile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func NewMobileController(
5050
func (h *MobileController) get(device models.Device, c *fiber.Ctx) error {
5151
settings, err := h.settingsSvc.GetSettings(device.UserID, false)
5252
if err != nil {
53-
return fmt.Errorf("can't get settings for device %s (user ID: %s): %w", device.ID, device.UserID, err)
53+
return fmt.Errorf("failed to get settings for device %s (user ID: %s): %w", device.ID, device.UserID, err)
5454
}
5555

5656
return c.JSON(settings)

internal/sms-gateway/handlers/webhooks/3rdparty.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func NewThirdPartyController(params thirdPartyControllerParams) *ThirdPartyContr
5353
func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
5454
items, err := h.webhooksSvc.Select(user.ID)
5555
if err != nil {
56-
return fmt.Errorf("can't select webhooks: %w", err)
56+
return fmt.Errorf("failed to select webhooks: %w", err)
5757
}
5858

5959
return c.JSON(items)
@@ -85,7 +85,7 @@ func (h *ThirdPartyController) post(user models.User, c *fiber.Ctx) error {
8585
return fiber.NewError(fiber.StatusBadRequest, err.Error())
8686
}
8787

88-
return fmt.Errorf("can't write webhook: %w", err)
88+
return fmt.Errorf("failed to write webhook: %w", err)
8989
}
9090

9191
return c.Status(fiber.StatusCreated).JSON(dto)
@@ -107,7 +107,7 @@ func (h *ThirdPartyController) delete(user models.User, c *fiber.Ctx) error {
107107
id := c.Params("id")
108108

109109
if err := h.webhooksSvc.Delete(user.ID, webhooks.WithExtID(id)); err != nil {
110-
return fmt.Errorf("can't delete webhook: %w", err)
110+
return fmt.Errorf("failed to delete webhook: %w", err)
111111
}
112112

113113
return c.SendStatus(fiber.StatusNoContent)

0 commit comments

Comments
 (0)