mirror of
https://github.com/siderolabs/discovery-service.git
synced 2025-03-14 09:55:08 +00:00
chore: bump deps
Run rekres and bump deps. Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
This commit is contained in:
Dmitriy Matrenichev
@ -1,6 +1,6 @@
|
||||
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
|
||||
#
|
||||
# Generated on 2024-05-09T09:59:51Z by kres 1e986af.
|
||||
# Generated on 2024-09-02T13:05:25Z by kres b5ca957.
|
||||
|
||||
*
|
||||
!api
|
||||
@ -10,5 +10,6 @@
|
||||
!go.mod
|
||||
!go.sum
|
||||
!.golangci.yml
|
||||
!CHANGELOG.md
|
||||
!README.md
|
||||
!.markdownlint.json
|
||||
|
||||
7
.github/workflows/ci.yaml
vendored
7
.github/workflows/ci.yaml
vendored
@ -1,6 +1,6 @@
|
||||
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
|
||||
#
|
||||
# Generated on 2024-05-28T00:03:10Z by kres bcb280a.
|
||||
# Generated on 2024-09-02T13:05:25Z by kres b5ca957.
|
||||
|
||||
name: default
|
||||
concurrency:
|
||||
@ -118,8 +118,9 @@ jobs:
|
||||
- name: Generate Checksums
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
run: |
|
||||
sha256sum _out/discovery-service-* _out/snapshot-decoder-* > _out/sha256sum.txt
|
||||
sha512sum _out/discovery-service-* _out/snapshot-decoder-* > _out/sha512sum.txt
|
||||
cd _out
|
||||
sha256sum discovery-service-* snapshot-decoder-* > sha256sum.txt
|
||||
sha512sum discovery-service-* snapshot-decoder-* > sha512sum.txt
|
||||
- name: release-notes
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
run: |
|
||||
|
||||
26
Dockerfile
26
Dockerfile
@ -1,8 +1,8 @@
|
||||
# syntax = docker/dockerfile-upstream:1.7.1-labs
|
||||
# syntax = docker/dockerfile-upstream:1.9.0-labs
|
||||
|
||||
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
|
||||
#
|
||||
# Generated on 2024-05-30T08:00:54Z by kres f249b6c.
|
||||
# Generated on 2024-09-02T13:05:25Z by kres b5ca957.
|
||||
|
||||
ARG TOOLCHAIN
|
||||
|
||||
@ -11,13 +11,13 @@ FROM ghcr.io/siderolabs/ca-certificates:v1.7.0 AS image-ca-certificates
|
||||
FROM ghcr.io/siderolabs/fhs:v1.7.0 AS image-fhs
|
||||
|
||||
# runs markdownlint
|
||||
FROM docker.io/node:22.2.0-alpine3.19 AS lint-markdown
|
||||
FROM docker.io/oven/bun:1.1.26-alpine AS lint-markdown
|
||||
WORKDIR /src
|
||||
RUN npm i -g markdownlint-cli@0.41.0
|
||||
RUN npm i sentences-per-line@0.2.1
|
||||
RUN bun i markdownlint-cli@0.41.0 sentences-per-line@0.2.1
|
||||
COPY .markdownlint.json .
|
||||
COPY ./CHANGELOG.md ./CHANGELOG.md
|
||||
COPY ./README.md ./README.md
|
||||
RUN markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .
|
||||
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .
|
||||
|
||||
# collects proto specs
|
||||
FROM scratch AS proto-specs
|
||||
@ -29,14 +29,14 @@ RUN apk --update --no-cache add bash curl build-base protoc protobuf-dev
|
||||
|
||||
# build tools
|
||||
FROM --platform=${BUILDPLATFORM} toolchain AS tools
|
||||
ENV GO111MODULE on
|
||||
ENV GO111MODULE=on
|
||||
ARG CGO_ENABLED
|
||||
ENV CGO_ENABLED ${CGO_ENABLED}
|
||||
ENV CGO_ENABLED=${CGO_ENABLED}
|
||||
ARG GOTOOLCHAIN
|
||||
ENV GOTOOLCHAIN ${GOTOOLCHAIN}
|
||||
ENV GOTOOLCHAIN=${GOTOOLCHAIN}
|
||||
ARG GOEXPERIMENT
|
||||
ENV GOEXPERIMENT ${GOEXPERIMENT}
|
||||
ENV GOPATH /go
|
||||
ENV GOEXPERIMENT=${GOEXPERIMENT}
|
||||
ENV GOPATH=/go
|
||||
ARG GOIMPORTS_VERSION
|
||||
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg go install golang.org/x/tools/cmd/goimports@v${GOIMPORTS_VERSION}
|
||||
RUN mv /go/bin/goimports /bin
|
||||
@ -94,7 +94,7 @@ RUN FILES="$(gofumpt -l .)" && test -z "${FILES}" || (echo -e "Source code is no
|
||||
FROM base AS lint-golangci-lint
|
||||
WORKDIR /src
|
||||
COPY .golangci.yml .
|
||||
ENV GOGC 50
|
||||
ENV GOGC=50
|
||||
RUN golangci-lint config verify --config .golangci.yml
|
||||
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/root/.cache/golangci-lint --mount=type=cache,target=/go/pkg golangci-lint run --config .golangci.yml
|
||||
|
||||
@ -183,6 +183,6 @@ ARG TARGETARCH
|
||||
COPY --from=discovery-service discovery-service-linux-${TARGETARCH} /discovery-service
|
||||
COPY --from=image-fhs / /
|
||||
COPY --from=image-ca-certificates / /
|
||||
LABEL org.opencontainers.image.source https://github.com/siderolabs/discovery-service
|
||||
LABEL org.opencontainers.image.source=https://github.com/siderolabs/discovery-service
|
||||
ENTRYPOINT ["/discovery-service"]
|
||||
|
||||
|
||||
18
Makefile
18
Makefile
@ -1,6 +1,6 @@
|
||||
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
|
||||
#
|
||||
# Generated on 2024-05-28T00:03:10Z by kres bcb280a.
|
||||
# Generated on 2024-09-02T13:05:25Z by kres b5ca957.
|
||||
|
||||
# common variables
|
||||
|
||||
@ -17,15 +17,15 @@ WITH_RACE ?= false
|
||||
REGISTRY ?= ghcr.io
|
||||
USERNAME ?= siderolabs
|
||||
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
|
||||
PROTOBUF_GO_VERSION ?= 1.34.1
|
||||
GRPC_GO_VERSION ?= 1.3.0
|
||||
GRPC_GATEWAY_VERSION ?= 2.20.0
|
||||
PROTOBUF_GO_VERSION ?= 1.34.2
|
||||
GRPC_GO_VERSION ?= 1.5.1
|
||||
GRPC_GATEWAY_VERSION ?= 2.22.0
|
||||
VTPROTOBUF_VERSION ?= 0.6.0
|
||||
GOIMPORTS_VERSION ?= 0.21.0
|
||||
GOIMPORTS_VERSION ?= 0.24.0
|
||||
DEEPCOPY_VERSION ?= v0.5.6
|
||||
GOLANGCILINT_VERSION ?= v1.59.0
|
||||
GOFUMPT_VERSION ?= v0.6.0
|
||||
GO_VERSION ?= 1.22.3
|
||||
GOLANGCILINT_VERSION ?= v1.60.3
|
||||
GOFUMPT_VERSION ?= v0.7.0
|
||||
GO_VERSION ?= 1.23.0
|
||||
GO_BUILDFLAGS ?=
|
||||
GO_LDFLAGS ?=
|
||||
CGO_ENABLED ?= 0
|
||||
@ -67,7 +67,7 @@ COMMON_ARGS += --build-arg=DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)"
|
||||
COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
|
||||
COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
|
||||
COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
|
||||
TOOLCHAIN ?= docker.io/golang:1.22-alpine
|
||||
TOOLCHAIN ?= docker.io/golang:1.23-alpine
|
||||
|
||||
# help menu
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.34.1
|
||||
// protoc-gen-go v1.34.2
|
||||
// protoc v4.24.4
|
||||
// source: storage/discovery.proto
|
||||
|
||||
@ -313,7 +313,7 @@ func file_storage_discovery_proto_rawDescGZIP() []byte {
|
||||
}
|
||||
|
||||
var file_storage_discovery_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
|
||||
var file_storage_discovery_proto_goTypes = []interface{}{
|
||||
var file_storage_discovery_proto_goTypes = []any{
|
||||
(*StateSnapshot)(nil), // 0: sidero.discovery.storage.StateSnapshot
|
||||
(*ClusterSnapshot)(nil), // 1: sidero.discovery.storage.ClusterSnapshot
|
||||
(*AffiliateSnapshot)(nil), // 2: sidero.discovery.storage.AffiliateSnapshot
|
||||
@ -339,7 +339,7 @@ func file_storage_discovery_proto_init() {
|
||||
return
|
||||
}
|
||||
if !protoimpl.UnsafeEnabled {
|
||||
file_storage_discovery_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||
file_storage_discovery_proto_msgTypes[0].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*StateSnapshot); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -351,7 +351,7 @@ func file_storage_discovery_proto_init() {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_storage_discovery_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
||||
file_storage_discovery_proto_msgTypes[1].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*ClusterSnapshot); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -363,7 +363,7 @@ func file_storage_discovery_proto_init() {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_storage_discovery_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
||||
file_storage_discovery_proto_msgTypes[2].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*AffiliateSnapshot); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -375,7 +375,7 @@ func file_storage_discovery_proto_init() {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_storage_discovery_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
|
||||
file_storage_discovery_proto_msgTypes[3].Exporter = func(v any, i int) any {
|
||||
switch v := v.(*EndpointSnapshot); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
|
||||
42
go.mod
42
go.mod
@ -3,38 +3,40 @@ module github.com/siderolabs/discovery-service
|
||||
go 1.22.3
|
||||
|
||||
require (
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
|
||||
github.com/jonboulle/clockwork v0.4.1-0.20231224152657-fc59783b0293
|
||||
github.com/planetscale/vtprotobuf v0.6.0
|
||||
github.com/prometheus/client_golang v1.19.0
|
||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10
|
||||
github.com/prometheus/client_golang v1.20.2
|
||||
github.com/siderolabs/discovery-api v0.1.4
|
||||
github.com/siderolabs/discovery-client v0.1.8
|
||||
github.com/siderolabs/discovery-client v0.1.9
|
||||
github.com/siderolabs/gen v0.5.0
|
||||
github.com/siderolabs/go-debug v0.3.0
|
||||
github.com/siderolabs/go-debug v0.4.0
|
||||
github.com/stretchr/testify v1.9.0
|
||||
go.uber.org/zap v1.27.0
|
||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
|
||||
golang.org/x/sync v0.6.0
|
||||
golang.org/x/time v0.5.0
|
||||
google.golang.org/grpc v1.62.1
|
||||
google.golang.org/protobuf v1.34.1
|
||||
golang.org/x/sync v0.8.0
|
||||
golang.org/x/time v0.6.0
|
||||
google.golang.org/grpc v1.66.0
|
||||
google.golang.org/protobuf v1.34.2
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/beorn7/perks v1.0.1 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/golang/protobuf v1.5.3 // indirect
|
||||
github.com/klauspost/compress v1.17.9 // indirect
|
||||
github.com/kylelemons/godebug v1.1.0 // indirect
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/prometheus/client_model v0.5.0 // indirect
|
||||
github.com/prometheus/common v0.48.0 // indirect
|
||||
github.com/prometheus/procfs v0.12.0 // indirect
|
||||
github.com/prometheus/client_model v0.6.1 // indirect
|
||||
github.com/prometheus/common v0.57.0 // indirect
|
||||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
golang.org/x/net v0.25.0 // indirect
|
||||
golang.org/x/sys v0.20.0 // indirect
|
||||
golang.org/x/text v0.15.0 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
|
||||
golang.org/x/net v0.28.0 // indirect
|
||||
golang.org/x/sys v0.24.0 // indirect
|
||||
golang.org/x/text v0.17.0 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
95
go.sum
95
go.sum
@ -1,49 +1,53 @@
|
||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
|
||||
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
|
||||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
|
||||
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
|
||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
|
||||
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0 h1:f4tggROQKKcnh4eItay6z/HbHLqghBxS8g7pyMhmDio=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0/go.mod h1:hKAkSgNkL0FII46ZkJcpVEAai4KV+swlIWCKfekd1pA=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 h1:HcUWd006luQPljE73d5sk+/VgYPGUReEVz2y1/qylwY=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1/go.mod h1:w9Y7gY31krpLmrVU5ZPG9H7l9fZuRu5/3R3S3FMtVQ4=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 h1:pRhl55Yx1eC7BZ1N+BBWwnKaMyD8uC+34TLdndZMAKk=
|
||||
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI=
|
||||
github.com/jonboulle/clockwork v0.4.1-0.20231224152657-fc59783b0293 h1:l3TVsYI+QxIp0CW7YCizx9WG26Lj7DXnc1pdlBKk3gY=
|
||||
github.com/jonboulle/clockwork v0.4.1-0.20231224152657-fc59783b0293/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
|
||||
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
|
||||
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/planetscale/vtprotobuf v0.6.0 h1:nBeETjudeJ5ZgBHUz1fVHvbqUKnYOXNhsIEabROxmNA=
|
||||
github.com/planetscale/vtprotobuf v0.6.0/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
|
||||
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
|
||||
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
|
||||
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
|
||||
github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
|
||||
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
|
||||
github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
|
||||
github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
|
||||
github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
|
||||
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
|
||||
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
|
||||
github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
|
||||
github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
|
||||
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
|
||||
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
|
||||
github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
|
||||
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
|
||||
github.com/prometheus/common v0.57.0 h1:Ro/rKjwdq9mZn1K5QPctzh+MA4Lp0BuYk5ZZEVhoNcY=
|
||||
github.com/prometheus/common v0.57.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI=
|
||||
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
|
||||
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
|
||||
github.com/siderolabs/discovery-api v0.1.4 h1:2fMEFSMiWaD1zDiBDY5md8VxItvL1rDQRSOfeXNjYKc=
|
||||
github.com/siderolabs/discovery-api v0.1.4/go.mod h1:kaBy+G42v2xd/uAF/NIe383sjNTBE2AhxPTyi9SZI0s=
|
||||
github.com/siderolabs/discovery-client v0.1.8 h1:8WhJiNyVmjZ0F+tSfeaDyQ04n02lRK2dh/CvWp+zlnY=
|
||||
github.com/siderolabs/discovery-client v0.1.8/go.mod h1:djZDsGuXOclDfMfur5mYfzFO1xasnIIL6ejyReOsFL8=
|
||||
github.com/siderolabs/discovery-client v0.1.9 h1:yDzvts++Nf/2qczdDUfU5GAibkEIgz/eo9RPG/k/rOc=
|
||||
github.com/siderolabs/discovery-client v0.1.9/go.mod h1:Ew1z07eyJwqNwum84IKYH4S649KEKK5WUmRW49HlXS8=
|
||||
github.com/siderolabs/gen v0.5.0 h1:Afdjx+zuZDf53eH5DB+E+T2JeCwBXGinV66A6osLgQI=
|
||||
github.com/siderolabs/gen v0.5.0/go.mod h1:1GUMBNliW98Xeq8GPQeVMYqQE09LFItE8enR3wgMh3Q=
|
||||
github.com/siderolabs/go-debug v0.3.0 h1:C8t7jbac5Va2eYu9QRXXEGsy3Vz5xOEVo0TDwVJH268=
|
||||
github.com/siderolabs/go-debug v0.3.0/go.mod h1:DonqzIQOm3+qof020meFwJ2gXI5Jv/x4Dj27FyUW4aE=
|
||||
github.com/siderolabs/go-debug v0.4.0 h1:pbFt6Rzumm90s3GvbRer7yIxFNc0gQ94I53omkqswHA=
|
||||
github.com/siderolabs/go-debug v0.4.0/go.mod h1:9/dyHLRRIpqlJ0uTYyHo1XuZgoCgXzjjF+aIVTnr9Dc=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||
@ -54,25 +58,26 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
|
||||
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
|
||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
|
||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
|
||||
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
|
||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
|
||||
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
|
||||
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
|
||||
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
|
||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
||||
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
|
||||
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
|
||||
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
|
||||
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
|
||||
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
|
||||
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
|
||||
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
|
||||
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
|
||||
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
|
||||
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg=
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
|
||||
google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
|
||||
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
|
||||
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
|
||||
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
|
||||
#
|
||||
# Generated on 2022-08-25T16:11:00Z by kres d2252ce.
|
||||
# Generated on 2024-09-02T13:05:25Z by kres b5ca957.
|
||||
|
||||
set -e
|
||||
|
||||
@ -44,9 +44,92 @@ function commit {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if is_on_main_branch; then
|
||||
update_license_files
|
||||
fi
|
||||
|
||||
git commit -s -m "release($1): prepare release" -m "This is the official $1 release."
|
||||
}
|
||||
|
||||
function is_on_main_branch {
|
||||
main_remotes=("upstream" "origin")
|
||||
branch_names=("main" "master")
|
||||
current_branch=$(git rev-parse --abbrev-ref HEAD)
|
||||
|
||||
echo "Check current branch: $current_branch"
|
||||
|
||||
for remote in "${main_remotes[@]}"; do
|
||||
echo "Fetch remote $remote..."
|
||||
|
||||
if ! git fetch --quiet "$remote" &>/dev/null; then
|
||||
echo "Failed to fetch $remote, skip..."
|
||||
|
||||
continue
|
||||
fi
|
||||
|
||||
for branch_name in "${branch_names[@]}"; do
|
||||
if ! git rev-parse --verify "$branch_name" &>/dev/null; then
|
||||
echo "Branch $branch_name does not exist, skip..."
|
||||
|
||||
continue
|
||||
fi
|
||||
|
||||
echo "Branch $remote/$branch_name exists, comparing..."
|
||||
|
||||
merge_base=$(git merge-base "$current_branch" "$remote/$branch_name")
|
||||
latest_main=$(git rev-parse "$remote/$branch_name")
|
||||
|
||||
if [ "$merge_base" = "$latest_main" ]; then
|
||||
echo "Current branch is up-to-date with $remote/$branch_name"
|
||||
|
||||
return 0
|
||||
else
|
||||
echo "Current branch is not on $remote/$branch_name"
|
||||
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
echo "No main or master branch found on any remote"
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
function update_license_files {
|
||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
parent_dir="$(dirname "$script_dir")"
|
||||
current_year=$(date +"%Y")
|
||||
change_date=$(date -v+4y +"%Y-%m-%d" 2>/dev/null || date -d "+4 years" +"%Y-%m-%d" 2>/dev/null || date --date="+4 years" +"%Y-%m-%d")
|
||||
|
||||
# Find LICENSE and .kres.yaml files recursively in the parent directory (project root)
|
||||
find "$parent_dir" \( -name "LICENSE" -o -name ".kres.yaml" \) -type f | while read -r file; do
|
||||
temp_file="${file}.tmp"
|
||||
|
||||
if [[ $file == *"LICENSE" ]]; then
|
||||
if grep -q "^Business Source License" "$file"; then
|
||||
sed -e "s/The Licensed Work is (c) [0-9]\{4\}/The Licensed Work is (c) $current_year/" \
|
||||
-e "s/Change Date: [0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}/Change Date: $change_date/" \
|
||||
"$file" >"$temp_file"
|
||||
else
|
||||
continue # Not a Business Source License file
|
||||
fi
|
||||
elif [[ $file == *".kres.yaml" ]]; then
|
||||
sed -E 's/^([[:space:]]*)ChangeDate:.*$/\1ChangeDate: "'"$change_date"'"/' "$file" >"$temp_file"
|
||||
fi
|
||||
|
||||
# Check if the file has changed
|
||||
if ! cmp -s "$file" "$temp_file"; then
|
||||
mv "$temp_file" "$file"
|
||||
echo "Updated: $file"
|
||||
git add "$file"
|
||||
else
|
||||
echo "No changes: $file"
|
||||
rm "$temp_file"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
if declare -f "$1" > /dev/null
|
||||
then
|
||||
cmd="$1"
|
||||
@ -55,7 +138,7 @@ then
|
||||
else
|
||||
cat <<EOF
|
||||
Usage:
|
||||
commit: Create the official release commit message.
|
||||
commit: Create the official release commit message (updates BUSL license dates if there is any).
|
||||
cherry-pick: Cherry-pick a commit into a release branch.
|
||||
changelog: Update the specified CHANGELOG.
|
||||
release-notes: Create release notes for GitHub release.
|
||||
|
||||
@ -10,44 +10,105 @@ import (
|
||||
"fmt"
|
||||
|
||||
"google.golang.org/grpc/encoding"
|
||||
"google.golang.org/grpc/encoding/proto"
|
||||
protov2 "google.golang.org/protobuf/proto"
|
||||
protoenc "google.golang.org/grpc/encoding/proto"
|
||||
"google.golang.org/grpc/mem"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
// Codec provides protobuf encoding.Codec.
|
||||
// Codec provides protobuf [encoding.CodecV2].
|
||||
type Codec struct{}
|
||||
|
||||
// Marshal implements encoding.Codec.
|
||||
func (Codec) Marshal(v interface{}) ([]byte, error) {
|
||||
// our types implement Message (with or without vtproto additions depending on build configuration)
|
||||
if m, ok := v.(Message); ok {
|
||||
return Marshal(m)
|
||||
// Marshal implements [encoding.CodecV2].
|
||||
func (Codec) Marshal(v any) (mem.BufferSlice, error) {
|
||||
size, err := getSize(v)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// no types implement protobuf API v1 only, so don't check for it
|
||||
if mem.IsBelowBufferPoolingThreshold(size) {
|
||||
buf, err := marshal(v)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("failed to marshal %T", v)
|
||||
return mem.BufferSlice{mem.SliceBuffer(buf)}, nil
|
||||
}
|
||||
|
||||
pool := mem.DefaultBufferPool()
|
||||
|
||||
buf := pool.Get(size)
|
||||
if err := marshalAppend((*buf)[:size], v); err != nil {
|
||||
pool.Put(buf)
|
||||
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return mem.BufferSlice{mem.NewBuffer(buf, pool)}, nil
|
||||
}
|
||||
|
||||
// Unmarshal implements encoding.Codec.
|
||||
func (Codec) Unmarshal(data []byte, v interface{}) error {
|
||||
func getSize(v any) (int, error) {
|
||||
// our types implement Message (with or without vtproto additions depending on build configuration)
|
||||
if m, ok := v.(Message); ok {
|
||||
return Unmarshal(data, m)
|
||||
}
|
||||
|
||||
// no types implement protobuf API v1 only, so don't check for it
|
||||
switch v := v.(type) {
|
||||
case vtprotoMessage:
|
||||
return v.SizeVT(), nil
|
||||
case proto.Message:
|
||||
return proto.Size(v), nil
|
||||
default:
|
||||
return -1, fmt.Errorf("failed to get size, message is %T, must satisfy the vtprotoMessage, proto.Message or protoadapt.MessageV1 ", v)
|
||||
}
|
||||
}
|
||||
|
||||
return fmt.Errorf("failed to unmarshal %T", v)
|
||||
func marshal(v any) ([]byte, error) {
|
||||
// our types implement Message (with or without vtproto additions depending on build configuration)
|
||||
// no types implement protobuf API v1 only, so don't check for it
|
||||
switch v := v.(type) {
|
||||
case vtprotoMessage:
|
||||
return v.MarshalVT()
|
||||
case proto.Message:
|
||||
return proto.Marshal(v)
|
||||
default:
|
||||
return nil, fmt.Errorf("failed to marshal, message is %T, must satisfy the vtprotoMessage, proto.Message or protoadapt.MessageV1 ", v)
|
||||
}
|
||||
}
|
||||
|
||||
func marshalAppend(dst []byte, v any) error {
|
||||
takeErr := func(_ any, e error) error { return e }
|
||||
|
||||
// our types implement Message (with or without vtproto additions depending on build configuration)
|
||||
// no types implement protobuf API v1 only, so don't check for it
|
||||
switch v := v.(type) {
|
||||
case vtprotoMessage:
|
||||
return takeErr(v.MarshalToSizedBufferVT(dst))
|
||||
case proto.Message:
|
||||
return takeErr((proto.MarshalOptions{}).MarshalAppend(dst[:0], v))
|
||||
default:
|
||||
return fmt.Errorf("failed to marshal-append, message is %T, must satisfy the vtprotoMessage, proto.Message or protoadapt.MessageV1 ", v)
|
||||
}
|
||||
}
|
||||
|
||||
// Unmarshal implements [encoding.CodecV2].
|
||||
func (Codec) Unmarshal(data mem.BufferSlice, v any) error {
|
||||
buf := data.MaterializeToBuffer(mem.DefaultBufferPool())
|
||||
defer buf.Free()
|
||||
|
||||
// our types implement Message (with or without vtproto additions depending on build configuration)
|
||||
// no types implement protobuf API v1 only, so don't check for it
|
||||
switch v := v.(type) {
|
||||
case vtprotoMessage:
|
||||
return v.UnmarshalVT(buf.ReadOnlyData())
|
||||
case Message:
|
||||
return proto.Unmarshal(buf.ReadOnlyData(), v)
|
||||
default:
|
||||
return fmt.Errorf("failed to unmarshal, message is %T, must satisfy the vtprotoMessage, proto.Message or protoadapt.MessageV1", v)
|
||||
}
|
||||
}
|
||||
|
||||
// Name implements encoding.Codec.
|
||||
func (Codec) Name() string {
|
||||
return proto.Name // overrides google.golang.org/grpc/encoding/proto codec
|
||||
}
|
||||
func (Codec) Name() string { return protoenc.Name } // overrides google.golang.org/grpc/encoding/proto codec
|
||||
|
||||
// Message is the main interface for protobuf API v2 messages.
|
||||
type Message = protov2.Message
|
||||
type Message = proto.Message
|
||||
|
||||
// vtprotoMessage is the interface for vtproto additions.
|
||||
//
|
||||
@ -55,30 +116,36 @@ type Message = protov2.Message
|
||||
// to prevent accidental successful type assertion for unrelated types.
|
||||
type vtprotoMessage interface {
|
||||
MarshalVT() ([]byte, error)
|
||||
MarshalToVT([]byte) (int, error)
|
||||
MarshalToSizedBufferVT([]byte) (int, error)
|
||||
UnmarshalVT([]byte) error
|
||||
SizeVT() int
|
||||
}
|
||||
|
||||
// Marshal returns the wire-format encoding of m.
|
||||
func Marshal(m Message) ([]byte, error) {
|
||||
// our types implement Message (with or without vtproto additions depending on build configuration)
|
||||
if vm, ok := m.(vtprotoMessage); ok {
|
||||
return vm.MarshalVT()
|
||||
}
|
||||
|
||||
return protov2.Marshal(m)
|
||||
// no types implement protobuf API v1 only, so don't check for it
|
||||
|
||||
return proto.Marshal(m)
|
||||
}
|
||||
|
||||
// Unmarshal parses the wire-format message in b and places the result in m.
|
||||
// The provided message must be mutable (e.g., a non-nil pointer to a message).
|
||||
func Unmarshal(b []byte, m Message) error {
|
||||
// our types implement Message (with or without vtproto additions depending on build configuration)
|
||||
if vm, ok := m.(vtprotoMessage); ok {
|
||||
return vm.UnmarshalVT(b)
|
||||
}
|
||||
|
||||
return protov2.Unmarshal(b, m)
|
||||
// no types implement protobuf API v1 only, so don't check for it
|
||||
|
||||
return proto.Unmarshal(b, m)
|
||||
}
|
||||
|
||||
func init() {
|
||||
encoding.RegisterCodec(Codec{})
|
||||
encoding.RegisterCodecV2(Codec{})
|
||||
}
|
||||
|
||||
@ -25,7 +25,6 @@ import (
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/credentials/insecure"
|
||||
"google.golang.org/grpc/experimental"
|
||||
"google.golang.org/grpc/metadata"
|
||||
"google.golang.org/grpc/status"
|
||||
"google.golang.org/protobuf/proto"
|
||||
@ -100,7 +99,6 @@ func setupServer(t *testing.T, rateLimit rate.Limit, redirectEndpoint string) *t
|
||||
server.RateLimitStreamServerInterceptor(limiter),
|
||||
),
|
||||
grpc.SharedWriteBuffer(true),
|
||||
experimental.RecvBufferPool(grpc.NewSharedBufferPool()),
|
||||
grpc.ReadBufferSize(16 * 1024),
|
||||
grpc.WriteBufferSize(16 * 1024),
|
||||
}
|
||||
@ -146,7 +144,7 @@ func TestServerAPI(t *testing.T) {
|
||||
|
||||
addr := setupServer(t, 5000, "").address
|
||||
|
||||
conn, e := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
conn, e := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
require.NoError(t, e)
|
||||
|
||||
client := pb.NewClusterClient(conn)
|
||||
@ -346,7 +344,7 @@ func TestValidation(t *testing.T) {
|
||||
|
||||
addr := setupServer(t, 5000, "").address
|
||||
|
||||
conn, e := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
conn, e := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
require.NoError(t, e)
|
||||
|
||||
client := pb.NewClusterClient(conn)
|
||||
@ -541,7 +539,7 @@ func TestServerRateLimit(t *testing.T) {
|
||||
|
||||
addr := setupServer(t, 1, "").address
|
||||
|
||||
conn, e := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
conn, e := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
require.NoError(t, e)
|
||||
|
||||
client := pb.NewClusterClient(conn)
|
||||
@ -555,7 +553,7 @@ func TestServerRedirect(t *testing.T) {
|
||||
|
||||
addr := setupServer(t, 1, "new.example.com:443").address
|
||||
|
||||
conn, e := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
conn, e := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
require.NoError(t, e)
|
||||
|
||||
client := pb.NewClusterClient(conn)
|
||||
|
||||
@ -26,7 +26,6 @@ import (
|
||||
"golang.org/x/sync/errgroup"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/experimental"
|
||||
"google.golang.org/grpc/keepalive"
|
||||
"google.golang.org/grpc/status"
|
||||
|
||||
@ -97,7 +96,6 @@ func Run(ctx context.Context, options Options, logger *zap.Logger) error {
|
||||
MinTime: 10 * time.Second,
|
||||
}),
|
||||
grpc.SharedWriteBuffer(true),
|
||||
experimental.RecvBufferPool(grpc.NewSharedBufferPool()),
|
||||
grpc.ReadBufferSize(16 * 1024),
|
||||
grpc.WriteBufferSize(16 * 1024),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user