Add abstract class for helm task

gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/task/AbstractHelmTask.java

@@ -0,0 +1,44 @@
+/*
+ * 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.gradle.plugin.task;
+
+import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
+
+import java.io.IOException;
+
+import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmConfig;
+
+public abstract class AbstractHelmTask extends AbstractJKubeTask {
+
+  protected AbstractHelmTask(Class<? extends KubernetesExtension> extensionClass) {
+    super(extensionClass);
+  }
+
+  @Override
+  protected void init() {
+    super.init();
+
+    try {
+      kubernetesExtension.helm = initHelmConfig(
+        kubernetesExtension.getDefaultHelmType(),
+        kubernetesExtension.javaProject,
+        kubernetesExtension.getKubernetesTemplateOrDefault(),
+        kubernetesExtension.helm
+      ).build();
+    } catch (IOException e) {
+      throw new IllegalStateException(e.getMessage(), e);
+    }
+  }
+
+}

gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/task/AbstractJKubeTask.java

@@ -77,7 +77,7 @@ public final void runTask() {
     run();
   }
 
-  private void init() {
+  protected void init() {
     kubernetesExtension.javaProject = GradleUtil.convertGradleProject(getProject());
     kitLogger = createLogger(null);
     clusterAccess = new ClusterAccess(initClusterConfiguration());

gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmDependencyUpdateTask.java

@@ -18,29 +18,22 @@
 
 import javax.inject.Inject;
 
-import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmConfig;
 
-public class KubernetesHelmDependencyUpdateTask extends AbstractJKubeTask {
-    @Inject
-    public KubernetesHelmDependencyUpdateTask(Class<? extends KubernetesExtension> extensionClass) {
-        super(extensionClass);
-        setDescription("Update the on-disk dependencies to mirror Chart.yaml");
-    }
+public class KubernetesHelmDependencyUpdateTask extends AbstractHelmTask {
+
+  @Inject
+  public KubernetesHelmDependencyUpdateTask(Class<? extends KubernetesExtension> extensionClass) {
+    super(extensionClass);
+    setDescription("Update the on-disk dependencies to mirror Chart.yaml");
+  }
 
-    @Override
-    public void run() {
-        if (kubernetesExtension.getSkipOrDefault()) {
-            return;
-        }
-        try {
-            final HelmConfig helm = initHelmConfig(kubernetesExtension.getDefaultHelmType(), kubernetesExtension.javaProject,
-                    kubernetesExtension.getKubernetesTemplateOrDefault(),
-                    kubernetesExtension.helm)
-                    .build();
-            jKubeServiceHub.getHelmService().dependencyUpdate(helm);
-        } catch (Exception exp) {
-            kitLogger.error("Error performing helm dependency update", exp);
-            throw new IllegalStateException(exp.getMessage(), exp);
-        }
+  @Override
+  public void run() {
+    try {
+      jKubeServiceHub.getHelmService().dependencyUpdate(kubernetesExtension.helm);
+    } catch (Exception exp) {
+      kitLogger.error("Error performing helm dependency update", exp);
+      throw new IllegalStateException(exp.getMessage(), exp);
     }
-}
+  }
+}

gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmLintTask.java

@@ -18,9 +18,8 @@
 
 import javax.inject.Inject;
 
-import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmConfig;
+public class KubernetesHelmLintTask extends AbstractHelmTask {
 
-public class KubernetesHelmLintTask extends AbstractJKubeTask {
   @Inject
   public KubernetesHelmLintTask(Class<? extends KubernetesExtension> extensionClass) {
     super(extensionClass);
@@ -29,15 +28,8 @@ public KubernetesHelmLintTask(Class<? extends KubernetesExtension> extensionClas
 
   @Override
   public void run() {
-    if (kubernetesExtension.getSkipOrDefault()) {
-      return;
-    }
     try {
-      final HelmConfig helm = initHelmConfig(kubernetesExtension.getDefaultHelmType(), kubernetesExtension.javaProject,
-        kubernetesExtension.getKubernetesTemplateOrDefault(),
-        kubernetesExtension.helm)
-        .build();
-      jKubeServiceHub.getHelmService().lint(helm);
+      jKubeServiceHub.getHelmService().lint(kubernetesExtension.helm);
     } catch (Exception exp) {
       kitLogger.error("Error performing helm lint", exp);
       throw new IllegalStateException(exp.getMessage(), exp);

gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmPushTask.java

@@ -18,10 +18,9 @@
 
 import javax.inject.Inject;
 
-import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmConfig;
 import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmPushConfig;
 
-public class KubernetesHelmPushTask extends AbstractJKubeTask {
+public class KubernetesHelmPushTask extends AbstractHelmTask {
   @Inject
   public KubernetesHelmPushTask(Class<? extends KubernetesExtension> extensionClass) {
     super(extensionClass);
@@ -30,15 +29,9 @@ public KubernetesHelmPushTask(Class<? extends KubernetesExtension> extensionClas
 
   @Override
   public void run() {
-    if (kubernetesExtension.getSkipOrDefault()) {
-      return;
-    }
     try {
-      HelmConfig helm = initHelmConfig(kubernetesExtension.getDefaultHelmType(), kubernetesExtension.javaProject,
-        kubernetesExtension.getKubernetesTemplateOrDefault(),
-        kubernetesExtension.helm).build();
-      initHelmPushConfig(helm, kubernetesExtension.javaProject);
-      jKubeServiceHub.getHelmService().uploadHelmChart(helm);
+      initHelmPushConfig(kubernetesExtension.helm, kubernetesExtension.javaProject);
+      jKubeServiceHub.getHelmService().uploadHelmChart(kubernetesExtension.helm);
     } catch (Exception exp) {
       kitLogger.error("Error performing Helm push", exp);
       throw new IllegalStateException(exp.getMessage(), exp);

gradle-plugin/kubernetes/src/main/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmTask.java

@@ -20,9 +20,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmConfig;
+public class KubernetesHelmTask extends AbstractHelmTask {
 
-public class KubernetesHelmTask extends AbstractJKubeTask {
   @Inject
   public KubernetesHelmTask(Class<? extends KubernetesExtension> extensionClass) {
     super(extensionClass);
@@ -36,10 +35,7 @@ public void run() {
       if (manifest == null || !manifest.isFile()) {
         logManifestNotFoundWarning(manifest);
       }
-      HelmConfig helm = initHelmConfig(kubernetesExtension.getDefaultHelmType(), kubernetesExtension.javaProject,
-      kubernetesExtension.getKubernetesTemplateOrDefault(),
-        kubernetesExtension.helm).build();
-      jKubeServiceHub.getHelmService().generateHelmCharts(helm);
+      jKubeServiceHub.getHelmService().generateHelmCharts(kubernetesExtension.helm);
     } catch (IOException exception) {
       throw new IllegalStateException(exception.getMessage(), exception);
     }