Skip to content

Commit 8bc0feb

Browse files
alexandrosfiliosmbrandenburger
alexandrosfilios
authored and
mbrandenburger
committed
Cleanup protobuf
- update protobuf deps - add make target to generate all protos - re-generate all protos with protov2 - add protov1 adapter for idemix protos Signed-off-by: Alexandros Filios <alexandros.filios@ibm.com> Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
1 parent 9dff256 commit 8bc0feb

File tree

25 files changed

+942
-1072
lines changed

25 files changed

+942
-1072
lines changed

‎Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ install-softhsm: ## Install softhsm
6262
install-fsccli: ## Install fsccli
6363
@go install ./cmd/fsccli
6464

65+
#########################
66+
# Generate protos
67+
#########################
68+
69+
.PHONY: protos
70+
protos: ## Build all proto files
71+
./scripts/compile_proto.sh
72+
6573
#########################
6674
# Container
6775
#########################

‎checks.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ checks: licensecheck gofmt goimports govet misspell ineffassign staticcheck
44
.PHONY: licensecheck
55
licensecheck:
66
@echo Running license check
7-
@find . -name '*.go' | xargs addlicense -check || (echo "Missing license headers"; exit 1)
7+
@find . -name '*.go' | grep -v .pb.go | xargs addlicense -check || (echo "Missing license headers"; exit 1)
88

99
.PHONY: gofmt
1010
gofmt:
@@ -23,7 +23,7 @@ gofmt:
2323
goimports:
2424
@echo Running goimports
2525
@{ \
26-
OUTPUT="$$(goimports -l .)"; \
26+
OUTPUT="$$(find . -name '*.go' | grep -v pb.go | xargs goimports -l)"; \
2727
if [ -n "$$OUTPUT" ]; then \
2828
echo "The following files contain goimports errors"; \
2929
echo "$$OUTPUT"; \

‎go.mod‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ require (
1616
github.com/go-kit/kit v0.13.0
1717
github.com/go-kit/log v0.2.1
1818
github.com/go-viper/mapstructure/v2 v2.4.0
19-
github.com/golang/protobuf v1.5.4
2019
github.com/gorilla/mux v1.8.1
2120
github.com/gorilla/websocket v1.5.3
2221
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -47,37 +46,37 @@ require (
4746
github.com/uptrace/opentelemetry-go-extra/otelzap v0.3.2
4847
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0
4948
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0
50-
go.opentelemetry.io/otel v1.34.0
49+
go.opentelemetry.io/otel v1.37.0
5150
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
5251
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0
5352
go.opentelemetry.io/otel/log v0.6.0
54-
go.opentelemetry.io/otel/trace v1.34.0
53+
go.opentelemetry.io/otel/trace v1.37.0
5554
go.uber.org/atomic v1.11.0
5655
go.uber.org/dig v1.18.0
5756
go.uber.org/goleak v1.3.0
5857
go.uber.org/zap v1.27.0
5958
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
60-
golang.org/x/net v0.39.0
61-
golang.org/x/sync v0.13.0
62-
golang.org/x/text v0.24.0
63-
google.golang.org/grpc v1.72.0
64-
google.golang.org/protobuf v1.36.6
59+
golang.org/x/net v0.42.0
60+
golang.org/x/sync v0.16.0
61+
golang.org/x/text v0.27.0
62+
google.golang.org/grpc v1.76.0
63+
google.golang.org/protobuf v1.36.10
6564
gopkg.in/yaml.v2 v2.4.0
6665
modernc.org/sqlite v1.32.0
6766
)
6867

6968
require (
70-
cel.dev/expr v0.20.0 // indirect
69+
cel.dev/expr v0.24.0 // indirect
7170
cloud.google.com/go v0.116.0 // indirect
7271
cloud.google.com/go/auth v0.13.0 // indirect
7372
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
74-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
73+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
7574
cloud.google.com/go/iam v1.2.2 // indirect
7675
cloud.google.com/go/monitoring v1.21.2 // indirect
7776
cloud.google.com/go/storage v1.49.0 // indirect
7877
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7978
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
80-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
79+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
8180
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
8281
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
8382
github.com/IBM/idemix/bccsp/schemes/aries v0.0.0-20240913182345-72941a5f41cd // indirect
@@ -96,7 +95,7 @@ require (
9695
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9796
github.com/cloudwego/base64x v0.1.4 // indirect
9897
github.com/cloudwego/iasm v0.2.0 // indirect
99-
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
98+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
10099
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
101100
github.com/cockroachdb/redact v1.1.5 // indirect
102101
github.com/consensys/bavard v0.1.22 // indirect
@@ -121,9 +120,9 @@ require (
121120
github.com/getsentry/sentry-go v0.27.0 // indirect
122121
github.com/ghodss/yaml v1.0.0 // indirect
123122
github.com/gin-contrib/sse v0.1.0 // indirect
124-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
123+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
125124
github.com/go-logfmt/logfmt v0.5.1 // indirect
126-
github.com/go-logr/logr v1.4.2 // indirect
125+
github.com/go-logr/logr v1.4.3 // indirect
127126
github.com/go-logr/stdr v1.2.2 // indirect
128127
github.com/go-openapi/jsonpointer v0.21.0 // indirect
129128
github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -138,6 +137,7 @@ require (
138137
github.com/gogo/googleapis v1.4.1 // indirect
139138
github.com/gogo/protobuf v1.3.2 // indirect
140139
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
140+
github.com/golang/protobuf v1.5.4 // indirect
141141
github.com/golang/snappy v0.0.4 // indirect
142142
github.com/google/go-cmp v0.7.0 // indirect
143143
github.com/google/gopacket v1.1.19 // indirect
@@ -277,28 +277,28 @@ require (
277277
github.com/zeebo/errs v1.4.0 // indirect
278278
go.opencensus.io v0.24.0 // indirect
279279
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
280-
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
280+
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
281281
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0
282-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
283-
go.opentelemetry.io/otel/sdk v1.34.0
284-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
282+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
283+
go.opentelemetry.io/otel/sdk v1.37.0
284+
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
285285
go.opentelemetry.io/proto/otlp v1.3.1
286286
go.uber.org/automaxprocs v1.6.0 // indirect
287287
go.uber.org/fx v1.23.0 // indirect
288288
go.uber.org/mock v0.5.0 // indirect
289289
go.uber.org/multierr v1.11.0 // indirect
290290
golang.org/x/arch v0.11.0 // indirect
291-
golang.org/x/crypto v0.37.0 // indirect
292-
golang.org/x/mod v0.24.0 // indirect
293-
golang.org/x/oauth2 v0.27.0 // indirect
294-
golang.org/x/sys v0.32.0 // indirect
291+
golang.org/x/crypto v0.40.0 // indirect
292+
golang.org/x/mod v0.25.0 // indirect
293+
golang.org/x/oauth2 v0.30.0 // indirect
294+
golang.org/x/sys v0.34.0 // indirect
295295
golang.org/x/time v0.8.0 // indirect
296-
golang.org/x/tools v0.31.0 // indirect
297-
gonum.org/v1/gonum v0.15.0 // indirect
296+
golang.org/x/tools v0.34.0 // indirect
297+
gonum.org/v1/gonum v0.16.0 // indirect
298298
google.golang.org/api v0.215.0 // indirect
299299
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
300-
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
301-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
300+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
301+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
302302
gopkg.in/yaml.v3 v3.0.1 // indirect
303303
lukechampine.com/blake3 v1.3.0 // indirect
304304
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect

0 commit comments

Comments
 (0)