Skip to content

Commit 7959dc5

Browse files
gertdgertd
authored
ds-load upd (#138)
* update compiler, buf, linter, dependencies * rm go-internal pkg dep * fix .golangci.yaml
1 parent 9999ba7 commit 7959dc5

File tree

31 files changed

+939
-775
lines changed

31 files changed

+939
-775
lines changed

‎.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ on:
1616
env:
1717
VAULT_ADDR: https://vault.eng.aserto.com/
1818
PRE_RELEASE: ${{ github.ref == 'refs/heads/main' && 'main' || '' }}
19-
GO_VERSION: "1.23"
19+
GO_VERSION: "1.24"
2020
GO_RELEASER_VERSION: "v2.3.2"
21-
GO_LANGCI_LINT_VERSION: "v1.61.0"
21+
GO_LANGCI_LINT_VERSION: "v1.64.5"
2222
GO_TESTSUM_VERSION: "1.11.0"
2323

2424
jobs:

‎.golangci.yaml

-18
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
# https://github.com/golangci/golangci/wiki/Configuration
44

55
linters-settings:
6-
depguard:
7-
list-type: blacklist
8-
packages:
9-
# logging is allowed only by zerolog
10-
- github.com/sirupsen/logrus
11-
packages-with-error-message:
12-
- github.com/sirupsen/logrus: "logging is allowed only by zerolog"
136
dupl:
147
threshold: 100
158
funlen:
@@ -35,25 +28,14 @@ linters-settings:
3528
min-complexity: 18
3629
goimports:
3730
local-prefixes: github.com/golangci/golangci-lint
38-
golint:
39-
min-confidence: 0
40-
gomnd:
41-
checks:
42-
- argument
43-
- case
44-
- condition
45-
- return
4631
govet:
47-
shadow: true
4832
settings:
4933
printf:
5034
funcs:
5135
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
5236
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
5337
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
5438
- (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
55-
maligned:
56-
suggest-new: true
5739
misspell:
5840
locale: US
5941
nolintlint:

‎buf.gen.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: v2
22
plugins:
3-
- remote: buf.build/protocolbuffers/go:v1.34.2
3+
- remote: buf.build/protocolbuffers/go:v1.36.5
44
out: ./sdk/common/msg
5-
opt: paths=source_relative
6-
5+
opt:
6+
- paths=source_relative

‎buf.lock

+6-9
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
version: v2
33
deps:
44
- name: buf.build/aserto-dev/directory
5-
commit: ec9a6bdced45498b94567a6b42ae0938
6-
digest: b5:2100198bef416c7feecbf7c7bc1626388930f368189fa763696396d9d8e9da6bdc1115f8227109baeae430b518fc9caf1ce2aea232fcde4ba9e6a99114a51a2e
7-
- name: buf.build/bufbuild/protovalidate
8-
commit: a6c49f84cc0f4e038680d390392e2ab0
9-
digest: b5:e968392e88ff7915adcbd1635d670b45bff8836ec2415d81fc559ca5470a695dbdc30030bad8bc5764647c731079e9e7bba0023ea25c4e4a1672a7d2561d4a19
5+
commit: 195e5f3082bb4ea4afecbfe0ba8d74c1
6+
digest: b5:cf20096c5a5d2aac839ee24951893761e3adca7ad864d349ef727fb68b8e0a2a8b86a80e0888dbdd348525a960bf434b9145d109a37a0ca1909b16a0e9ff0c90
107
- name: buf.build/googleapis/googleapis
11-
commit: c0913f24652a4cfc95f77d97443a5005
12-
digest: b5:4edb1480036c60f7867d75417d7faa87c851c96a4988a9746058a24e8e9bb4978daed0af35d57f6043de5a60355978dceaaa93dc992be99193260ac8823cbb8f
8+
commit: 751cbe31638d43a9bfb6162cd2352e67
9+
digest: b5:51ba5c31f244fd74420f0e66d13f2b5dd6024dcfe1a29dc45bd8f6e61c1444c828b9add9e7dd25a4513ebbee8097a970e0712a2e2cd955c2d60cf8905204f51a
1310
- name: buf.build/grpc-ecosystem/grpc-gateway
14-
commit: a48fcebcf8f140dd9d09359b9bb185a4
15-
digest: b5:330af8a71b579ab96c4f3ee26929d1a68a5a9e986c7cfe0a898591fc514216bb6e723dc04c74d90fdee3f3f14f9100a54b4f079eb273e6e7213f0d5baca36ff8
11+
commit: 4c5ba75caaf84e928b7137ae5c18c26a
12+
digest: b5:c113e62fb3b29289af785866cae062b55ec8ae19ab3f08f3004098928fbca657730a06810b2012951294326b95669547194fa84476b9e9b688d4f8bf77a0691d

‎cli/go.mod

+25-29
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,51 @@
11
module github.com/aserto-dev/ds-load/cli
22

3-
go 1.23.2
3+
go 1.23.7
4+
5+
toolchain go1.24.1
46

57
replace github.com/aserto-dev/ds-load/sdk => ../sdk
68

79
require (
8-
github.com/alecthomas/kong v1.6.0
10+
github.com/alecthomas/kong v1.8.1
911
github.com/aserto-dev/ds-load/sdk v0.0.0-00010101000000-000000000000
10-
github.com/aserto-dev/go-aserto v0.33.5
11-
github.com/aserto-dev/go-directory v0.33.3
12-
github.com/bufbuild/protovalidate-go v0.7.3
12+
github.com/aserto-dev/go-aserto v0.33.7
13+
github.com/aserto-dev/go-directory v0.33.7
1314
github.com/fullstorydev/grpcurl v1.9.2
1415
github.com/pkg/errors v0.9.1
1516
github.com/rs/zerolog v1.33.0
1617
github.com/stretchr/testify v1.10.0
17-
golang.org/x/sync v0.10.0
18-
google.golang.org/grpc v1.68.1
18+
golang.org/x/sync v0.12.0
19+
google.golang.org/grpc v1.71.0
1920
)
2021

2122
require (
22-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20241127180247-a33202765966.1 // indirect
23-
cel.dev/expr v0.18.0 // indirect
24-
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
25-
github.com/aserto-dev/header v0.0.8 // indirect
26-
github.com/aserto-dev/logger v0.0.6 // indirect
23+
github.com/aserto-dev/errors v0.0.15 // indirect
24+
github.com/aserto-dev/header v0.0.10 // indirect
25+
github.com/aserto-dev/logger v0.0.7 // indirect
2726
github.com/bufbuild/protocompile v0.10.0 // indirect
28-
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
27+
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
2928
github.com/davecgh/go-spew v1.1.1 // indirect
30-
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
31-
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
29+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
30+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
3231
github.com/go-http-utils/headers v0.0.0-20181008091004-fed159eddc2a // indirect
3332
github.com/golang/protobuf v1.5.4 // indirect
34-
github.com/google/cel-go v0.22.0 // indirect
3533
github.com/google/uuid v1.6.0 // indirect
36-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
37-
github.com/hashicorp/errwrap v1.0.0 // indirect
34+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
35+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
36+
github.com/hashicorp/errwrap v1.1.0 // indirect
3837
github.com/hashicorp/go-multierror v1.1.1 // indirect
3938
github.com/jhump/protoreflect v1.16.0 // indirect
40-
github.com/mattn/go-colorable v0.1.13 // indirect
39+
github.com/mattn/go-colorable v0.1.14 // indirect
4140
github.com/mattn/go-isatty v0.0.20 // indirect
4241
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
4342
github.com/pmezard/go-difflib v1.0.0 // indirect
44-
github.com/samber/lo v1.47.0 // indirect
45-
github.com/stoewer/go-strcase v1.3.0 // indirect
46-
golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
47-
golang.org/x/net v0.33.0 // indirect
48-
golang.org/x/sys v0.28.0 // indirect
49-
golang.org/x/text v0.21.0 // indirect
50-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
51-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241216192217-9240e9c98484 // indirect
52-
google.golang.org/protobuf v1.36.0 // indirect
53-
gopkg.in/yaml.v2 v2.4.0 // indirect
43+
github.com/samber/lo v1.49.1 // indirect
44+
golang.org/x/net v0.37.0 // indirect
45+
golang.org/x/sys v0.31.0 // indirect
46+
golang.org/x/text v0.23.0 // indirect
47+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
48+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
49+
google.golang.org/protobuf v1.36.5 // indirect
5450
gopkg.in/yaml.v3 v3.0.1 // indirect
5551
)

0 commit comments

Comments
 (0)