From a40c2851c6e7f5d35664290a236f48c280c5d352 Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Tue, 23 Jan 2024 14:38:31 +0000
Subject: [PATCH] more stuff
---
ekms/internal/kms/kms.go | 2 +-
ekms/internal/kms/kmsetsi.go | 12 +++++++-----
ekms/internal/kms/util.go | 8 ++++----
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ekms/internal/kms/kms.go b/ekms/internal/kms/kms.go
index 4aaa8041..5da899cf 100644
--- a/ekms/internal/kms/kms.go
+++ b/ekms/internal/kms/kms.go
@@ -167,7 +167,7 @@ func (kms *EKMS) AddPeer(peerKmsId string, kmsPeerSocket string, servingQLE Quan
func (kms *EKMS) AssignForwardingRoute(pId, pHop, nHop string) error {
pathId, err := uuid.Parse(pId)
if err != nil {
- return fmt.Errorf("The given path id %s is no uuid; err = ", pathId, err)
+ return fmt.Errorf("The given path id %s is no uuid; err = %w", pathId, err)
}
var previousHop *kmsPeer
diff --git a/ekms/internal/kms/kmsetsi.go b/ekms/internal/kms/kmsetsi.go
index 1b552709..6fe86583 100644
--- a/ekms/internal/kms/kmsetsi.go
+++ b/ekms/internal/kms/kmsetsi.go
@@ -2,7 +2,6 @@ package kms
import (
"context"
- "errors"
"flag"
"fmt"
"net"
@@ -57,16 +56,19 @@ func (es *etsiServer) ETSIAddKMSPeer(ctx context.Context, in *pb.ETSIKMSPeerRequ
// Check first if KmsLocalQLEId is actually one of ours...
qleID := uuid.MustParse(in.KmsLocalQLEId)
- servingQLE, _ := es.handlingEkms.quantumModules[""]
+ servingQLE := es.handlingEkms.quantumModules[""]
if servingQLE == nil {
// no such element!
- err := errors.New(fmt.Sprintf("Unknown local quantum element with ID %d", qleID))
+ err := fmt.Errorf("Unknown local quantum element with ID %d", qleID)
return &pb.ETSIKMSPeerReply{}, err
}
// TODO: remove hardcoded id
- es.handlingEkms.AddPeer("default", in.GetKmsPeerSocket(), servingQLE)
+ _, err := es.handlingEkms.AddPeer("default", in.GetKmsPeerSocket(), servingQLE)
+ if err != nil {
+ return nil, err
+ }
return &pb.ETSIKMSPeerReply{
KmsPeerName: es.handlingEkms.kmsName,
@@ -101,7 +103,7 @@ func (es *etsiServer) ETSIGetPeerList(ctx context.Context, in *pb.ETSIKMSPeerLis
func (es *etsiServer) ETSIAssignForwarding(ctx context.Context, in *pb.ETSIAssignForwardingRequest) (*pb.ETSIAssignForwardingReply, error) {
pathId, err := uuid.Parse(in.GetPathId())
if err != nil {
- return nil, status.Errorf(codes.InvalidArgument, "The given path id %s is no uuid; err = ", in.GetPathId(), err)
+ return nil, status.Errorf(codes.InvalidArgument, "The given path id %s is no uuid; err = %s", in.GetPathId(), err)
}
var previousHop *kmsPeer
diff --git a/ekms/internal/kms/util.go b/ekms/internal/kms/util.go
index 52671acb..23e75506 100644
--- a/ekms/internal/kms/util.go
+++ b/ekms/internal/kms/util.go
@@ -10,7 +10,7 @@ import (
"github.com/google/uuid"
)
-func randomItemFromMap[T comparable, M any](m map[T]M) (M, error) {
+func RandomItemFromMap[T comparable, M any](m map[T]M) (M, error) {
for _, item := range m {
return item, nil
}
@@ -19,14 +19,14 @@ func randomItemFromMap[T comparable, M any](m map[T]M) (M, error) {
return r, fmt.Errorf("Could not return a random item from map %v", m)
}
-func randomItemFromMapAndRemove[T comparable, M any](m map[T]M) (M, error) {
+func RandomItemFromMapAndRemove[T comparable, M any](m map[T]M) (M, error) {
for key, item := range m {
delete(m, key)
return item, nil
}
var r M
- return r, fmt.Errorf("Could not return a random item from map %v and delete it.", m)
+ return r, fmt.Errorf("Could not return a random item from map %v and delete it", m)
}
func keysOfMap[T comparable, M any](m map[T]M) []T {
@@ -59,7 +59,7 @@ func addETSIKeysToKeystore(keyStore *kmsKeyStore, keyContainer []etsi14.KeyConta
}
// NOTE: For demo purpose only.
-func sendKmsInfoMessage(url string, json []byte) error {
+func SendKmsInfoMessage(url string, json []byte) error {
request, err := http.NewRequest("POST", url, bytes.NewBuffer(json))
if err != nil {
return err
--
GitLab