Skip to content

Commit 5395cb8

Browse files
DoctorVinDoctorVin
authored
update dependencies (#258)
Like in other controllers, here we do a general dependency update as well as explicitly update to metal-toolbox versions of bmclib, bmc-common and rivets/v2. Unlike the flasher case we maintain the current (if suboptimal) usage of the FleetDB API, because we don't have to tackle that immediately; it did not use the now-removed rivets fleetdb module.
1 parent e68dc5a commit 5395cb8

File tree

27 files changed

+280
-163
lines changed

27 files changed

+280
-163
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @joelrebel @splaspood @DoctorVin
1+
* @metal-toolbox/provisioning-core @metal-toolbox/hardware-core

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ jobs:
1414
go-version-file: go.mod
1515

1616
- name: golangci-lint
17-
run: make lint
17+
uses: golangci/golangci-lint-action@v6
18+
with:
19+
args: --config .golangci.yml --timeout 2m
20+
version: v1.61.0
1821

1922
- name: Test
2023
run: go test ./...

‎.golangci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ service:
66
linters-settings:
77
govet:
88
auto-fix: true
9-
check-shadowing: true
9+
shadow: true
1010
settings:
1111
printf:
1212
funcs:
@@ -63,10 +63,9 @@ linters:
6363
# additional linters
6464
- bodyclose
6565
- gocritic
66-
- goerr113
66+
- err113
6767
- goimports
6868
- revive
69-
- gomnd
7069
- misspell
7170
- noctx
7271
- stylecheck
@@ -75,12 +74,10 @@ linters:
7574
enable-all: false
7675
disable-all: true
7776

78-
run:
79-
# build-tags:
80-
skip-dirs:
77+
issues:
78+
exclude-dirs:
8179
- internal/fixtures
8280

83-
issues:
8481
exclude-rules:
8582
- linters:
8683
- gosec

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ REPO := "https://github.com/metal-toolbox/alloy.git"
1515

1616
## lint
1717
lint:
18-
go run github.com/golangci/golangci-lint/cmd/[email protected] run --config .golangci.yml --timeout=2m
18+
golangci-lint run --config .golangci.yml --timeout=2m
1919

2020
## Go test
2121
test: lint

‎cmd/outofband.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ import (
55
"time"
66

77
"github.com/equinix-labs/otel-init-go/otelinit"
8+
"github.com/metal-toolbox/rivets/v2/events"
9+
"github.com/spf13/cobra"
10+
"golang.org/x/net/context"
11+
812
"github.com/metal-toolbox/alloy/internal/app"
913
"github.com/metal-toolbox/alloy/internal/collector"
1014
"github.com/metal-toolbox/alloy/internal/helpers"
1115
"github.com/metal-toolbox/alloy/internal/metrics"
1216
"github.com/metal-toolbox/alloy/internal/model"
1317
"github.com/metal-toolbox/alloy/internal/worker"
14-
"github.com/metal-toolbox/rivets/events"
15-
"github.com/spf13/cobra"
16-
"golang.org/x/net/context"
1718
)
1819

1920
var (

‎go.mod

Lines changed: 63 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/metal-toolbox/alloy
22

3-
go 1.22
3+
go 1.22.7
4+
5+
toolchain go1.23.1
46

57
require (
6-
github.com/bmc-toolbox/bmclib/v2 v2.3.2
7-
github.com/bmc-toolbox/common v0.0.0-20240926143744-8c478be881d7
88
github.com/bombsimon/logrusr/v4 v4.1.0
99
github.com/coreos/go-oidc v2.2.1+incompatible
1010
github.com/equinix-labs/otel-init-go v0.0.9
@@ -15,9 +15,8 @@ require (
1515
github.com/jacobweinstock/registrar v0.4.7
1616
github.com/jeremywohl/flatten v1.0.1
1717
github.com/jinzhu/copier v0.4.0
18-
github.com/metal-toolbox/fleetdb v1.19.7
19-
github.com/metal-toolbox/ironlib v0.5.0
20-
github.com/metal-toolbox/rivets v1.3.10
18+
github.com/metal-toolbox/fleetdb v1.20.1
19+
github.com/metal-toolbox/ironlib v1.0.0
2120
github.com/mitchellh/mapstructure v1.5.0
2221
github.com/nats-io/nats.go v1.37.0
2322
github.com/pkg/errors v0.9.1
@@ -28,24 +27,25 @@ require (
2827
github.com/spf13/cobra v1.8.1
2928
github.com/spf13/viper v1.19.0
3029
github.com/stretchr/testify v1.9.0
31-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0
32-
go.opentelemetry.io/otel v1.31.0
33-
go.opentelemetry.io/otel/trace v1.31.0
30+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
31+
go.opentelemetry.io/otel v1.32.0
32+
go.opentelemetry.io/otel/trace v1.32.0
3433
go.uber.org/goleak v1.3.0
35-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
36-
golang.org/x/net v0.30.0
37-
golang.org/x/oauth2 v0.23.0
34+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
35+
golang.org/x/net v0.31.0
36+
golang.org/x/oauth2 v0.24.0
3837
)
3938

4039
require (
41-
dario.cat/mergo v1.0.0 // indirect
40+
dario.cat/mergo v1.0.1 // indirect
4241
github.com/Jeffail/gabs/v2 v2.7.0 // indirect
4342
github.com/VictorLowther/simplexml v0.0.0-20180716164440-0bff93621230 // indirect
4443
github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22 // indirect
44+
github.com/XSAM/otelsql v0.35.0 // indirect
4545
github.com/beevik/etree v1.4.1 // indirect
4646
github.com/beorn7/perks v1.0.1 // indirect
47-
github.com/bytedance/sonic v1.12.1 // indirect
48-
github.com/bytedance/sonic/loader v0.2.0 // indirect
47+
github.com/bytedance/sonic v1.12.4 // indirect
48+
github.com/bytedance/sonic/loader v0.2.1 // indirect
4949
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5050
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5151
github.com/cloudwego/base64x v0.1.4 // indirect
@@ -56,23 +56,25 @@ require (
5656
github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731 // indirect
5757
github.com/felixge/httpsnoop v1.0.4 // indirect
5858
github.com/friendsofgo/errors v0.9.2 // indirect
59-
github.com/fsnotify/fsnotify v1.7.0 // indirect
60-
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
59+
github.com/fsnotify/fsnotify v1.8.0 // indirect
60+
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
6161
github.com/ghodss/yaml v1.0.0 // indirect
62+
github.com/gin-contrib/cors v1.7.2 // indirect
6263
github.com/gin-contrib/sse v0.1.0 // indirect
64+
github.com/gin-contrib/zap v1.1.4 // indirect
6365
github.com/gin-gonic/gin v1.10.0 // indirect
6466
github.com/go-logr/logr v1.4.2 // indirect
6567
github.com/go-logr/stdr v1.2.2 // indirect
6668
github.com/go-playground/locales v0.14.1 // indirect
6769
github.com/go-playground/universal-translator v0.18.1 // indirect
68-
github.com/go-playground/validator/v10 v10.22.0 // indirect
70+
github.com/go-playground/validator/v10 v10.23.0 // indirect
6971
github.com/goccy/go-json v0.10.3 // indirect
7072
github.com/gofrs/uuid v4.4.0+incompatible // indirect
7173
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
72-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
74+
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
7375
github.com/gosimple/slug v1.14.0 // indirect
7476
github.com/gosimple/unidecode v1.0.1 // indirect
75-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect
77+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
7678
github.com/hashicorp/errwrap v1.1.0 // indirect
7779
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7880
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -84,71 +86,86 @@ require (
8486
github.com/jackc/pgpassfile v1.0.0 // indirect
8587
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
8688
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
87-
github.com/jackc/pgtype v1.14.3 // indirect
89+
github.com/jackc/pgtype v1.14.4 // indirect
8890
github.com/jackc/pgx/v4 v4.18.3 // indirect
91+
github.com/jackc/pgx/v5 v5.7.1 // indirect
92+
github.com/jackc/puddle/v2 v2.2.2 // indirect
8993
github.com/jacobweinstock/iamt v0.0.0-20230502042727-d7cdbe67d9ef // indirect
9094
github.com/jmoiron/sqlx v1.4.0 // indirect
9195
github.com/json-iterator/go v1.1.12 // indirect
92-
github.com/klauspost/compress v1.17.9 // indirect
93-
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
96+
github.com/klauspost/compress v1.17.11 // indirect
97+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
9498
github.com/leodido/go-urn v1.4.0 // indirect
9599
github.com/lib/pq v1.10.9 // indirect
96100
github.com/magiconair/properties v1.8.7 // indirect
97101
github.com/mattn/go-isatty v0.0.20 // indirect
102+
github.com/metal-toolbox/bmc-common v1.0.2 // indirect
103+
github.com/metal-toolbox/bmclib v1.0.2 // indirect
104+
github.com/metal-toolbox/rivets/v2 v2.0.0 // indirect
105+
github.com/mfridman/interpolate v0.0.2 // indirect
98106
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
99107
github.com/modern-go/reflect2 v1.0.2 // indirect
100108
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
101109
github.com/nats-io/nkeys v0.4.7 // indirect
102110
github.com/nats-io/nuid v1.0.1 // indirect
103-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
111+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
104112
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
105113
github.com/pquerna/cachecontrol v0.2.0 // indirect
114+
github.com/pressly/goose/v3 v3.23.0 // indirect
106115
github.com/prometheus/client_model v0.6.1 // indirect
107-
github.com/prometheus/common v0.55.0 // indirect
116+
github.com/prometheus/common v0.60.1 // indirect
108117
github.com/prometheus/procfs v0.15.1 // indirect
109118
github.com/sagikazarmark/locafero v0.6.0 // indirect
110119
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
111120
github.com/satori/go.uuid v1.2.0 // indirect
121+
github.com/sethvargo/go-retry v0.3.0 // indirect
112122
github.com/sourcegraph/conc v0.3.0 // indirect
113123
github.com/spf13/afero v1.11.0 // indirect
114-
github.com/spf13/cast v1.6.0 // indirect
124+
github.com/spf13/cast v1.7.0 // indirect
115125
github.com/spf13/pflag v1.0.5 // indirect
116-
github.com/stmcginnis/gofish v0.19.0 // indirect
126+
github.com/stmcginnis/gofish v0.20.0 // indirect
117127
github.com/stretchr/objx v0.5.2 // indirect
118128
github.com/subosito/gotenv v1.6.0 // indirect
119-
github.com/tidwall/gjson v1.17.3 // indirect
129+
github.com/tidwall/gjson v1.18.0 // indirect
120130
github.com/tidwall/match v1.1.1 // indirect
121131
github.com/tidwall/pretty v1.2.1 // indirect
122132
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
123133
github.com/ugorji/go/codec v1.2.12 // indirect
124-
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
134+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
125135
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
126136
github.com/volatiletech/inflect v0.0.1 // indirect
127137
github.com/volatiletech/null v8.0.0+incompatible // indirect
128138
github.com/volatiletech/null/v8 v8.1.2 // indirect
129139
github.com/volatiletech/randomize v0.0.1 // indirect
130140
github.com/volatiletech/sqlboiler v3.7.1+incompatible // indirect
131-
github.com/volatiletech/sqlboiler/v4 v4.16.2 // indirect
132-
github.com/volatiletech/strmangle v0.0.6 // indirect
141+
github.com/volatiletech/sqlboiler/v4 v4.17.1 // indirect
142+
github.com/volatiletech/strmangle v0.0.8 // indirect
143+
go.infratographer.com/x v0.5.4 // indirect
133144
go.opencensus.io v0.24.0 // indirect
134-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
135-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
136-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
137-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
145+
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.57.0 // indirect
146+
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
147+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
148+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
149+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
150+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
151+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
152+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
138153
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
139154
go.uber.org/multierr v1.11.0 // indirect
140155
go.uber.org/zap v1.27.0 // indirect
141-
gocloud.dev v0.38.0 // indirect
142-
golang.org/x/arch v0.9.0 // indirect
143-
golang.org/x/crypto v0.28.0 // indirect
144-
golang.org/x/sys v0.26.0 // indirect
145-
golang.org/x/text v0.19.0 // indirect
146-
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
147-
google.golang.org/api v0.189.0 // indirect
148-
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect
149-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect
150-
google.golang.org/grpc v1.65.0 // indirect
151-
google.golang.org/protobuf v1.34.2 // indirect
156+
gocloud.dev v0.40.0 // indirect
157+
golang.org/x/arch v0.12.0 // indirect
158+
golang.org/x/crypto v0.29.0 // indirect
159+
golang.org/x/sync v0.9.0 // indirect
160+
golang.org/x/sys v0.27.0 // indirect
161+
golang.org/x/text v0.20.0 // indirect
162+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
163+
google.golang.org/api v0.208.0 // indirect
164+
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
165+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
166+
google.golang.org/grpc v1.68.0 // indirect
167+
google.golang.org/protobuf v1.35.2 // indirect
168+
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
152169
gopkg.in/ini.v1 v1.67.0 // indirect
153170
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
154171
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)