Skip to content

Commit 3f8ad5b

Browse files
luke-jarymowyczjakeschuurmans
luke-jarymowycz
and
jakeschuurmans
authored
Update fs 1732 (#57)
* Remove hollow.sh * fix github runner * testing ci changes for FS-1732 * fix out of order test failure --------- Co-authored-by: Jake Schuurmans <[email protected]>
1 parent 0604577 commit 3f8ad5b

File tree

21 files changed

+356
-443
lines changed

21 files changed

+356
-443
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ jobs:
88
- name: Install Go
99
uses: actions/setup-go@v5
1010
with:
11-
go-version: '1.21'
11+
go-version: '1.22'
1212
- name: Checkout code
1313
uses: actions/checkout@v4
1414
- name: golangci-lint
15-
uses: golangci/golangci-lint-action@v4
15+
uses: golangci/golangci-lint-action@v5
1616
with:
17+
skip-cache: true
1718
args: --config .golangci.yml --timeout 2m
18-
version: v1.55.2
19+
version: v1.61.0
1920
- name: Test
2021
run: go test ./...
2122
build:
@@ -25,7 +26,7 @@ jobs:
2526
- name: Install Go
2627
uses: actions/setup-go@v5
2728
with:
28-
go-version: '1.21'
29+
go-version: '1.22'
2930

3031
- name: Checkout code
3132
uses: actions/checkout@v4

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: Set up Go
3030
uses: actions/setup-go@v5
3131
with:
32-
go-version: "1.21"
32+
go-version: go.mod
3333
-
3434
name: install cosign
3535
uses: sigstore/cosign-installer@main
@@ -44,4 +44,4 @@ jobs:
4444
env:
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4646
COSIGN_EXPERIMENTAL: 1
47-
GOVERSION: "1.21"
47+
GOVERSION: "1.22"

‎.golangci.yml

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

66
linters-settings:
77
govet:
88
auto-fix: true
9-
check-shadowing: true
109
settings:
1110
printf:
1211
funcs:
@@ -47,6 +46,7 @@ linters-settings:
4746
extra-rules: true
4847
wsl:
4948
auto-fix: true
49+
shadow: true
5050

5151
linters:
5252
enable:
@@ -75,14 +75,11 @@ linters:
7575
enable-all: false
7676
disable-all: true
7777

78-
run:
79-
# build-tags:
80-
skip-dirs:
81-
- internal/fixtures
82-
skip-files:
83-
- "(.*/)*.*_test.go"
84-
8578
issues:
79+
exclude-files:
80+
- "(.*/)*.*_test.go"
81+
exclude-dirs:
82+
- internal/fixtures
8683
exclude-rules:
8784
- linters:
8885
- gosec

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ REPO := "https://github.com/metal-toolbox/bomservice.git"
1414

1515
## lint
1616
lint:
17-
golangci-lint run
17+
golangci-lint run --config .golangci.yml --fix
1818

1919
## Go test
2020
test: lint
@@ -29,7 +29,7 @@ gen-store-mock:
2929
## Build linux bin
3030
build:
3131
ifeq ($(GO_VERSION), 0)
32-
$(error build requies go version 1.20.x+ or higher)
32+
$(error build requies go version 1.22.x+ or higher)
3333
endif
3434
GOOS=linux GOARCH=amd64 go build -o bomservice \
3535
-ldflags \

‎cmd/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var (
2323
var cmdServer = &cobra.Command{
2424
Use: "server",
2525
Short: "Run bomservice server",
26-
Run: func(cmd *cobra.Command, args []string) {
26+
Run: func(cmd *cobra.Command, _ []string) {
2727
app, termCh, err := app.New(model.AppKindServer, cfgFile, model.LogLevel(logLevel))
2828
if err != nil {
2929
log.Fatal(err)

‎go.mod

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,97 @@
11
module github.com/metal-toolbox/bomservice
22

3-
go 1.21
3+
go 1.23
4+
5+
toolchain go1.23.1
46

57
require (
68
github.com/banzaicloud/logrus-runtime-formatter v0.0.0-20190729070250-5ae5475bae5e
79
github.com/coreos/go-oidc v2.2.1+incompatible
8-
github.com/gin-gonic/gin v1.9.1
10+
github.com/gin-gonic/gin v1.10.0
911
github.com/golang/mock v1.6.0
1012
github.com/hashicorp/go-retryablehttp v0.7.5
13+
github.com/metal-toolbox/fleetdb v1.19.5-0.20240913163810-6a9703ca4111
14+
github.com/metal-toolbox/rivets v1.3.7
1115
github.com/pkg/errors v0.9.1
12-
github.com/prometheus/client_golang v1.18.0
16+
github.com/prometheus/client_golang v1.20.1
1317
github.com/sirupsen/logrus v1.9.3
14-
github.com/spf13/cobra v1.8.0
15-
github.com/spf13/viper v1.18.2
16-
github.com/stretchr/testify v1.8.4
18+
github.com/spf13/cobra v1.8.1
19+
github.com/spf13/viper v1.19.0
20+
github.com/stretchr/testify v1.9.0
1721
github.com/tealeg/xlsx v1.0.5
18-
go.hollow.sh/serverservice v0.16.2
19-
go.hollow.sh/toolbox v0.6.2
20-
golang.org/x/oauth2 v0.17.0
22+
golang.org/x/oauth2 v0.21.0
2123
gopkg.in/square/go-jose.v2 v2.6.0
2224
)
2325

2426
require (
2527
github.com/beorn7/perks v1.0.1 // indirect
26-
github.com/bytedance/sonic v1.11.0 // indirect
27-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
28-
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
29-
github.com/chenzhuoyu/iasm v0.9.1 // indirect
30-
github.com/cockroachdb/cockroach-go/v2 v2.3.6 // indirect
28+
github.com/bmc-toolbox/common v0.0.0-20240723142833-87832458b53b // indirect
29+
github.com/bytedance/sonic v1.12.1 // indirect
30+
github.com/bytedance/sonic/loader v0.2.0 // indirect
31+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
32+
github.com/cloudwego/base64x v0.1.4 // indirect
33+
github.com/cloudwego/iasm v0.2.0 // indirect
34+
github.com/cockroachdb/cockroach-go/v2 v2.3.8 // indirect
3135
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
32-
github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05 // indirect
36+
github.com/ericlagergren/decimal v0.0.0-20240411145413-00de7ca16731 // indirect
3337
github.com/friendsofgo/errors v0.9.2 // indirect
3438
github.com/fsnotify/fsnotify v1.7.0 // indirect
35-
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
39+
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
3640
github.com/gin-contrib/sse v0.1.0 // indirect
37-
github.com/go-logr/logr v1.4.1 // indirect
41+
github.com/go-logr/logr v1.4.2 // indirect
3842
github.com/go-logr/stdr v1.2.2 // indirect
3943
github.com/go-playground/locales v0.14.1 // indirect
4044
github.com/go-playground/universal-translator v0.18.1 // indirect
41-
github.com/go-playground/validator/v10 v10.18.0 // indirect
42-
github.com/goccy/go-json v0.10.2 // indirect
45+
github.com/go-playground/validator/v10 v10.22.0 // indirect
46+
github.com/goccy/go-json v0.10.3 // indirect
4347
github.com/gofrs/uuid v4.4.0+incompatible // indirect
4448
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
45-
github.com/golang/protobuf v1.5.3 // indirect
4649
github.com/google/uuid v1.6.0 // indirect
47-
github.com/googleapis/gax-go/v2 v2.12.1 // indirect
48-
github.com/gosimple/slug v1.13.1 // indirect
50+
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
51+
github.com/gosimple/slug v1.14.0 // indirect
4952
github.com/gosimple/unidecode v1.0.1 // indirect
5053
github.com/hashicorp/errwrap v1.1.0 // indirect
5154
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5255
github.com/hashicorp/go-multierror v1.1.1 // indirect
5356
github.com/hashicorp/hcl v1.0.0 // indirect
57+
github.com/hetiansu5/urlquery v1.2.7 // indirect
5458
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5559
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
56-
github.com/jackc/pgconn v1.14.1 // indirect
60+
github.com/jackc/pgconn v1.14.3 // indirect
5761
github.com/jackc/pgio v1.0.0 // indirect
5862
github.com/jackc/pgpassfile v1.0.0 // indirect
59-
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
60-
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
61-
github.com/jackc/pgtype v1.14.2 // indirect
62-
github.com/jackc/pgx/v4 v4.18.1 // indirect
63-
github.com/jmoiron/sqlx v1.3.5 // indirect
63+
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
64+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
65+
github.com/jackc/pgtype v1.14.3 // indirect
66+
github.com/jackc/pgx/v4 v4.18.3 // indirect
67+
github.com/jmoiron/sqlx v1.4.0 // indirect
6468
github.com/json-iterator/go v1.1.12 // indirect
65-
github.com/klauspost/compress v1.17.6 // indirect
66-
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
69+
github.com/klauspost/compress v1.17.9 // indirect
70+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
6771
github.com/leodido/go-urn v1.4.0 // indirect
6872
github.com/lib/pq v1.10.9 // indirect
6973
github.com/magiconair/properties v1.8.7 // indirect
7074
github.com/mattn/go-isatty v0.0.20 // indirect
71-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
72-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
7375
github.com/mitchellh/mapstructure v1.5.0 // indirect
7476
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7577
github.com/modern-go/reflect2 v1.0.2 // indirect
76-
github.com/nats-io/nats.go v1.33.1 // indirect
78+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
79+
github.com/nats-io/nats.go v1.36.0 // indirect
7780
github.com/nats-io/nkeys v0.4.7 // indirect
7881
github.com/nats-io/nuid v1.0.1 // indirect
79-
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
82+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
8083
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8184
github.com/pquerna/cachecontrol v0.2.0 // indirect
82-
github.com/prometheus/client_model v0.5.0 // indirect
83-
github.com/prometheus/common v0.45.0 // indirect
84-
github.com/prometheus/procfs v0.12.0 // indirect
85-
github.com/sagikazarmark/locafero v0.4.0 // indirect
85+
github.com/prometheus/client_model v0.6.1 // indirect
86+
github.com/prometheus/common v0.55.0 // indirect
87+
github.com/prometheus/procfs v0.15.1 // indirect
88+
github.com/sagikazarmark/locafero v0.6.0 // indirect
8689
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
8790
github.com/sourcegraph/conc v0.3.0 // indirect
8891
github.com/spf13/afero v1.11.0 // indirect
8992
github.com/spf13/cast v1.6.0 // indirect
90-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
9193
github.com/spf13/pflag v1.0.5 // indirect
94+
github.com/stretchr/objx v0.5.2 // indirect
9295
github.com/subosito/gotenv v1.6.0 // indirect
9396
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
9497
github.com/ugorji/go/codec v1.2.12 // indirect
@@ -100,25 +103,23 @@ require (
100103
github.com/volatiletech/sqlboiler/v4 v4.16.2 // indirect
101104
github.com/volatiletech/strmangle v0.0.6 // indirect
102105
go.opencensus.io v0.24.0 // indirect
103-
go.opentelemetry.io/otel v1.23.1 // indirect
104-
go.opentelemetry.io/otel/metric v1.23.1 // indirect
105-
go.opentelemetry.io/otel/trace v1.23.1 // indirect
106+
go.opentelemetry.io/otel v1.28.0 // indirect
107+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
108+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
106109
go.uber.org/multierr v1.11.0 // indirect
107-
go.uber.org/zap v1.26.0 // indirect
108-
gocloud.dev v0.36.0 // indirect
109-
golang.org/x/arch v0.7.0 // indirect
110-
golang.org/x/crypto v0.19.0 // indirect
111-
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
112-
golang.org/x/net v0.21.0 // indirect
113-
golang.org/x/sys v0.17.0 // indirect
114-
golang.org/x/text v0.14.0 // indirect
115-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
116-
google.golang.org/api v0.165.0 // indirect
117-
google.golang.org/appengine v1.6.8 // indirect
118-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 // indirect
119-
google.golang.org/grpc v1.61.1 // indirect
120-
google.golang.org/protobuf v1.32.0 // indirect
121-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
110+
go.uber.org/zap v1.27.0 // indirect
111+
gocloud.dev v0.38.0 // indirect
112+
golang.org/x/arch v0.9.0 // indirect
113+
golang.org/x/crypto v0.26.0 // indirect
114+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
115+
golang.org/x/net v0.28.0 // indirect
116+
golang.org/x/sys v0.24.0 // indirect
117+
golang.org/x/text v0.17.0 // indirect
118+
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
119+
google.golang.org/api v0.189.0 // indirect
120+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect
121+
google.golang.org/grpc v1.65.0 // indirect
122+
google.golang.org/protobuf v1.34.2 // indirect
122123
gopkg.in/ini.v1 v1.67.0 // indirect
123124
gopkg.in/yaml.v3 v3.0.1 // indirect
124125
)

0 commit comments

Comments
 (0)