Skip to content

Commit abadbc2

Browse files
authored
Merge pull request #78 from Yahoodza/master
ISSUE-67: Deepscan ignores anyProjectDeps flag
2 parents 64e5439 + 33c074e commit abadbc2

Some content is hidden

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

45 files changed

+267
-203
lines changed

.golangci.yml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# More info: https://golangci-lint.run/docs/configuration/file/
2+
version: "2"
3+
4+
run:
5+
tests: true
6+
go: "1.25"
7+
build-tags:
8+
- integration
9+
10+
output:
11+
formats:
12+
text:
13+
print-issued-lines: true
14+
print-linter-name: true
15+
16+
linters:
17+
# v2: вместо disable-all используем default: none
18+
default: none
19+
enable:
20+
# Базовые качество/стиль
21+
- unused # Неиспользуемые константы/переменные/функции/типы
22+
- staticcheck # Большой набор проверок (honnef.co/go/tools)
23+
- govet # Встроенный "go vet": подозрительные конструкции
24+
- revive # Гибкий стилевой линтер (на замену golint)
25+
- whitespace # Лишние пустые строки в начале/конце блоков и т.п.
26+
- asciicheck # ASCII-только: стиль идентификаторов/комментариев
27+
- misspell # Опечатки в комментариях/строках
28+
- dupword # Повторяющиеся слова
29+
- decorder # Порядок объявлений (const/type/var/func)
30+
- goconst # Повторяющиеся литералы → константы
31+
- tagalign # Выравнивание тегов структур
32+
33+
# Ошибки и обработка ошибок
34+
- errcheck # Непроверенные ошибки
35+
- errorlint # Правильная работа с обёртками ошибок (Go 1.13+)
36+
- errname # Имена ошибок: Err* / *Error
37+
38+
# Контекст/конкурентность/тесты
39+
- copyloopvar # Копирование переменной цикла (замыкания/го‑рутины)
40+
41+
# Производственный код/практики
42+
- ineffassign # Присваивания без использования
43+
- wastedassign # "Бесполезные" присваивания
44+
- unconvert # Лишние преобразования типов
45+
- predeclared # Затенение предобъявленных идентификаторов
46+
- makezero # make с ненулевой длиной
47+
- gochecknoinits # Запрещает init(): больше предсказуемости и тестопригодности
48+
- gosec # Статический анализ на уязвимости (безопасность)
49+
50+
settings:
51+
revive:
52+
rules:
53+
- name: var-naming
54+
disabled: true
55+
unused:
56+
field-writes-are-uses: false
57+
exclusions:
58+
generated: lax
59+
presets:
60+
- comments
61+
- common-false-positives
62+
- legacy
63+
- std-error-handling
64+
paths:
65+
- third_party$
66+
- builtin$
67+
- examples$
68+
issues:
69+
max-issues-per-linter: 0
70+
max-same-issues: 0
71+
72+
# В v2 форматтеры выделены отдельно и могут участвовать в `run` как проверки.
73+
formatters:
74+
enable:
75+
- gci
76+
- gofumpt
77+
settings:
78+
gci:
79+
sections:
80+
- standard
81+
- default
82+
- localmodule
83+
# Исключения директорий для форматтеров дублируем, как рекомендует миграция
84+
exclusions:
85+
generated: lax
86+
paths:
87+
- third_party$
88+
- builtin$
89+
- examples$
90+
- bin
91+
- var
92+
- tmp

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20-buster
1+
FROM golang:1.25
22

33
# currently we use `packages.Load(..)` feature of go AST parser
44
# this require go binary and some random files from go setup

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ docker run --rm -v ${PWD}:/app fe3dback/go-arch-lint:latest-stable-release check
7575
[other docker tags and versions](https://hub.docker.com/r/fe3dback/go-arch-lint/tags)
7676

7777
#### From sources
78-
It requires go 1.24+
78+
It requires go 1.25+
7979

8080
```bash
8181
go install github.com/fe3dback/go-arch-lint@latest

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/fe3dback/go-arch-lint
22

3-
go 1.24.0
4-
5-
toolchain go1.24.5
3+
go 1.25.0
64

75
require (
86
github.com/alecthomas/chroma v0.10.0

internal/app/build_consts.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package app
33
import "github.com/fe3dback/go-arch-lint/internal/models"
44

55
var (
6-
Version = models.UnknownVersion // nolint
7-
BuildTime = "unknown" // nolint
8-
CommitHash = "unknown" // nolint
6+
Version = models.UnknownVersion
7+
BuildTime = "unknown"
8+
CommitHash = "unknown"
99
)

internal/app/cli.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ func Execute() int {
2323

2424
// -- process
2525
err := di.CommandRoot().ExecuteContext(mainCtx)
26-
2726
// -- handle errors
2827
if err != nil {
2928
if errors.Is(err, models.UserSpaceError{}) {

internal/app/internal/container/cnt_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package container
22

33
import (
4-
"github.com/fe3dback/go-arch-lint/internal/services/render/printer"
54
"github.com/logrusorgru/aurora/v3"
65

76
"github.com/fe3dback/go-arch-lint/internal/services/render"
7+
"github.com/fe3dback/go-arch-lint/internal/services/render/printer"
88
"github.com/fe3dback/go-arch-lint/internal/view"
99
)
1010

internal/app/internal/container/container_cmd.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"fmt"
55
"strings"
66

7-
"github.com/fe3dback/go-arch-lint/internal/models"
87
"github.com/spf13/cobra"
8+
9+
"github.com/fe3dback/go-arch-lint/internal/models"
910
)
1011

1112
type runner = func(cmd *cobra.Command) (any, error)
@@ -114,12 +115,12 @@ func (c *Container) commands() []*cobra.Command {
114115
}
115116

116117
list := make([]*cobra.Command, 0, len(executors))
117-
for _, x := range executors {
118-
x := x
119-
x.cmd.RunE = func(activeCmd *cobra.Command, _ []string) error {
120-
return c.ProvideRenderer().RenderModel(x.runE(activeCmd))
118+
for i := range executors {
119+
executor := executors[i]
120+
executor.cmd.RunE = func(activeCmd *cobra.Command, _ []string) error {
121+
return c.ProvideRenderer().RenderModel(executor.runE(activeCmd))
121122
}
122-
list = append(list, x.cmd)
123+
list = append(list, executor.cmd)
123124
}
124125

125126
return list

internal/app/internal/container/container_cmd_check.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package container
33
import (
44
"fmt"
55

6+
"github.com/spf13/cobra"
7+
68
"github.com/fe3dback/go-arch-lint/internal/models"
79
"github.com/fe3dback/go-arch-lint/internal/operations/check"
8-
"github.com/spf13/cobra"
910
)
1011

1112
func (c *Container) commandCheck() (*cobra.Command, runner) {

internal/app/internal/container/container_cmd_graph.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import (
44
"fmt"
55
"strings"
66

7+
"github.com/spf13/cobra"
8+
79
"github.com/fe3dback/go-arch-lint/internal/models"
810
"github.com/fe3dback/go-arch-lint/internal/operations/graph"
9-
"github.com/spf13/cobra"
1011
)
1112

1213
func (c *Container) commandGraph() (*cobra.Command, runner) {

0 commit comments

Comments
 (0)