Skip to content

Commit 82a98cd

Browse files
committed
alpha: dependency updates
1 parent a0506ed commit 82a98cd

File tree

9 files changed

+270
-168
lines changed

9 files changed

+270
-168
lines changed

.github/workflows/pr.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@ jobs:
99
lint:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
- name: Install Go
1414
uses: actions/setup-go@v2
1515
with:
16-
go-version: 1.19
16+
go-version: 1.24
1717
- name: golangci-lint
18-
uses: golangci/golangci-lint-action@v2
18+
uses: golangci/golangci-lint-action@v8
1919
with:
20-
version: v1.48.0
21-
skip-go-installation: true
20+
version: v2.3.1
2221
- name: Run go list
2322
run: go list -json -m all > go.list
2423

@@ -28,14 +27,14 @@ jobs:
2827
strategy:
2928
matrix:
3029
golang:
31-
- 1.19
30+
- 1.24
3231
steps:
33-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v4
3433
- name: Install Go
3534
uses: actions/setup-go@v2
3635
with:
3736
go-version: ${{ matrix.golang }}
38-
- uses: actions/cache@v2
37+
- uses: actions/cache@v4
3938
with:
4039
path: ~/Go/pkg/mod
4140
key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }}
@@ -54,14 +53,14 @@ jobs:
5453
strategy:
5554
matrix:
5655
golang:
57-
- 1.19
56+
- 1.24
5857
steps:
59-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v4
6059
- name: Install Go
6160
uses: actions/setup-go@v2
6261
with:
6362
go-version: ${{ matrix.golang }}
64-
- uses: actions/cache@v2
63+
- uses: actions/cache@v4
6564
with:
6665
path: ~/Go/pkg/mod
6766
key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }}
@@ -78,14 +77,14 @@ jobs:
7877
strategy:
7978
matrix:
8079
golang:
81-
- 1.19
80+
- 1.24
8281
steps:
83-
- uses: actions/checkout@v2
82+
- uses: actions/checkout@v4
8483
- name: Install Go
8584
uses: actions/setup-go@v2
8685
with:
8786
go-version: ${{ matrix.golang }}
88-
- uses: actions/cache@v2
87+
- uses: actions/cache@v4
8988
with:
9089
path: ~/go/pkg/mod
9190
key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }}

.golangci.yaml

Lines changed: 129 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,150 @@
1+
version: "2"
12
run:
2-
timeout: 2m
33
tests: false
4-
skip-dirs:
5-
- assets
6-
- proto
7-
- mocks
8-
9-
issues:
10-
exclude-rules:
11-
- text: declaration of "err" shadows declaration
12-
linters:
13-
- govet
14-
15-
linters-settings:
16-
govet:
17-
check-shadowing: true
18-
disable:
19-
- structtag
20-
golint:
21-
min-confidence: 0
22-
gocyclo:
23-
min-complexity: 20
24-
maligned:
25-
suggest-new: true
26-
dupl:
27-
threshold: 250
28-
goconst:
29-
min-len: 3
30-
min-occurrences: 3
31-
misspell:
32-
locale: US
33-
gocritic:
34-
enabled-tags:
35-
- diagnostic
36-
- experimental
37-
- opinionated
38-
- performance
39-
- style
40-
disabled-checks:
41-
- whyNoLint
42-
- commentedOutCode
43-
444
linters:
45-
disable-all: true
5+
default: none
466
enable:
47-
# - bodyclose
48-
- deadcode
49-
- depguard
7+
- asasalint
8+
- bodyclose
9+
- copyloopvar
5010
- dogsled
51-
- dupl
52-
- exportloopref
5311
- errcheck
12+
- errorlint
5413
- exhaustive
14+
# - exhaustruct
15+
- fatcontext
16+
- forbidigo
17+
- gocheckcompilerdirectives
5518
- goconst
56-
- godot
5719
- gocritic
5820
- gocyclo
59-
- gofmt
60-
- goimports
21+
- godot
22+
- gomoddirectives
6123
- goprintffuncname
62-
- gosimple
24+
- gosec
6325
- govet
26+
- iface
27+
- intrange
6428
- ineffassign
65-
- misspell
6629
- nakedret
67-
# - noctx
30+
- noctx
6831
- nolintlint
32+
- reassign
6933
- revive
70-
# - rowserrcheck
7134
- staticcheck
72-
# - structcheck
73-
- stylecheck
74-
- typecheck
35+
- testifylint
36+
- testpackage
37+
- tparallel
7538
- unconvert
76-
# - unparam
39+
- unparam
7740
- unused
78-
- varcheck
41+
- usestdlibvars
42+
- wastedassign
7943
- whitespace
80-
- wsl
44+
- wsl_v5
45+
settings:
46+
gocyclo:
47+
min-complexity: 30
48+
49+
errcheck:
50+
check-type-assertions: true
51+
52+
govet:
53+
# Enable all analyzers.
54+
# Default: false
55+
enable-all: true
56+
# Disable analyzers by name.
57+
# Run `go tool vet help` to see all analyzers.
58+
# Default: []
59+
disable:
60+
- fieldalignment # too strict
61+
# Settings per analyzer.
8162

82-
# don't enable:
83-
# - funlen
84-
# - gochecknoglobals
85-
# - gochecknoinits
86-
# - gocognit
87-
# - godox
88-
# - golint
89-
# - gomnd
90-
# - gosec
91-
# - lll
92-
# - maligned
93-
# - nestif
63+
loggercheck:
64+
slog: true
65+
66+
dupl:
67+
threshold: 200
68+
69+
goconst:
70+
min-len: 3
71+
min-occurrences: 3
72+
73+
wsl:
74+
allow-separated-leading-comment: true
75+
allow-trailing-comment: true
76+
misspell:
77+
locale: US
78+
errorlint:
79+
asserts: false
80+
gocritic:
81+
enabled-tags:
82+
- diagnostic
83+
- experimental
84+
- opinionated
85+
- performance
86+
- style
87+
disabled-checks:
88+
- whyNoLint
89+
- commentedOutCode
90+
- octalLiteral
91+
92+
perfsprint:
93+
strconcat: false
94+
95+
revive:
96+
rules:
97+
- name: "var-naming"
98+
arguments:
99+
- [] # AllowList
100+
- [] # DenyList
101+
- - skip-package-name-checks: true
102+
103+
wsl_v5:
104+
allow-first-in-block: true
105+
allow-whole-block: false
106+
branch-max-lines: 2
107+
staticcheck:
108+
checks:
109+
- all
110+
- "-QF1008" # Ignore: Omit embedded fields from selector expression
111+
exclusions:
112+
generated: lax
113+
presets:
114+
- comments
115+
- common-false-positives
116+
- legacy
117+
- std-error-handling
118+
rules:
119+
- linters:
120+
- govet
121+
text: declaration of "err" shadows declaration
122+
paths:
123+
- assets
124+
- proto
125+
- mocks
126+
- example*
127+
- data
128+
- third_party$
129+
- builtin$
130+
- examples$
131+
formatters:
132+
enable:
133+
- gofmt
134+
- goimports
135+
settings:
136+
gofmt:
137+
rewrite-rules:
138+
- pattern: interface{}
139+
replacement: any
140+
exclusions:
141+
generated: lax
142+
paths:
143+
- assets
144+
- proto
145+
- mocks
146+
- example*
147+
- data
148+
- third_party$
149+
- builtin$
150+
- examples$

go.mod

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,59 @@
11
module github.com/outblocks/cli-plugin-docker
22

3-
go 1.19
3+
go 1.24.0
44

55
require (
66
github.com/Masterminds/sprig v2.22.0+incompatible
7-
github.com/docker/docker v20.10.17+incompatible
7+
github.com/docker/docker v28.5.2+incompatible
88
github.com/mitchellh/mapstructure v1.5.0
9-
github.com/outblocks/outblocks-plugin-go v0.0.0-20220830233253-63e9b8cf3c40
9+
github.com/outblocks/outblocks-plugin-go v0.0.0-20230123145739-c26f926b1595
1010
gopkg.in/yaml.v2 v2.4.0
1111
)
1212

1313
require (
1414
github.com/Masterminds/goutils v1.1.1 // indirect
1515
github.com/Masterminds/semver v1.5.0 // indirect
1616
github.com/Microsoft/go-winio v0.5.2 // indirect
17+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
18+
github.com/containerd/errdefs v1.0.0 // indirect
19+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
20+
github.com/containerd/log v0.1.0 // indirect
1721
github.com/creasty/defaults v1.6.0 // indirect
18-
github.com/docker/distribution v2.8.1+incompatible // indirect
22+
github.com/distribution/reference v0.6.0 // indirect
1923
github.com/docker/go-connections v0.4.0 // indirect
2024
github.com/docker/go-units v0.4.0 // indirect
25+
github.com/felixge/httpsnoop v1.0.4 // indirect
26+
github.com/go-logr/logr v1.4.3 // indirect
27+
github.com/go-logr/stdr v1.2.2 // indirect
2128
github.com/gobwas/glob v0.2.3 // indirect
22-
github.com/gogo/protobuf v1.3.2 // indirect
23-
github.com/golang/protobuf v1.5.2 // indirect
24-
github.com/google/uuid v1.3.0 // indirect
29+
github.com/golang/protobuf v1.5.4 // indirect
30+
github.com/google/uuid v1.6.0 // indirect
2531
github.com/huandu/xstrings v1.3.2 // indirect
2632
github.com/imdario/mergo v0.3.13 // indirect
27-
github.com/kr/text v0.2.0 // indirect
2833
github.com/mitchellh/copystructure v1.2.0 // indirect
2934
github.com/mitchellh/reflectwalk v1.0.2 // indirect
35+
github.com/moby/docker-image-spec v1.3.1 // indirect
36+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
3037
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
3138
github.com/morikuni/aec v1.0.0 // indirect
32-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
3339
github.com/opencontainers/go-digest v1.0.0 // indirect
3440
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
3541
github.com/pkg/errors v0.9.1 // indirect
36-
github.com/sirupsen/logrus v1.8.1 // indirect
37-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
38-
golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect
39-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
40-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
41-
golang.org/x/text v0.3.7 // indirect
42+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
43+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
44+
go.opentelemetry.io/otel v1.39.0 // indirect
45+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0 // indirect
46+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
47+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
48+
golang.org/x/crypto v0.44.0 // indirect
49+
golang.org/x/net v0.47.0 // indirect
50+
golang.org/x/sync v0.18.0 // indirect
51+
golang.org/x/sys v0.39.0 // indirect
52+
golang.org/x/text v0.31.0 // indirect
4253
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
4354
google.golang.org/genproto v0.0.0-20220607140733-d738665f6195 // indirect
44-
google.golang.org/grpc v1.47.0 // indirect
45-
google.golang.org/protobuf v1.28.0 // indirect
46-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
55+
google.golang.org/grpc v1.77.0 // indirect
56+
google.golang.org/protobuf v1.36.10 // indirect
4757
gotest.tools/v3 v3.0.3 // indirect
4858
)
4959

0 commit comments

Comments
 (0)