From d6095a23618a50b837ec730ed94b115cf6d43baa Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Thu, 2 May 2024 13:02:38 +0200
Subject: [PATCH] Try using ids

---
 api/v1/environments.go               | 14 ++++++++++++--
 internal/controllers/accounts.go     |  2 +-
 internal/controllers/environments.go |  6 ++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/api/v1/environments.go b/api/v1/environments.go
index 4a489e3..0093fdc 100644
--- a/api/v1/environments.go
+++ b/api/v1/environments.go
@@ -66,7 +66,10 @@ func (e *EnvironmentsServer) Create(ctx context.Context, in *proto.CreateOptions
 	}
 	return &proto.EnvironmentFull{
 		Metadata: in.GetMetadata(),
-		Spec:     in.GetSpec(),
+		Id: &proto.EnvironmentId{
+			Uuid: environment.Data.UUID,
+		},
+		Spec: in.GetSpec(),
 	}, nil
 }
 
@@ -93,6 +96,7 @@ func (e *EnvironmentsServer) Update(ctx context.Context, in *proto.UpdateOptions
 
 	data := &controllers.EnvironemntData{
 		Name:        in.GetMetadata().GetName(),
+		UUID:        in.GetId().GetUuid(),
 		Description: in.GetMetadata().GetDescription(),
 		Provider:    provider.GetProviderName(),
 		Kubernetes:  k8s.GetKubernetesName(),
@@ -113,6 +117,7 @@ func (e *EnvironmentsServer) Update(ctx context.Context, in *proto.UpdateOptions
 	}
 	return &proto.EnvironmentFull{
 		Metadata: in.GetMetadata(),
+		Id:       in.GetId(),
 		Spec:     in.GetSpec(),
 	}, nil
 
@@ -121,6 +126,7 @@ func (e *EnvironmentsServer) Update(ctx context.Context, in *proto.UpdateOptions
 func (e *EnvironmentsServer) Delete(ctx context.Context, in *proto.DeleteOptions) (*empty.Empty, error) {
 	data := &controllers.EnvironemntData{
 		Name: in.GetMetadata().GetName(),
+		UUID: in.GetId().GetUuid(),
 	}
 
 	environment := &controllers.Environemnt{
@@ -138,7 +144,7 @@ func (e *EnvironmentsServer) Delete(ctx context.Context, in *proto.DeleteOptions
 
 func (e *EnvironmentsServer) Get(ctx context.Context, in *proto.GetOptions) (*proto.EnvironmentFull, error) {
 	data := &controllers.EnvironemntData{
-		Name: in.GetMetadata().GetName(),
+		UUID: in.GetId().GetUuid(),
 	}
 
 	environment := &controllers.Environemnt{
@@ -169,6 +175,7 @@ func (e *EnvironmentsServer) Get(ctx context.Context, in *proto.GetOptions) (*pr
 			ServerLocation: proto.Location(proto.Location_value[provider.RawServerLocation(environment.Data.Location)]),
 			ServerType:     proto.ServerType(proto.ServerType_value[provider.RawServerType(environment.Data.ServerType)]),
 		},
+		Id: in.GetId(),
 		Metadata: &proto.EnvironmentMetadata{
 			Name:        environment.Data.Name,
 			Description: environment.Data.Description,
@@ -204,6 +211,9 @@ func (e *EnvironmentsServer) List(in *proto.ListOptions, stream proto.Environmen
 				Name:        env.Data.Name,
 				Description: env.Data.Description,
 			},
+			Id: &proto.EnvironmentId{
+				Uuid: env.Data.UUID,
+			},
 			Spec: &proto.EnvironmentSpec{
 				Provider:       proto.Provider(proto.Provider_value[provider.RawProviderName()]),
 				Kubernetes:     proto.Kubernetes(proto.Kubernetes_value[k8s.RawKubernetesName()]),
diff --git a/internal/controllers/accounts.go b/internal/controllers/accounts.go
index e8c40ac..145cb53 100644
--- a/internal/controllers/accounts.go
+++ b/internal/controllers/accounts.go
@@ -120,7 +120,7 @@ func (acc *Account) Create(ctx context.Context) error {
 			Namespace: acc.Data.UUID,
 		},
 		Subjects: []rbacv1.Subject{
-			rbacv1.Subject{
+			{
 				Kind:      "ServiceAccount",
 				Name:      acc.Data.UUID,
 				Namespace: acc.Data.UUID,
diff --git a/internal/controllers/environments.go b/internal/controllers/environments.go
index 403e870..33e31e7 100644
--- a/internal/controllers/environments.go
+++ b/internal/controllers/environments.go
@@ -40,13 +40,11 @@ func (e *EnvironemntData) buildVars() (string, error) {
 SP_PROVIDER=%s
 SP_KUBERNETES=%s
 SP_SERVER_TYPE=%s
-SP_SERVER_LOCATION=%s
-SP_DESCRIPTION=%s`,
+SP_SERVER_LOCATION=%s`,
 		e.Provider,
 		e.Kubernetes,
 		e.ServerType,
 		e.Location,
-		e.Description,
 	)
 
 	return vars, nil
@@ -281,7 +279,7 @@ func (env *Environemnt) Get(ctx context.Context) error {
 		env.Data.Name = ""
 	}
 
-	if val, ok := res["SP_DESCRIPTION"]; ok {
+	if val, ok := envData.Data["description"]; ok {
 		env.Data.Description = val
 	} else {
 		env.Data.Description = ""