From 147932abef60190f5c523375ccb34bc418f9c68e Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Wed, 22 May 2024 10:41:50 +0000
Subject: [PATCH] Use grpc.NewClient() instead of deprecated grpc.Dial()
See merge request danet/quant!131
---
goKMS/kms/kms.go | 4 ++--
goKMS/kms/kmsintercom.go | 2 +-
quantumlayer/main/main.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/goKMS/kms/kms.go b/goKMS/kms/kms.go
index 4d9b1cff..d9c64995 100644
--- a/goKMS/kms/kms.go
+++ b/goKMS/kms/kms.go
@@ -192,7 +192,7 @@ func (kms *KMS) initializePeers(config *config.Config) error {
return fmt.Errorf("unable to generate gRPC transport creds: %w", err)
}
- newPeerConn, err := grpc.Dial(peer.PeerInterComAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
+ newPeerConn, err := grpc.NewClient(peer.PeerInterComAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
if err != nil {
return nil
}
@@ -598,7 +598,7 @@ func (kms *KMS) sendKSAKeysToPlatformKmsPeer(kmsPeerAddress, platformKeyID, requ
return fmt.Errorf("unable to generate gRPC transport creds: %w", err)
}
- remoteConn, err := grpc.Dial(kmsPeerAddress, grpc.WithTransportCredentials(gRPCTransportCreds))
+ remoteConn, err := grpc.NewClient(kmsPeerAddress, grpc.WithTransportCredentials(gRPCTransportCreds))
if err != nil {
log.Error(err)
return err
diff --git a/goKMS/kms/kmsintercom.go b/goKMS/kms/kmsintercom.go
index 042461e0..73536849 100644
--- a/goKMS/kms/kmsintercom.go
+++ b/goKMS/kms/kmsintercom.go
@@ -380,7 +380,7 @@ func (s *kmsTalkerServer) sendAcknowledgeKeyForwarding(ctx context.Context, remo
return fmt.Errorf("unable to generate gRPC transport creds: %w", err)
}
- newPeerConn, err := grpc.Dial(remoteKmsAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
+ newPeerConn, err := grpc.NewClient(remoteKmsAddr, grpc.WithTransportCredentials(gRPCTransportCreds))
if err != nil {
return err
}
diff --git a/quantumlayer/main/main.go b/quantumlayer/main/main.go
index 946feeb3..05435b00 100644
--- a/quantumlayer/main/main.go
+++ b/quantumlayer/main/main.go
@@ -87,7 +87,7 @@ func main() {
logrus.Info("Connecting to KMS ", config.KMSAddr)
var newPeerConn *grpc.ClientConn
for i := 0; i < connectionRetries; i++ {
- newPeerConn, err = grpc.Dial(config.KMSAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+ newPeerConn, err = grpc.NewClient(config.KMSAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err == nil {
logrus.Info("Connected to KMS")
break
--
GitLab