feat(agent): allow to specify stack versions over grpc

formancehq · Dec 18, 2023 · d7423ab · d7423ab
1 parent 2780091
commit d7423ab
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 77 deletions.
diff --git a/ee/agent/internal/grpc/client.go b/ee/agent/internal/grpc/client.go
@@ -167,14 +167,16 @@ func (client *client) createStack(stack *generated.Stack) *v1beta3.Stack {
 	}
 }
 
-func (client *client) mergeStack(currentStack *v1beta3.Stack, createStack *v1beta3.Stack) *v1beta3.Stack {
-	createStack.SetResourceVersion(currentStack.GetResourceVersion())
-	createStack.Spec.Services = currentStack.Spec.Services
-	createStack.Spec.Seed = currentStack.Spec.Seed
-	createStack.Spec.Versions = currentStack.Spec.Versions
-	createStack.Spec.DevProperties.Debug = currentStack.Spec.DevProperties.Debug
-	createStack.Spec.DevProperties.Dev = currentStack.Spec.DevProperties.Dev
-	return createStack
+func (client *client) mergeStack(currentStack *v1beta3.Stack, into *v1beta3.Stack) *v1beta3.Stack {
+	into.SetResourceVersion(currentStack.GetResourceVersion())
+	into.Spec.Services = currentStack.Spec.Services
+	into.Spec.Seed = currentStack.Spec.Seed
+	into.Spec.DevProperties.Debug = currentStack.Spec.DevProperties.Debug
+	into.Spec.DevProperties.Dev = currentStack.Spec.DevProperties.Dev
+	if into.Spec.Versions == "" {
+		into.Spec.Versions = currentStack.Spec.Versions
+	}
+	return into
 }
 
 func (client *client) Start(ctx context.Context) error {

diff --git a/ee/agent/internal/grpc/generated/server.pb.go b/ee/agent/internal/grpc/generated/server.pb.go
diff --git a/ee/agent/server.proto b/ee/agent/server.proto
@@ -53,6 +53,7 @@ message Stack {
   StargateConfig stargateConfig = 5;
   bool disabled = 6;
   google.protobuf.Timestamp deletedAt = 7;
+  string versions = 8;
 }
 
 enum StackStatus {