Skip to content

Commit 11df780

Browse files
Upgraded manifest parser version to v0.1.2 and go version to 1.25.8 (AST-139876) (#1457)
1 parent ee78f83 commit 11df780

4 files changed

Lines changed: 100 additions & 108 deletions

File tree

.github/workflows/ci-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ jobs:
127127
- run: go version
128128
- run: go mod tidy
129129
- name: golangci-lint
130-
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc #v3
130+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 #v9.2.0
131131
with:
132132
skip-pkg-cache: true
133-
version: v1.64.2
133+
version: v2.11.3
134134
args: -c .golangci.yml
135135
--timeout 5m
136136
only-new-issues: true

.golangci.yml

Lines changed: 94 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
# .golangci.yml
22

3-
3+
version: "2"
44
run:
55
timeout: 5m
6-
issues:
7-
exclude-dirs:
8-
- test/testdata_etc
9-
- internal/cache
10-
- internal/renameio
11-
- internal/robustio
126

137
linters:
14-
disable-all: true
158
enable:
169
- bodyclose
1710
- depguard
@@ -23,107 +16,108 @@ linters:
2316
- goconst
2417
- gocritic
2518
- gocyclo
26-
- gofmt
27-
- goimports
2819
- ineffassign
2920
- mnd # replacement for gomnd
3021
- nakedret
3122
- revive # replacement for golint
3223
- rowserrcheck
3324
- staticcheck
34-
- stylecheck
35-
- typecheck
3625
- unconvert
3726
- unparam
3827
- unused # covers deadcode/varcheck/structcheck
3928
- whitespace
40-
41-
linters.settings:
42-
depguard:
43-
list-type: blacklist
44-
rules:
45-
main:
46-
allow:
47-
- $gostd
48-
- github.com/checkmarx/ast-cli/internal
49-
- github.com/gookit/color
50-
- github.com/CheckmarxDev/containers-resolver/pkg/containerResolver
51-
- github.com/Checkmarx/manifest-parser/pkg/parser/models
52-
- github.com/Checkmarx/manifest-parser/pkg/parser
53-
- github.com/Checkmarx/secret-detection/pkg/hooks/pre-commit
54-
- github.com/Checkmarx/secret-detection/pkg/hooks/pre-receive
55-
- github.com/Checkmarx/gen-ai-prompts/prompts/sast_result_remediation
56-
- github.com/spf13/viper
57-
- github.com/checkmarx/2ms/v3/lib/reporting
58-
- github.com/checkmarx/2ms/v3/lib/secrets
59-
- github.com/checkmarx/2ms/v3/pkg
60-
- github.com/Checkmarx/gen-ai-wrapper
61-
- github.com/spf13/cobra
62-
- github.com/pkg/errors
63-
- github.com/google
64-
- github.com/MakeNowJust/heredoc
65-
- github.com/jsumners/go-getport
66-
- github.com/stretchr/testify/assert
67-
- github.com/gofrs/flock
68-
- github.com/golang-jwt/jwt/v5
69-
- github.com/Checkmarx/containers-images-extractor/pkg/imagesExtractor
70-
- github.com/Checkmarx/containers-types/types
71-
dupl:
72-
threshold: 500
73-
funlen:
74-
lines: 200
75-
statements: 100
76-
goconst:
77-
min-len: 2
78-
min-occurrences: 2
79-
gocritic:
80-
enabled-tags:
81-
- diagnostic
82-
- experimental
83-
- opinionated
84-
- performance
85-
- style
86-
disabled-checks:
87-
- dupImport # https://github.com/go-critic/go-critic/issues/845
88-
- ifElseChain
89-
- octalLiteral
90-
- whyNoLint
91-
- wrapperFunc
92-
gocyclo:
93-
min-complexity: 15
94-
goimports:
95-
local-prefixes: github.com/golangci/golangci-lint
96-
mnd:
97-
settings:
98-
mnd:
99-
checks: argument,case,condition,return
100-
revive:
29+
exclusions:
30+
paths:
31+
- test/testdata_etc
32+
- internal/cache
33+
- internal/renameio
34+
- internal/robustio
10135
rules:
102-
- name: exported
103-
arguments:
104-
- disableStutteringCheck
105-
govet:
106-
settings:
107-
printf:
108-
funcs:
109-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
110-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
111-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
112-
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
113-
lll:
114-
line-length: 185
115-
maligned:
116-
suggest-new: true
117-
misspell:
118-
locale: US
36+
- path: _test\.go
37+
linters:
38+
- mnd
39+
settings:
40+
depguard:
41+
rules:
42+
main:
43+
list-mode: lax
44+
allow:
45+
- $gostd
46+
- github.com/checkmarx/ast-cli/internal
47+
- github.com/gookit/color
48+
- github.com/CheckmarxDev/containers-resolver/pkg/containerResolver
49+
- github.com/Checkmarx/manifest-parser/pkg/parser/models
50+
- github.com/Checkmarx/manifest-parser/pkg/parser
51+
- github.com/Checkmarx/secret-detection/pkg/hooks/pre-commit
52+
- github.com/Checkmarx/secret-detection/pkg/hooks/pre-receive
53+
- github.com/Checkmarx/gen-ai-prompts/prompts/sast_result_remediation
54+
- github.com/spf13/viper
55+
- github.com/checkmarx/2ms/v3/lib/reporting
56+
- github.com/checkmarx/2ms/v3/lib/secrets
57+
- github.com/checkmarx/2ms/v3/pkg
58+
- github.com/Checkmarx/gen-ai-wrapper
59+
- github.com/spf13/cobra
60+
- github.com/pkg/errors
61+
- github.com/google
62+
- github.com/MakeNowJust/heredoc
63+
- github.com/jsumners/go-getport
64+
- github.com/stretchr/testify/assert
65+
- github.com/gofrs/flock
66+
- github.com/golang-jwt/jwt/v5
67+
- github.com/Checkmarx/containers-images-extractor/pkg/imagesExtractor
68+
- github.com/Checkmarx/containers-types/types
69+
dupl:
70+
threshold: 500
71+
funlen:
72+
lines: 200
73+
statements: 100
74+
goconst:
75+
min-len: 2
76+
min-occurrences: 2
77+
gocritic:
78+
enabled-tags:
79+
- diagnostic
80+
- experimental
81+
- opinionated
82+
- performance
83+
- style
84+
disabled-checks:
85+
- dupImport # https://github.com/go-critic/go-critic/issues/845
86+
- ifElseChain
87+
- octalLiteral
88+
- whyNoLint
89+
- wrapperFunc
90+
gocyclo:
91+
min-complexity: 15
92+
mnd:
93+
checks:
94+
- argument
95+
- case
96+
- condition
97+
- return
98+
revive:
99+
rules:
100+
- name: exported
101+
arguments:
102+
- disableStutteringCheck
103+
govet:
104+
settings:
105+
printf:
106+
funcs:
107+
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
108+
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
109+
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
110+
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
111+
lll:
112+
line-length: 185
113+
misspell:
114+
locale: US
119115

120-
issues:
121-
exclude-rules:
122-
- path: _test\.go
123-
linters:
124-
- mnd
125-
126-
service:
127-
golangci-lint-version: 1.64.2
128-
prepare:
129-
- echo "No special prep steps needed"
116+
formatters:
117+
enable:
118+
- gofmt
119+
- goimports
120+
settings:
121+
goimports:
122+
local-prefixes:
123+
- github.com/golangci/golangci-lint

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/checkmarx/ast-cli
22

3-
go 1.24.13
3+
go 1.25.8
44

55

66
require (
77
github.com/Checkmarx/containers-resolver v1.0.33
88
github.com/Checkmarx/containers-types v1.0.9
99
github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63
1010
github.com/Checkmarx/gen-ai-wrapper v1.0.3
11-
github.com/Checkmarx/manifest-parser v0.1.1
11+
github.com/Checkmarx/manifest-parser v0.1.2
1212
github.com/Checkmarx/secret-detection v1.2.1
1313
github.com/MakeNowJust/heredoc v1.0.0
1414
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63 h1:SCuTcE
7777
github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63/go.mod h1:MI6lfLerXU+5eTV/EPTDavgnV3owz3GPT4g/msZBWPo=
7878
github.com/Checkmarx/gen-ai-wrapper v1.0.3 h1:p7lc/U4dFltsIxAEeWeDNW4+8ovvlJvdb5pVBLcbKs8=
7979
github.com/Checkmarx/gen-ai-wrapper v1.0.3/go.mod h1:xwRLefezwNNnRGu1EjGS6wNiR9FVV/eP9D+oXwLViVM=
80-
github.com/Checkmarx/manifest-parser v0.1.1 h1:Yp/fy0NjeLxxcS8y9AA9yIzWafC/Zeqn36YjVSe91DU=
81-
github.com/Checkmarx/manifest-parser v0.1.1/go.mod h1:hh5FX5FdDieU8CKQEkged4hfOaSylpJzub8PRFXa4kA=
80+
github.com/Checkmarx/manifest-parser v0.1.2 h1:Sh2xkpeOWKu56Y7wo+ljckNGHAQX1uITEeH3cI2T0pg=
81+
github.com/Checkmarx/manifest-parser v0.1.2/go.mod h1:hh5FX5FdDieU8CKQEkged4hfOaSylpJzub8PRFXa4kA=
8282
github.com/Checkmarx/secret-detection v1.2.1 h1:Hzpz74dcN/L14Q86ARvPOZpKBnERzGTpy6sl1RXKOTo=
8383
github.com/Checkmarx/secret-detection v1.2.1/go.mod h1:kbXbtIQisDdB/TNuV7r9HPclEznUyBHLQ5yr7IX7vBQ=
8484
github.com/CycloneDX/cyclonedx-go v0.9.2 h1:688QHn2X/5nRezKe2ueIVCt+NRqf7fl3AVQk+vaFcIo=
@@ -297,8 +297,6 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
297297
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
298298
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
299299
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
300-
github.com/docker/cli v29.0.3+incompatible h1:8J+PZIcF2xLd6h5sHPsp5pvvJA+Sr2wGQxHkRl53a1E=
301-
github.com/docker/cli v29.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
302300
github.com/docker/cli v29.2.0+incompatible h1:9oBd9+YM7rxjZLfyMGxjraKBKE4/nVyvVfN4qNl9XRM=
303301
github.com/docker/cli v29.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
304302
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=

0 commit comments

Comments
 (0)