Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ require (
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-chi/chi/v5 v5.0.7 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
Expand Down Expand Up @@ -240,7 +239,6 @@ require (
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/soheilhy/cmux v0.1.5 // indirect
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/tinylib/msgp v1.3.0 // indirect
github.com/trivago/tgo v1.0.7 // indirect
Expand All @@ -249,7 +247,6 @@ require (
github.com/weaveworks/promrus v1.2.0 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
github.com/yuin/gopher-lua v1.1.1 // indirect
github.com/zeebo/errs v1.4.0 // indirect
go.mongodb.org/mongo-driver v1.17.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
Expand Down Expand Up @@ -326,3 +323,9 @@ replace github.com/google/gnostic => github.com/googleapis/gnostic v0.6.9
// Same replace used by thanos: (may be removed in the future)
// https://github.com/thanos-io/thanos/blob/fdeea3917591fc363a329cbe23af37c6fff0b5f0/go.mod#L265
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497

// Wait for fix for https://github.com/grpc/grpc-go/pull/8504.
replace google.golang.org/grpc => google.golang.org/grpc v1.71.2

// See https://github.com/envoyproxy/go-control-plane/issues/1083 as this version introduces checksum mismatch.
exclude github.com/envoyproxy/go-control-plane/envoy v1.32.3
1,258 changes: 1,193 additions & 65 deletions go.sum

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions pkg/ring/client/pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ type mockClient struct {
status grpc_health_v1.HealthCheckResponse_ServingStatus
}

func (i mockClient) List(ctx context.Context, in *grpc_health_v1.HealthListRequest, opts ...grpc.CallOption) (*grpc_health_v1.HealthListResponse, error) {
if !i.happy {
return nil, fmt.Errorf("Fail")
}
return &grpc_health_v1.HealthListResponse{}, nil
}

func (i mockClient) Check(ctx context.Context, in *grpc_health_v1.HealthCheckRequest, opts ...grpc.CallOption) (*grpc_health_v1.HealthCheckResponse, error) {
if !i.happy {
return nil, fmt.Errorf("Fail")
Expand Down
13 changes: 0 additions & 13 deletions pkg/util/grpcutil/health_check.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,6 @@ func (h *HealthCheck) Check(_ context.Context, _ *grpc_health_v1.HealthCheckRequ
return &grpc_health_v1.HealthCheckResponse{Status: grpc_health_v1.HealthCheckResponse_SERVING}, nil
}

func (h *HealthCheck) List(ctx context.Context, request *grpc_health_v1.HealthListRequest) (*grpc_health_v1.HealthListResponse, error) {
checkResp, err := h.Check(ctx, nil)
if err != nil {
return &grpc_health_v1.HealthListResponse{}, err
}

return &grpc_health_v1.HealthListResponse{
Statuses: map[string]*grpc_health_v1.HealthCheckResponse{
"server": checkResp,
},
}, nil
}

// Watch implements the grpc healthcheck.
func (h *HealthCheck) Watch(_ *grpc_health_v1.HealthCheckRequest, _ grpc_health_v1.Health_WatchServer) error {
return status.Error(codes.Unimplemented, "Watching is not supported")
Expand Down
13 changes: 0 additions & 13 deletions pkg/util/tls/test/tls_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,6 @@ type grpcHealthCheck struct {
healthy bool
}

func (h *grpcHealthCheck) List(ctx context.Context, request *grpc_health_v1.HealthListRequest) (*grpc_health_v1.HealthListResponse, error) {
checkResp, err := h.Check(ctx, nil)
if err != nil {
return &grpc_health_v1.HealthListResponse{}, err
}

return &grpc_health_v1.HealthListResponse{
Statuses: map[string]*grpc_health_v1.HealthCheckResponse{
"server": checkResp,
},
}, nil
}

func (h *grpcHealthCheck) Check(_ context.Context, _ *grpc_health_v1.HealthCheckRequest) (*grpc_health_v1.HealthCheckResponse, error) {
if !h.healthy {
return &grpc_health_v1.HealthCheckResponse{Status: grpc_health_v1.HealthCheckResponse_NOT_SERVING}, nil
Expand Down
2 changes: 0 additions & 2 deletions vendor/github.com/go-jose/go-jose/v4/.gitignore

This file was deleted.

53 changes: 0 additions & 53 deletions vendor/github.com/go-jose/go-jose/v4/.golangci.yml

This file was deleted.

33 changes: 0 additions & 33 deletions vendor/github.com/go-jose/go-jose/v4/.travis.yml

This file was deleted.

96 changes: 0 additions & 96 deletions vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md

This file was deleted.

Loading
Loading