Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-10-21 23:16:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

deps: update Go dependencies (#3185)

Browse source 
* deps: update Go dependencies
* deps: tidy all modules
* Replace deprecated `grpc.DialContext` with `grpc.NewClient`

---------

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: edgelessci <edgelessci@users.noreply.github.com>
Co-authored-by: Daniel Weiße <dw@edgeless.systems>
This commit is contained in:
renovate[bot] 2024-06-21 10:05:57 +02:00 • committed by GitHub
parent bd80ab89cb
commit e71819eb62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 392 additions and 389 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debugd/internal/cdbg/cmd/deploy.go
View file

@ -203,8 +203,7 @@ type closeAndWait func()
// newDebugdClient creates a new gRPC client for the debugd service and logs the connection state changes.
func newDebugdClient(ctx context.Context, ip string, log *slog.Logger) (pb.DebugdClient, closeAndWait, error) {
conn, err := grpc.DialContext(
ctx,
conn, err := grpc.NewClient(
net.JoinHostPort(ip, strconv.Itoa(constants.DebugdPort)),
grpc.WithTransportCredentials(insecure.NewCredentials()),
logger.GetClientUnaryInterceptor(log),

12
debugd/internal/debugd/deploy/download.go
View file

@ -53,7 +53,7 @@ func (d *Download) DownloadInfo(ctx context.Context, ip string) error {
log := d.log.With(slog.String("ip", ip))
serverAddr := net.JoinHostPort(ip, strconv.Itoa(constants.DebugdPort))
client, closer, err := d.newClient(ctx, serverAddr, log)
client, closer, err := d.newClient(serverAddr, log)
if err != nil {
return err
}
@ -74,7 +74,7 @@ func (d *Download) DownloadDeployment(ctx context.Context, ip string) error {
log := d.log.With(slog.String("ip", ip))
serverAddr := net.JoinHostPort(ip, strconv.Itoa(constants.DebugdPort))
client, closer, err := d.newClient(ctx, serverAddr, log)
client, closer, err := d.newClient(serverAddr, log)
if err != nil {
return err
}
@ -117,17 +117,17 @@ func (d *Download) DownloadDeployment(ctx context.Context, ip string) error {
return nil
}
func (d *Download) newClient(ctx context.Context, serverAddr string, log *slog.Logger) (pb.DebugdClient, io.Closer, error) {
func (d *Download) newClient(serverAddr string, log *slog.Logger) (pb.DebugdClient, io.Closer, error) {
log.Info("Connecting to server")
conn, err := d.dial(ctx, serverAddr)
conn, err := d.dial(serverAddr)
if err != nil {
return nil, nil, fmt.Errorf("connecting to other instance via gRPC: %w", err)
}
return pb.NewDebugdClient(conn), conn, nil
}
func (d *Download) dial(ctx context.Context, target string) (*grpc.ClientConn, error) {
return grpc.DialContext(ctx, target,
func (d *Download) dial(target string) (*grpc.ClientConn, error) {
return grpc.NewClient(target,
d.grpcWithDialer(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
)

6
debugd/internal/debugd/server/server_test.go
View file

@ -371,8 +371,8 @@ type netDialer interface {
DialContext(_ context.Context, network, address string) (net.Conn, error)
}
func dial(ctx context.Context, dialer netDialer, target string) (*grpc.ClientConn, error) {
return grpc.DialContext(ctx, target,
func dial(dialer netDialer, target string) (*grpc.ClientConn, error) {
return grpc.NewClient(target,
grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
return dialer.DialContext(ctx, "tcp", addr)
}),
@ -414,7 +414,7 @@ func setupServerWithConn(endpoint string, serv *debugdServer) (*grpc.Server, *gr
lis := dialer.GetListener(endpoint)
go grpcServ.Serve(lis)
conn, err := dial(context.Background(), dialer, endpoint)
conn, err := dial(dialer, endpoint)
if err != nil {
return nil, nil, err
}

34
debugd/service/debugd.pb.go
View file

@ -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 v3.21.7
// source: debugd/service/debugd.proto
@ -978,7 +978,7 @@ func file_debugd_service_debugd_proto_rawDescGZIP() []byte {
var file_debugd_service_debugd_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
var file_debugd_service_debugd_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
var file_debugd_service_debugd_proto_goTypes = []interface{}{
var file_debugd_service_debugd_proto_goTypes = []any{
(SetInfoStatus)(0), // 0: debugd.SetInfoStatus
(UploadFilesStatus)(0), // 1: debugd.UploadFilesStatus
(UploadSystemdServiceUnitsStatus)(0), // 2: debugd.UploadSystemdServiceUnitsStatus
@ -1028,7 +1028,7 @@ func file_debugd_service_debugd_proto_init() {
return
}
if !protoimpl.UnsafeEnabled {
file_debugd_service_debugd_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[0].Exporter = func(v any, i int) any {
switch v := v.(*SetInfoRequest); i {
case 0:
return &v.state
@ -1040,7 +1040,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[1].Exporter = func(v any, i int) any {
switch v := v.(*SetInfoResponse); i {
case 0:
return &v.state
@ -1052,7 +1052,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[2].Exporter = func(v any, i int) any {
switch v := v.(*GetInfoRequest); i {
case 0:
return &v.state
@ -1064,7 +1064,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[3].Exporter = func(v any, i int) any {
switch v := v.(*GetInfoResponse); i {
case 0:
return &v.state
@ -1076,7 +1076,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[4].Exporter = func(v any, i int) any {
switch v := v.(*Info); i {
case 0:
return &v.state
@ -1088,7 +1088,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[5].Exporter = func(v any, i int) any {
switch v := v.(*DownloadFilesRequest); i {
case 0:
return &v.state
@ -1100,7 +1100,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[6].Exporter = func(v any, i int) any {
switch v := v.(*FileTransferMessage); i {
case 0:
return &v.state
@ -1112,7 +1112,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[7].Exporter = func(v any, i int) any {
switch v := v.(*FileTransferHeader); i {
case 0:
return &v.state
@ -1124,7 +1124,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[8].Exporter = func(v any, i int) any {
switch v := v.(*Chunk); i {
case 0:
return &v.state
@ -1136,7 +1136,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[9].Exporter = func(v any, i int) any {
switch v := v.(*UploadFilesResponse); i {
case 0:
return &v.state
@ -1148,7 +1148,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[10].Exporter = func(v any, i int) any {
switch v := v.(*ServiceUnit); i {
case 0:
return &v.state
@ -1160,7 +1160,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[11].Exporter = func(v any, i int) any {
switch v := v.(*UploadSystemdServiceUnitsRequest); i {
case 0:
return &v.state
@ -1172,7 +1172,7 @@ func file_debugd_service_debugd_proto_init() {
return nil
}
}
file_debugd_service_debugd_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
file_debugd_service_debugd_proto_msgTypes[12].Exporter = func(v any, i int) any {
switch v := v.(*UploadSystemdServiceUnitsResponse); i {
case 0:
return &v.state
@ -1185,11 +1185,11 @@ func file_debugd_service_debugd_proto_init() {
}
}
}
file_debugd_service_debugd_proto_msgTypes[6].OneofWrappers = []interface{}{
file_debugd_service_debugd_proto_msgTypes[6].OneofWrappers = []any{
(*FileTransferMessage_Header)(nil),
(*FileTransferMessage_Chunk)(nil),
}
file_debugd_service_debugd_proto_msgTypes[7].OneofWrappers = []interface{}{}
file_debugd_service_debugd_proto_msgTypes[7].OneofWrappers = []any{}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{