Fix serialization of secret template (#10)

* Fixed issues where crud operations on secured variables would not work

* [feature] Flyway initializer removed from spring autoconfigure

* Fixed secret template serializer

* Fixed secret template serializer

Author: ilchudov

src/main/java/org/qubership/integration/platform/variables/management/service/SecretService.java

@@ -98,10 +98,6 @@ public String getSecretTemplate(String secretName) {
                 throw new SecuredVariablesNotFoundException(SECRET_NOT_FOUND_ERROR_MESSAGE_FORMAT.formatted(secretName));
             }
 
-            if (foundSecret.getData() == null) {
-                throw new SecuredVariablesNotFoundException("Secured variables not found");
-            }
-
             return yamlMapper.writeValueAsString(foundSecret);
         } catch (JsonProcessingException e) {
             throw new SecuredVariablesException("Failed to get secret helm chart", e);

src/main/java/org/qubership/integration/platform/variables/management/service/serializer/KubeSecretSerializer.java

@@ -17,36 +17,30 @@
 package org.qubership.integration.platform.variables.management.service.serializer;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import org.qubership.integration.platform.variables.management.rest.exception.SecuredVariablesException;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Secret;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
 @Component
 public class KubeSecretSerializer extends StdSerializer<V1Secret> {
 
-    private final ObjectMapper objectMapper;
+    private static final String TEST_VARIABLE_KEY = "test";
 
-    @Autowired
-    public KubeSecretSerializer(@Qualifier("primaryObjectMapper") ObjectMapper objectMapper) {
-        this(null, objectMapper);
+    public KubeSecretSerializer() {
+        this(null);
     }
 
-    public KubeSecretSerializer(Class<V1Secret> t, @Qualifier("primaryObjectMapper") ObjectMapper objectMapper) {
+    public KubeSecretSerializer(Class<V1Secret> t) {
         super(t);
-        this.objectMapper = objectMapper;
     }
 
     @Override
@@ -75,33 +69,23 @@ public void serialize(V1Secret secret, JsonGenerator jsonGenerator, SerializerPr
             }
             jsonGenerator.writeEndObject();
         }
-        if (secret.getData() != null) {
-            writeSecuredVariablesData(jsonGenerator, secret.getData());
-        }
+        writeSecuredVariablesData(jsonGenerator, secret.getData());
 
         jsonGenerator.writeEndObject();
     }
 
     private void writeSecuredVariablesData(JsonGenerator jsonGenerator, Map<String, byte[]> data) throws IOException {
         if (MapUtils.isEmpty(data)) {
-            return;
+            data = new HashMap<>();
+            data.put(TEST_VARIABLE_KEY, new byte[0]);
         }
 
         jsonGenerator.writeFieldName(V1Secret.SERIALIZED_NAME_STRING_DATA);
         jsonGenerator.writeStartObject();
 
-        for (Map.Entry<String, byte[]> dataEntry : data.entrySet()) {
-            String serializedVariables;
-            try {
-                Map<String, String> variables = objectMapper.readValue(new String(dataEntry.getValue()), new TypeReference<>() {});
-                variables.replaceAll((key, value) -> composeHelmChartExpressionFromKey(key));
-                serializedVariables = objectMapper.writeValueAsString(variables);
-            } catch (IOException e) {
-                log.error("Can't deserialize secured variables for tenant: {}", dataEntry.getKey(), e);
-                throw new SecuredVariablesException("Can't deserialize secured variables for tenant: " + dataEntry.getKey(), e);
-            }
-
-            jsonGenerator.writeString(serializedVariables);
+        for (String variableKey : data.keySet()) {
+            jsonGenerator.writeFieldName(variableKey);
+            jsonGenerator.writeString(composeHelmChartExpressionFromKey(variableKey));
         }
         jsonGenerator.writeEndObject();
     }