Use Object for configTemplate

Signed-off-by: Tom Bentley <[email protected]>

Author: tombentley

kroxylicious-operator/pom.xml

@@ -357,7 +357,9 @@
                         <io.kroxylicious.kubernetes.api.v1alpha1.kafkaproxystatus.clusters.Conditions>
                             io.kroxylicious.kubernetes.api.common.Condition
                         </io.kroxylicious.kubernetes.api.v1alpha1.kafkaproxystatus.clusters.Conditions>
-
+                        <io.kroxylicious.kubernetes.filter.api.v1alpha1.kafkaprotocolfilterspec.ConfigTemplate>
+                            java.lang.Object
+                        </io.kroxylicious.kubernetes.filter.api.v1alpha1.kafkaprotocolfilterspec.ConfigTemplate>
                     </existingJavaTypes>
                     <packageOverrides>
                         <!-- the default package name ($apiGroup.$apiVersion) doesn't work for us -->

kroxylicious-operator/src/main/java/io/kroxylicious/kubernetes/operator/ProxyConfigConfigMap.java

@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,7 +34,6 @@
 import io.kroxylicious.kubernetes.api.v1alpha1.KafkaService;
 import io.kroxylicious.kubernetes.api.v1alpha1.VirtualKafkaCluster;
 import io.kroxylicious.kubernetes.filter.api.v1alpha1.KafkaProtocolFilterSpec;
-import io.kroxylicious.kubernetes.filter.api.v1alpha1.kafkaprotocolfilterspec.ConfigTemplate;
 import io.kroxylicious.kubernetes.operator.model.ProxyModel;
 import io.kroxylicious.kubernetes.operator.model.ProxyModelBuilder;
 import io.kroxylicious.kubernetes.operator.model.ingress.ProxyIngressModel;
@@ -49,11 +47,11 @@
 import io.kroxylicious.proxy.config.admin.ManagementConfiguration;
 import io.kroxylicious.proxy.config.admin.PrometheusMetricsConfig;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import static io.kroxylicious.kubernetes.operator.Labels.standardLabels;
 import static io.kroxylicious.kubernetes.operator.ResourcesUtil.namespace;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 /**
  * Generates a Kube {@code ConfigMap} containing the proxy config YAML.
  */
@@ -229,12 +227,9 @@ private static <T> void putOrMerged(ManagedWorkflowAndDependentResourceContext c
 
     private SecureConfigInterpolator.InterpolationResult interpolateConfig(KafkaProtocolFilterSpec spec) {
         SecureConfigInterpolator.InterpolationResult result;
-        ConfigTemplate configTemplate = spec.getConfigTemplate();
+        Object configTemplate = spec.getConfigTemplate();
         if (configTemplate != null) {
-            // Nasty nasty hack. Revisit
-            final TreeMap<String, Object> configProperties = new TreeMap<>(Comparator.nullsFirst(Comparator.naturalOrder()));
-            configProperties.putAll(configTemplate.getAdditionalProperties());
-            result = secureConfigInterpolator.interpolate(configProperties);
+            result = secureConfigInterpolator.interpolate(configTemplate);
         }
         else {
             throw new IllegalArgumentException("ConfigTemplate is not found in KafkaProtocolFilterSpec");

kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/DerivedResourcesTest.java

@@ -50,15 +50,15 @@
 import io.kroxylicious.kubernetes.filter.api.v1alpha1.KafkaProtocolFilter;
 import io.kroxylicious.kubernetes.operator.config.RuntimeDecl;
 
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 import static io.kroxylicious.kubernetes.operator.ProxyDeployment.KROXYLICIOUS_IMAGE_ENV_VAR;
 import static io.kroxylicious.kubernetes.operator.ResourcesUtil.name;
 import static io.kroxylicious.kubernetes.operator.ResourcesUtil.namespace;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
-
 class DerivedResourcesTest {
 
     static final YAMLMapper YAML_MAPPER = new YAMLMapper()

kroxylicious-operator/src/test/java/io/kroxylicious/kubernetes/operator/SecureConfigInterpolatorTest.java

@@ -18,8 +18,6 @@
 import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
 
-import io.kroxylicious.kubernetes.filter.api.v1alpha1.kafkaprotocolfilterspec.ConfigTemplate;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -70,33 +68,6 @@ void shouldInterpolateInAnObject() throws JsonProcessingException {
         Map<String, SecureConfigProvider> secret = Map.of("secret", MountedResourceConfigProvider.SECRET_PROVIDER);
         var i = new SecureConfigInterpolator("/base", secret);
 
-        var jsonValue = YAML_MAPPER.readValue("""
-                filterOneConfig: true
-                password: "${secret:my-secret:filter-one}"
-                """, ConfigTemplate.class);
-
-        // when
-        var result = i.interpolate(jsonValue);
-
-        // then
-        assertThat(result.volumes()).singleElement().extracting(Volume::getName).isEqualTo("secrets-my-secret");
-        assertThat(result.volumes()).singleElement().extracting(Volume::getSecret).extracting(SecretVolumeSource::getSecretName).isEqualTo("my-secret");
-
-        assertThat(result.mounts()).singleElement().extracting(VolumeMount::getName).isEqualTo("secrets-filter-one");
-        assertThat(result.mounts()).singleElement().extracting(VolumeMount::getMountPath).isEqualTo("/base/secret/filter-one");
-
-        assertThat(YAML_MAPPER.writeValueAsString(result.config())).isEqualTo("""
-                filterOneConfig: true
-                password: /base/secret/my-secret/filter-one
-                """);
-    }
-
-    @Test
-    void shouldInterpolateInnMap() throws JsonProcessingException {
-        // given
-        Map<String, SecureConfigProvider> secret = Map.of("secret", MountedResourceConfigProvider.SECRET_PROVIDER);
-        var i = new SecureConfigInterpolator("/base", secret);
-
         var jsonValue = YAML_MAPPER.readValue("""
                 kms: AwsKms
                 object: