diff --git a/internal/go.mod b/internal/go.mod index 72b5dad0526be8e5c93812cd490c05003b30a98d..898522e7da98d27f0fecaf823c591d11d439c19f 100644 --- a/internal/go.mod +++ b/internal/go.mod @@ -1,14 +1,17 @@ -module code.fbi.h-da.de/m.stiemerling/proto-kms +module code.fbi.h-da.de/demoquandt/proto-kms go 1.20 require ( - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.0 + google.golang.org/grpc v1.56.1 + google.golang.org/protobuf v1.31.0 +) + +require ( github.com/golang/protobuf v1.5.3 // indirect golang.org/x/net v0.9.0 // indirect golang.org/x/sys v0.7.0 // indirect golang.org/x/text v0.9.0 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.1 // indirect - google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/internal/go.sum b/internal/go.sum index f276a4b6f2e9a4975c91899c66f48c253de926e6..c53bd580d4f739afe6cfa7a55af24f6bf5bfda6e 100644 --- a/internal/go.sum +++ b/internal/go.sum @@ -2,6 +2,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS 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.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= @@ -17,5 +18,5 @@ google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ= google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= 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.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/internal/kms/kms-keystore.go b/internal/kms/kms-keystore.go index db478e1da8b949a7a6c8d597dbd365e4d4fdb767..bdf7240a2a50788a0cfe6099dd843bdbe2a9f549 100644 --- a/internal/kms/kms-keystore.go +++ b/internal/kms/kms-keystore.go @@ -6,7 +6,7 @@ import ( "log" "sync" - "code.fbi.h-da.de/m.stiemerling/proto-kms/quantumlayer" + "code.fbi.h-da.de/demoquandt/proto-kms/quantumlayer" ) type kmsKS interface { diff --git a/internal/kms/kms.go b/internal/kms/kms.go index e07a446445a761fa33358c8b05c7694e439fd6bb..babd4151dc80a7eba262aafe0ad39563a7ea8a61 100644 --- a/internal/kms/kms.go +++ b/internal/kms/kms.go @@ -11,9 +11,9 @@ import ( "sync" "time" - pbETSI "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsetsiproto" - pbIC "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsintercomproto" - "code.fbi.h-da.de/m.stiemerling/proto-kms/quantumlayer" + pbETSI "code.fbi.h-da.de/demoquandt/proto-kms/kmsetsiproto" + pbIC "code.fbi.h-da.de/demoquandt/proto-kms/kmsintercomproto" + "code.fbi.h-da.de/demoquandt/proto-kms/quantumlayer" "github.com/google/uuid" ) diff --git a/internal/kms/kmsetsi.go b/internal/kms/kmsetsi.go index a9e6de6c1f50249eea3dd7255889a3276839b4d4..49ed304fc7e322dfbcf5574b7f41671692c1a07a 100644 --- a/internal/kms/kmsetsi.go +++ b/internal/kms/kmsetsi.go @@ -8,7 +8,7 @@ import ( "log" "net" - pb "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsetsiproto" + pb "code.fbi.h-da.de/demoquandt/proto-kms/kmsetsiproto" "google.golang.org/grpc" ) diff --git a/internal/kms/kmsintercom.go b/internal/kms/kmsintercom.go index 56444531e5b5267e5857e8864fb026cab62a538f..720db0ed990833693a2e92d3bc777861460ea721 100644 --- a/internal/kms/kmsintercom.go +++ b/internal/kms/kmsintercom.go @@ -7,7 +7,7 @@ import ( "log" "net" - pb "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsintercomproto" + pb "code.fbi.h-da.de/demoquandt/proto-kms/kmsintercomproto" "google.golang.org/grpc" ) diff --git a/internal/kms/kmspeers.go b/internal/kms/kmspeers.go index 9a37de516d344f343d1420a6193393e96f213963..d5a5fb8fb50e7913e1e13f1d6f2a4c3e7f42f1a8 100644 --- a/internal/kms/kmspeers.go +++ b/internal/kms/kmspeers.go @@ -6,7 +6,7 @@ import ( "net" "time" - pb "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsetsiproto" + pb "code.fbi.h-da.de/demoquandt/proto-kms/kmsetsiproto" "github.com/google/uuid" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" @@ -39,7 +39,7 @@ type kmsPeer struct { func NewKmsPeer(servQLE *QuantumElement, in chan string) (peer kmsPeer) { return kmsPeer{ - peerStatus: kmsPeerUnknown, + peerStatus: KmsPeerUnknown, servingQLE: servQLE, id: uuid.New(), externalNotifierKMSPeer: in, @@ -55,7 +55,7 @@ func (ph *kmsPeer) PeerHandler(kmsName string) { newPeerConn, err := grpc.Dial(ph.tcpSocketStr, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { log.Printf("did not connect: %v", err) - ph.peerStatus = kmsPeerDown + ph.peerStatus = KmsPeerDown return } defer newPeerConn.Close() diff --git a/internal/kmsetsiproto/kmsetsiproto.proto b/internal/kmsetsiproto/kmsetsiproto.proto index b91881b0ddd36c247277c76a7181bab07d6cdda4..9bcc1c939254397615c64daaac06f20d92468c25 100644 --- a/internal/kmsetsiproto/kmsetsiproto.proto +++ b/internal/kmsetsiproto/kmsetsiproto.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsetsiproto"; +option go_package = "code.fbi.h-da.de/demoquandt/proto-kms/kmsetsiproto"; package kmsetsiproto; diff --git a/internal/kmsintercomproto/kmsintercom.proto b/internal/kmsintercomproto/kmsintercom.proto index 9966a634c5e3a8f12c6620db1de6f26b89aa13de..ea62a309d7fe5bd796d3338659df43661127d71e 100644 --- a/internal/kmsintercomproto/kmsintercom.proto +++ b/internal/kmsintercomproto/kmsintercom.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "code.fbi.h-da.de/m.stiemerling/proto-kms/kmsintercomproto"; +option go_package = "code.fbi.h-da.de/demoquandt/proto-kms/kmsintercomproto"; package kmsintercomproto; diff --git a/internal/main_test.go b/internal/main_test.go index 33cdc52226a616a77e15cb4dc1f52db769b28f54..f59b529a086d90eb32c2b934ebc2f1b890ff3bbc 100644 --- a/internal/main_test.go +++ b/internal/main_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "code.fbi.h-da.de/m.stiemerling/proto-kms/kms" + "code.fbi.h-da.de/demoquandt/proto-kms/kms" "github.com/google/uuid" )