Skip to content

Commit e54f0eb

Browse files
committed
[lint] minor fixes
1 parent fbadcae commit e54f0eb

File tree

48 files changed

+145
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+145
-142
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
run: echo APP_VERSION=${GITHUB_REF#refs/tags/} >> ${GITHUB_ENV}
6565

6666
- name: Checkout code
67-
uses: actions/checkout@v3
67+
uses: actions/checkout@v5
6868

6969
- name: Install Terraform
7070
uses: hashicorp/setup-terraform@v3

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/config/config.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ type Cache struct {
8282
}
8383

8484
type PubSub struct {
85-
URL string `yaml:"url" envconfig:"PUBSUB__URL"`
85+
URL string `yaml:"url" envconfig:"PUBSUB__URL"`
86+
BufferSize uint `yaml:"buffer_size" envconfig:"PUBSUB__BUFFER_SIZE"`
8687
}
8788

8889
func Default() Config {
@@ -119,7 +120,8 @@ func Default() Config {
119120
URL: "memory://",
120121
},
121122
PubSub: PubSub{
122-
URL: "memory://",
123+
URL: "memory://",
124+
BufferSize: 128,
123125
},
124126
}
125127
}

internal/config/module.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func Module() fx.Option {
115115
) * time.Second,
116116
}
117117
}),
118-
fx.Provide(func(cfg Config) devices.Config {
118+
fx.Provide(func(_ Config) devices.Config {
119119
return devices.Config{
120120
UnusedLifetime: 365 * 24 * time.Hour, //TODO: make it configurable
121121
}
@@ -133,7 +133,7 @@ func Module() fx.Option {
133133
fx.Provide(func(cfg Config) pubsub.Config {
134134
return pubsub.Config{
135135
URL: cfg.PubSub.URL,
136-
BufferSize: 128,
136+
BufferSize: cfg.PubSub.BufferSize,
137137
}
138138
}),
139139
)

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/base/handler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ type Handler struct {
1919

2020
func (h *Handler) BodyParserValidator(c *fiber.Ctx, out any) error {
2121
if err := c.BodyParser(out); err != nil {
22-
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Can't parse body: %s", err.Error()))
22+
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to parse body: %s", err.Error()))
2323
}
2424

2525
return h.ValidateStruct(out)
2626
}
2727

2828
func (h *Handler) QueryParserValidator(c *fiber.Ctx, out any) error {
2929
if err := c.QueryParser(out); err != nil {
30-
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Can't parse query: %s", err.Error()))
30+
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to parse query: %s", err.Error()))
3131
}
3232

3333
return h.ValidateStruct(out)
3434
}
3535

3636
func (h *Handler) ParamsParserValidator(c *fiber.Ctx, out any) error {
3737
if err := c.ParamsParser(out); err != nil {
38-
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Can't parse params: %s", err.Error()))
38+
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to parse params: %s", err.Error()))
3939
}
4040

4141
return h.ValidateStruct(out)

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: 2 additions & 2 deletions
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(
@@ -106,7 +106,7 @@ func (h *MobileController) patch(device models.Device, c *fiber.Ctx) error {
106106

107107
err := h.messagesSvc.UpdateState(&device, messageState)
108108
if err != nil && !errors.Is(err, messages.ErrMessageNotFound) {
109-
h.Logger.Error("Can't update message status",
109+
h.Logger.Error("failed to update message status",
110110
zap.String("message_id", v.ID),
111111
zap.Error(err),
112112
)

0 commit comments

Comments
 (0)