From d0c7a70ba2bee7315dc0779bfe5801b842762f96 Mon Sep 17 00:00:00 2001 From: DashLHall <153118685+DashLHall@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:22:53 -0400 Subject: [PATCH] new fixes --- api/agent/spire_apis.go | 2 ++ api/agent/tornjak_apis.go | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/api/agent/spire_apis.go b/api/agent/spire_apis.go index fc84e8be..4ad75a97 100644 --- a/api/agent/spire_apis.go +++ b/api/agent/spire_apis.go @@ -4,6 +4,8 @@ import ( "context" "errors" + "github.com/google/uuid" + grpc "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/api/agent/tornjak_apis.go b/api/agent/tornjak_apis.go index 16392ec8..68a114cc 100644 --- a/api/agent/tornjak_apis.go +++ b/api/agent/tornjak_apis.go @@ -92,8 +92,8 @@ func (s *Server) DefineCluster(inp RegisterClusterRequest) error { return errors.New("cluster definition missing mandatory field - Name") } else if len(cinfo.PlatformType) == 0 { return errors.New("cluster definition missing mandatory field - PlatformType") - } else if len(cinfo.EditedName) > 0 { - return errors.New("cluster definition attempts renaming on create cluster - EditedName") + } else if len(cinfo.EditedUid) > 0 { + return errors.New("cluster definition attempts renaming on create cluster - EditedUid") } return s.Db.CreateClusterEntry(cinfo) } @@ -103,12 +103,12 @@ type EditClusterRequest tornjakTypes.ClusterInput // EditCluster registers cluster to local DB func (s *Server) EditCluster(inp EditClusterRequest) error { cinfo := tornjakTypes.ClusterInfo(inp.ClusterInstance) - if len(cinfo.Name) == 0 { + if len(cinfo.Uid) == 0 { return errors.New("cluster definition missing mandatory field - Name") } else if len(cinfo.PlatformType) == 0 { return errors.New("cluster definition missing mandatory field - PlatformType") - } else if len(cinfo.EditedName) == 0 { - return errors.New("cluster definition missing mandatory field - EditedName") + } else if len(cinfo.EditedUid) == 0 { + return errors.New("cluster definition missing mandatory field - EditedUid") } return s.Db.EditClusterEntry(cinfo) }