Skip to content

Commit 9ee0b76

Browse files
authored
update deps, remove bmc-toolbox (#41)
* update deps, remove bmc-toolbox * use setup-go@v5 * reorder checkout and install go
1 parent 3da7947 commit 9ee0b76

File tree

10 files changed

+232
-215
lines changed

10 files changed

+232
-215
lines changed

.github/workflows/push-pr-lint.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@ jobs:
55
lint-test:
66
runs-on: ubuntu-latest
77
steps:
8-
- name: Install Go
9-
uses: actions/setup-go@v4
10-
with:
11-
go-version: "1.22"
128
- name: Checkout code
139
uses: actions/checkout@v4
10+
11+
- name: Install Go
12+
uses: actions/setup-go@v5
13+
with:
14+
go-version-file: go.mod
15+
1416
- name: golangci-lint
15-
uses: golangci/golangci-lint-action@v3
17+
uses: golangci/golangci-lint-action@v6
1618
with:
1719
args: --config .golangci.yml --timeout 2m
18-
version: v1.57.1
20+
version: v1.61.0
1921
skip-cache: true
22+
2023
- name: Test
2124
run: go test ./...
2225
build:

.golangci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# golangci.com configuration
22
# https://github.com/golangci/golangci/wiki/Configuration
33
service:
4-
golangci-lint-version: 1.50.0 # use the fixed version to not introduce new linters unexpectedly
4+
golangci-lint-version: 1.61.0 # use the fixed version to not introduce new linters unexpectedly
55

66
linters-settings:
77
govet:
88
enable:
99
- fieldalignment
1010
auto-fix: true
11-
check-shadowing: true
11+
shadow: true
1212
settings:
1313
printf:
1414
funcs:
@@ -65,7 +65,7 @@ linters:
6565
# additional linters
6666
- bodyclose
6767
- gocritic
68-
- goerr113
68+
- err113
6969
- goimports
7070
- revive
7171
- misspell
@@ -76,14 +76,13 @@ linters:
7676
enable-all: false
7777
disable-all: true
7878

79-
run:
80-
# build-tags:
81-
skip-dirs:
79+
issues:
80+
exclude-dirs:
8281
- internal/fixtures
83-
skip-files:
82+
83+
exclude-files:
8484
- "(.*/)*.*_test.go"
8585

86-
issues:
8786
exclude-rules:
8887
- linters:
8988
- gosec

go.mod

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,73 @@
11
module github.com/metal-toolbox/flipflop
22

3-
go 1.22
3+
go 1.22.7
44

5-
toolchain go1.22.1
5+
toolchain go1.23.1
66

77
require (
88
github.com/banzaicloud/logrus-runtime-formatter v0.0.0-20190729070250-5ae5475bae5e
9-
github.com/bmc-toolbox/bmclib/v2 v2.2.2
109
github.com/bombsimon/logrusr/v2 v2.0.1
1110
github.com/coreos/go-oidc v2.2.1+incompatible
1211
github.com/equinix-labs/otel-init-go v0.0.9
1312
github.com/google/uuid v1.6.0
1413
github.com/hashicorp/go-retryablehttp v0.7.7
1514
github.com/jeremywohl/flatten v1.0.1
16-
github.com/metal-toolbox/ctrl v0.2.9
17-
github.com/metal-toolbox/fleetdb v1.19.5
18-
github.com/metal-toolbox/rivets v1.3.7
15+
github.com/metal-toolbox/bmclib v1.0.2
16+
github.com/metal-toolbox/ctrl v1.1.0
17+
github.com/metal-toolbox/fleetdb v1.20.1
18+
github.com/metal-toolbox/rivets/v2 v2.0.0
1919
github.com/mitchellh/copystructure v1.2.0
2020
github.com/mitchellh/mapstructure v1.5.0
2121
github.com/pkg/errors v0.9.1
22-
github.com/prometheus/client_golang v1.20.1
22+
github.com/prometheus/client_golang v1.20.5
2323
github.com/sirupsen/logrus v1.9.3
2424
github.com/spf13/cobra v1.8.1
2525
github.com/spf13/viper v1.19.0
2626
github.com/stretchr/testify v1.9.0
27-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
28-
go.opentelemetry.io/otel v1.28.0
29-
go.opentelemetry.io/otel/trace v1.28.0
30-
golang.org/x/net v0.28.0
31-
golang.org/x/oauth2 v0.22.0
27+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
28+
go.opentelemetry.io/otel v1.32.0
29+
go.opentelemetry.io/otel/trace v1.32.0
30+
golang.org/x/net v0.31.0
31+
golang.org/x/oauth2 v0.24.0
3232
)
3333

3434
require (
35-
dario.cat/mergo v1.0.0 // indirect
35+
dario.cat/mergo v1.0.1 // indirect
3636
github.com/Jeffail/gabs/v2 v2.7.0 // indirect
3737
github.com/VictorLowther/simplexml v0.0.0-20180716164440-0bff93621230 // indirect
3838
github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22 // indirect
3939
github.com/beorn7/perks v1.0.1 // indirect
40-
github.com/bmc-toolbox/common v0.0.0-20240723142833-87832458b53b // indirect
41-
github.com/bytedance/sonic v1.12.1 // indirect
42-
github.com/bytedance/sonic/loader v0.2.0 // indirect
40+
github.com/bytedance/sonic v1.12.4 // indirect
41+
github.com/bytedance/sonic/loader v0.2.1 // indirect
4342
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4443
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4544
github.com/cloudwego/base64x v0.1.4 // indirect
4645
github.com/cloudwego/iasm v0.2.0 // indirect
4746
github.com/cockroachdb/cockroach-go/v2 v2.3.8 // indirect
47+
github.com/coreos/go-oidc/v3 v3.11.0 // indirect
4848
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4949
github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731 // indirect
5050
github.com/felixge/httpsnoop v1.0.4 // indirect
5151
github.com/friendsofgo/errors v0.9.2 // indirect
52-
github.com/fsnotify/fsnotify v1.7.0 // indirect
53-
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
52+
github.com/fsnotify/fsnotify v1.8.0 // indirect
53+
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
5454
github.com/ghodss/yaml v1.0.0 // indirect
5555
github.com/gin-contrib/sse v0.1.0 // indirect
5656
github.com/gin-gonic/gin v1.10.0 // indirect
57+
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
5758
github.com/go-logr/logr v1.4.2 // indirect
5859
github.com/go-logr/stdr v1.2.2 // indirect
5960
github.com/go-playground/locales v0.14.1 // indirect
6061
github.com/go-playground/universal-translator v0.18.1 // indirect
61-
github.com/go-playground/validator/v10 v10.22.0 // indirect
62+
github.com/go-playground/validator/v10 v10.23.0 // indirect
6263
github.com/goccy/go-json v0.10.3 // indirect
6364
github.com/gofrs/uuid v4.4.0+incompatible // indirect
6465
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
65-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
66+
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
6667
github.com/gorilla/websocket v1.5.3 // indirect
6768
github.com/gosimple/slug v1.14.0 // indirect
6869
github.com/gosimple/unidecode v1.0.1 // indirect
69-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect
70+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
7071
github.com/hashicorp/errwrap v1.1.0 // indirect
7172
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7273
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -79,41 +80,42 @@ require (
7980
github.com/jackc/pgpassfile v1.0.0 // indirect
8081
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
8182
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
82-
github.com/jackc/pgtype v1.14.3 // indirect
83+
github.com/jackc/pgtype v1.14.4 // indirect
8384
github.com/jackc/pgx/v4 v4.18.3 // indirect
8485
github.com/jacobweinstock/iamt v0.0.0-20230502042727-d7cdbe67d9ef // indirect
8586
github.com/jacobweinstock/registrar v0.4.7 // indirect
8687
github.com/jmoiron/sqlx v1.4.0 // indirect
8788
github.com/json-iterator/go v1.1.12 // indirect
88-
github.com/klauspost/compress v1.17.9 // indirect
89-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
89+
github.com/klauspost/compress v1.17.11 // indirect
90+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
9091
github.com/leodido/go-urn v1.4.0 // indirect
9192
github.com/lib/pq v1.10.9 // indirect
9293
github.com/magiconair/properties v1.8.7 // indirect
9394
github.com/mattn/go-isatty v0.0.20 // indirect
94-
github.com/metal-toolbox/conditionorc v1.1.8 // indirect
95+
github.com/metal-toolbox/bmc-common v1.0.2 // indirect
96+
github.com/metal-toolbox/conditionorc v1.12.0 // indirect
9597
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9698
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9799
github.com/modern-go/reflect2 v1.0.2 // indirect
98100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
99-
github.com/nats-io/nats.go v1.36.0 // indirect
101+
github.com/nats-io/nats.go v1.37.0 // indirect
100102
github.com/nats-io/nkeys v0.4.7 // indirect
101103
github.com/nats-io/nuid v1.0.1 // indirect
102-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
104+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
103105
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
104106
github.com/pquerna/cachecontrol v0.2.0 // indirect
105107
github.com/prometheus/client_model v0.6.1 // indirect
106-
github.com/prometheus/common v0.55.0 // indirect
108+
github.com/prometheus/common v0.60.1 // indirect
107109
github.com/prometheus/procfs v0.15.1 // indirect
108110
github.com/sagikazarmark/locafero v0.6.0 // indirect
109111
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
110112
github.com/satori/go.uuid v1.2.0 // indirect
111-
github.com/slack-go/slack v0.13.1 // indirect
113+
github.com/slack-go/slack v0.15.0 // indirect
112114
github.com/sourcegraph/conc v0.3.0 // indirect
113115
github.com/spf13/afero v1.11.0 // indirect
114-
github.com/spf13/cast v1.6.0 // indirect
116+
github.com/spf13/cast v1.7.0 // indirect
115117
github.com/spf13/pflag v1.0.5 // indirect
116-
github.com/stmcginnis/gofish v0.15.1-0.20231121142100-22a60a77be91 // indirect
118+
github.com/stmcginnis/gofish v0.20.0 // indirect
117119
github.com/stretchr/objx v0.5.2 // indirect
118120
github.com/subosito/gotenv v1.6.0 // indirect
119121
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -123,28 +125,29 @@ require (
123125
github.com/volatiletech/null/v8 v8.1.2 // indirect
124126
github.com/volatiletech/randomize v0.0.1 // indirect
125127
github.com/volatiletech/sqlboiler v3.7.1+incompatible // indirect
126-
github.com/volatiletech/sqlboiler/v4 v4.16.2 // indirect
127-
github.com/volatiletech/strmangle v0.0.6 // indirect
128+
github.com/volatiletech/sqlboiler/v4 v4.17.1 // indirect
129+
github.com/volatiletech/strmangle v0.0.8 // indirect
128130
go.opencensus.io v0.24.0 // indirect
129-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
130-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
131-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
132-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
131+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
133+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
134+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
133135
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
134136
go.uber.org/multierr v1.11.0 // indirect
135137
go.uber.org/zap v1.27.0 // indirect
136-
gocloud.dev v0.38.0 // indirect
137-
golang.org/x/arch v0.9.0 // indirect
138-
golang.org/x/crypto v0.26.0 // indirect
139-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
140-
golang.org/x/sys v0.24.0 // indirect
141-
golang.org/x/text v0.17.0 // indirect
142-
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
143-
google.golang.org/api v0.189.0 // indirect
144-
google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf // indirect
145-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
146-
google.golang.org/grpc v1.65.0 // indirect
147-
google.golang.org/protobuf v1.34.2 // indirect
138+
gocloud.dev v0.40.0 // indirect
139+
golang.org/x/arch v0.12.0 // indirect
140+
golang.org/x/crypto v0.29.0 // indirect
141+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
142+
golang.org/x/sys v0.27.0 // indirect
143+
golang.org/x/text v0.20.0 // indirect
144+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
145+
google.golang.org/api v0.208.0 // indirect
146+
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
147+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
148+
google.golang.org/grpc v1.68.0 // indirect
149+
google.golang.org/protobuf v1.35.2 // indirect
150+
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
148151
gopkg.in/ini.v1 v1.67.0 // indirect
149152
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
150153
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)