fix: k8s:resource replaces template variables in provided fragments, …

…k8s:helm doesn't.

- Moved logic from ResourceMojo to separate service
- Fixed Resource generation, template placeholders are replaced only in aggregated YAML file (kubernetes.yml)
  not in individual resource files.
- Placeholder/variable replacement can be turned off (jkube.interpolateTemplateParameters)
- Fixed Helm chart generation, template placeholders are NOT replaced.
  Provided support for Parameters with no default value (values.yml) will only contain those which have a default.
  The rest of parameters can be specified with `--set` option
- Added integration test to verify behavior for resource and helm YAML generation.

Signed-off-by: Marc Nuri <[email protected]>

WIP fix: k8s:resource replaces template variables in provided fragments, k8s:helm doesn't.

- Moved logic from ResourceMojo to separate service
- Fixed Resource generation, template placeholders are replaced only in aggregated YAML file (kubernetes.yml)
  not in individual resource files.
- Placeholder/variable replacement can be turned off (jkube.interpolateTemplateParameters)
- Fixed Helm chart generation, template placeholders are NOT replaced.
  Provided support for Parameters with no default value (values.yml) will only contain those which have a default.
  The rest of parameters can be specified with `--set` option
- Added integration test to verify behavior for resource and helm YAML generation.

Signed-off-by: Marc Nuri <[email protected]>

CHANGELOG.md

@@ -27,6 +27,8 @@ Usage:
 * Fix #384: Enricher defined Container environment variables get merged with vars defined in Image Build Configuration
 * Fix #385: WildFly Bootable JAR - Add native support for slim Bootable JAR
 * Fix #415: Fixed resource validation for new json-schema-validator version
+* Fix #356: Add further support for tls termination and insecureEdgeTerminationPolicy in pom.xml
+* Fix #327: k8s:resource replaces template variables in provided fragments, k8s:helm doesn't.
 
 ### 1.0.0 (2020-09-09)
 * Fix #351: Fix AutoTLSEnricher - add annotation + volume config to resource
@@ -47,7 +49,6 @@ Usage:
 * Fix #362: Quarkus supports S2I builds both for JVM and native mode
 * Fix #297: Added missing documentation for WatchMojo configuration parameters
 * Fix #371: WebAppGenerator path configuration is no longer ignored
-* Fix #356: Add further support for tls termination and insecureEdgeTerminationPolicy in pom.xml
 
 ### 1.0.0-rc-1 (2020-07-23)
 * Fix #252: Replace Quarkus Native Base image with ubi-minimal (same as in `Dockerfile.native`)

jkube-kit/build/service/docker/src/main/java/org/eclipse/jkube/kit/build/service/docker/helper/Task.java

@@ -16,6 +16,7 @@
 /**
  * Represents a generic task to be executed on a object.
  */
+@FunctionalInterface
 public interface Task<T> {
 
     void execute(T object) throws Exception;

jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/EnricherManager.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2019 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at:
+ *
+ *     https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.jkube.kit.config.service;
+
+import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
+import org.eclipse.jkube.kit.config.resource.PlatformMode;
+import org.eclipse.jkube.kit.config.resource.ProcessorConfig;
+
+public interface EnricherManager {
+
+  void createDefaultResources(PlatformMode platformMode, final KubernetesListBuilder builder);
+  void createDefaultResources(PlatformMode platformMode, ProcessorConfig enricherConfig, final KubernetesListBuilder builder);
+
+  void enrich(PlatformMode platformMode, final KubernetesListBuilder builder);
+  void enrich(PlatformMode platformMode, final ProcessorConfig enricherConfig, final KubernetesListBuilder builder);
+
+}

jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/JKubeServiceHub.java

@@ -62,20 +62,24 @@ public class JKubeServiceHub implements Closeable {
     private KubernetesClient client;
     private LazyBuilder<ArtifactResolverService> artifactResolverService;
     private LazyBuilder<BuildService> buildService;
+    private LazyBuilder<ResourceService> resourceService;
     private LazyBuilder<ApplyService> applyService;
     private LazyBuilder<UndeployService> undeployService;
     private LazyBuilder<MigrateService> migrateService;
 
     @Builder
     public JKubeServiceHub(
             ClusterAccess clusterAccess, RuntimeMode platformMode, KitLogger log,
-            ServiceHub dockerServiceHub, JKubeConfiguration configuration, BuildServiceConfig buildServiceConfig) {
+            ServiceHub dockerServiceHub, JKubeConfiguration configuration,
+            BuildServiceConfig buildServiceConfig,
+            LazyBuilder<ResourceService> resourceService) {
         this.clusterAccess = clusterAccess;
         this.platformMode = platformMode;
         this.log = log;
         this.dockerServiceHub = dockerServiceHub;
         this.configuration = configuration;
         this.buildServiceConfig = buildServiceConfig;
+        this.resourceService = resourceService;
         init();
     }
 
@@ -136,6 +140,10 @@ public BuildService getBuildService() {
         return buildService.get();
     }
 
+    public ResourceService getResourceService() {
+        return resourceService.get();
+    }
+
     public ApplyService getApplyService() {
         return applyService.get();
     }

jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ResourceService.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2019 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at:
+ *
+ *     https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.jkube.kit.config.service;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.jkube.kit.common.KitLogger;
+import org.eclipse.jkube.kit.common.util.ResourceClassifier;
+import org.eclipse.jkube.kit.config.resource.PlatformMode;
+
+import io.fabric8.kubernetes.api.model.KubernetesList;
+
+public interface ResourceService {
+
+  KubernetesList generateResources(PlatformMode platformMode, EnricherManager enricherManager, KitLogger log)
+      throws IOException;
+
+  File writeResources(KubernetesList resources, ResourceClassifier classifier, KitLogger log) throws IOException;
+
+  @FunctionalInterface
+  interface ResourceFileProcessor {
+
+    File[] processResources(File[] resources) throws IOException;
+  }
+}

jkube-kit/config/service/src/main/java/org/eclipse/jkube/kit/config/service/ResourceServiceConfig.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2019 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at:
+ *
+ *     https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.jkube.kit.config.service;
+
+import java.io.File;
+
+import org.eclipse.jkube.kit.common.JavaProject;
+import org.eclipse.jkube.kit.common.ResourceFileType;
+import org.eclipse.jkube.kit.config.resource.ResourceConfig;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * Class to hold configuration parameters for the Resource service.
+ */
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@EqualsAndHashCode
+public class ResourceServiceConfig {
+
+  private JavaProject project;
+  private File resourceDir;
+  private File targetDir;
+  private ResourceFileType resourceFileType;
+  private ResourceConfig resourceConfig;
+  private ResourceService.ResourceFileProcessor resourceFilesProcessor;
+  private boolean interpolateTemplateParameters;
+
+}

jkube-kit/parent/pom.xml

@@ -219,13 +219,25 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.eclipse.jkube</groupId>
+        <artifactId>jkube-kit-resource-service</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.eclipse.jkube</groupId>
         <artifactId>jkube-kit-resource-helm</artifactId>
         <version>${project.version}</version>
       </dependency>
 
-      <!-- == jkube ===================================== -->
+      <dependency>
+        <groupId>org.eclipse.jkube</groupId>
+        <artifactId>jkube-kit-profiles</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <!-- == Fabric8 Kubernetes Client ===================================== -->
       <dependency>
         <groupId>io.fabric8</groupId>
         <artifactId>kubernetes-client</artifactId>

jkube-kit/pom.xml

@@ -51,6 +51,7 @@
       <module>enricher/generic</module>
       <module>enricher/specific</module>
       <module>profile</module>
+      <module>resource/service</module>
       <module>resource/helm</module>
       <module>watcher/api</module>
       <module>watcher/standard</module>

jkube-kit/resource/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmService.java

@@ -201,8 +201,9 @@ private static void createTemplateParameters(HelmConfig helmConfig, File outputD
         .orElse(Collections.emptyList()).stream()
         .map(Template::getParameters).flatMap(List::stream)
         .map(HelmParameter::new).collect(Collectors.toList());
-    final Map<String, String> values = helmParameters.stream().collect(Collectors.toMap(
-        HelmParameter::getHelmName, hp -> hp.getParameter().getValue()));
+    final Map<String, String> values = helmParameters.stream()
+        .filter(hp -> hp.getParameter().getValue() != null)
+        .collect(Collectors.toMap(HelmParameter::getHelmName, hp -> hp.getParameter().getValue()));
 
     File outputChartFile = new File(outputDir, VALUES_FILENAME);
     ResourceUtil.save(outputChartFile, values, ResourceFileType.yaml);

jkube-kit/resource/service/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2019 Red Hat, Inc.
+    This program and the accompanying materials are made
+    available under the terms of the Eclipse Public License 2.0
+    which is available at:
+
+        https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
+
+    Contributors:
+      Red Hat, Inc. - initial API and implementation
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.jkube</groupId>
+    <artifactId>jkube-kit-parent</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
+    <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>jkube-kit-resource-service</artifactId>
+
+  <name>JKube Kit :: Resource :: Service</name>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.eclipse.jkube</groupId>
+      <artifactId>jkube-kit-enricher-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jkube</groupId>
+      <artifactId>jkube-kit-profiles</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jmockit</groupId>
+      <artifactId>jmockit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+    </dependency>
+  </dependencies>
+</project>