refactor(pkg/kilt): move the container serialization to a dedicated function

Signed-off-by: francesco-racciatti <francesco.racciatti@sysdig.com>

Author: francesco-racciatti

pkg/kilt/hocon.go

@@ -31,48 +31,59 @@ func NewKiltHocon(definition string, recipeConfig string, sidecarConfig interfac
 	}
 }
 
-func (k *KiltHocon) prepareFullStringConfig(container *gabs.Container, groupName string) (*configuration.Config, error) {
-	rawVars := ""
+func serializeContainerConfiguration(container *gabs.Container, groupName string) (string, error) {
+	var serialized string
+	var jsonDoc []byte
+	var err error
 
-	jsonDoc, err := json.Marshal(container.S("Image"))
+	jsonDoc, err = json.Marshal(container.S("Image"))
 	if err != nil {
-		return nil, fmt.Errorf("could not serialize container image: %w", err)
+		return "", fmt.Errorf("could not serialize container image: %w", err)
 	}
-	rawVars += "original.image:" + string(jsonDoc) + "\n"
+	serialized += "original.image:" + string(jsonDoc) + "\n"
 
 	jsonDoc, err = json.Marshal(container.S("Name"))
 	if err != nil {
-		return nil, fmt.Errorf("could not serialize container name: %w", err)
+		return "", fmt.Errorf("could not serialize container name: %w", err)
 	}
-	rawVars += "original.container_name:" + string(jsonDoc) + "\n"
+	serialized += "original.container_name:" + string(jsonDoc) + "\n"
 
 	jsonDoc, err = json.Marshal(groupName)
 	if err != nil {
-		return nil, fmt.Errorf("could not serialize container group name: %w", err)
+		return "", fmt.Errorf("could not serialize container group name: %w", err)
 	}
-	rawVars += "original.container_group_name:" + string(jsonDoc) + "\n"
+	serialized += "original.container_group_name:" + string(jsonDoc) + "\n"
 
 	jsonDoc, err = json.Marshal(container.S("EntryPoint"))
 	if err != nil {
-		return nil, fmt.Errorf("could not serialize container entry point: %w", err)
+		return "", fmt.Errorf("could not serialize container entry point: %w", err)
 	}
-	rawVars += "original.entry_point:" + string(jsonDoc) + "\n"
+	serialized += "original.entry_point:" + string(jsonDoc) + "\n"
 
 	jsonDoc, err = json.Marshal(container.S("Command"))
 	if err != nil {
-		return nil, fmt.Errorf("could not serialize container command: %w", err)
+		return "", fmt.Errorf("could not serialize container command: %w", err)
 	}
-	rawVars += "original.command:" + string(jsonDoc) + "\n"
+	serialized += "original.command:" + string(jsonDoc) + "\n"
 
 	rawEnvMap := make(map[string]interface{})
 	for _, env := range container.S("Environment").Children() {
 		rawEnvMap[env.S("Name").Data().(string)] = env.S("Value")
 	}
 	jsonDoc, err = json.Marshal(rawEnvMap)
 	if err != nil {
-		return nil, fmt.Errorf("could not serialize container environment variables: %w", err)
+		return "", fmt.Errorf("could not serialize container environment variables: %w", err)
+	}
+	serialized += "original.environment_variables:" + string(jsonDoc) + "\n"
+
+	return serialized, nil
+}
+
+func (k *KiltHocon) prepareFullStringConfig(container *gabs.Container, groupName string) (*configuration.Config, error) {
+	containerConfig, err := serializeContainerConfiguration(container, groupName)
+	if err != nil {
+		return nil, err
 	}
-	rawVars += "original.environment_variables:" + string(jsonDoc) + "\n"
 
 	sidecarConfig := []byte("{}")
 	if k.sidecarConfig != nil {
@@ -82,7 +93,8 @@ func (k *KiltHocon) prepareFullStringConfig(container *gabs.Container, groupName
 		}
 	}
 
-	configString := string(rawVars) + "\n" +
+	configString :=
+		containerConfig + "\n" +
 		"config:" + k.recipeConfig + "\n" +
 		"sidecar_config:" + string(sidecarConfig) + "\n" +
 		defaults + "\n" +

pkg/kilt/hocon_test.go

@@ -87,3 +87,37 @@ func TestEnvironmentVariables(t *testing.T) {
 	container := containers.S("0")
 	assert.Equal(t, "true", *getEnvByName(container, "PREEXISTING"))
 }
+
+func Test_serializeContainerConfiguration(t *testing.T) {
+	containerJson := `{
+		"Image": "busybox:latest",
+		"Name": "busybox",
+		"EntryPoint": ["/bin/sh"],
+		"Command": ["-c", "echo hello"],
+		"Environment": [
+			{"Name": "TEST", "Value": "true"}
+		]
+	}`
+
+	expected := `original.image:"busybox:latest"
+original.container_name:"busybox"
+original.container_group_name:"test-group"
+original.entry_point:["/bin/sh"]
+original.command:["-c","echo hello"]
+original.environment_variables:{"TEST":"true"}
+`
+
+	container, err := gabs.ParseJSON([]byte(containerJson))
+	if err != nil {
+		t.Fatalf("failed to parse JSON: %v", err)
+	}
+
+	groupName := "test-group"
+
+	serialized, err := serializeContainerConfiguration(container, groupName)
+	if err != nil {
+		t.Fatalf("failed to marshal container configuration: %v", err)
+	}
+
+	assert.Equal(t, expected, serialized)
+}