Skip to content

Commit 1d38e36

Browse files
committed
refactor : Use SummaryService as injected object rather than static util
Signed-off-by: Rohan Kumar <rohaan@redhat.com>
1 parent 7539e4c commit 1d38e36

File tree

138 files changed

+1308
-651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+1308
-651
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.eclipse.jkube.kit.common.JKubeConfiguration;
3131
import org.eclipse.jkube.kit.common.KitLogger;
3232
import org.eclipse.jkube.kit.common.RegistryConfig;
33-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
3433
import org.eclipse.jkube.kit.common.util.ResourceUtil;
3534
import org.eclipse.jkube.kit.config.access.ClusterAccess;
3635
import org.eclipse.jkube.kit.config.access.ClusterConfiguration;
@@ -49,6 +48,7 @@
4948
import static org.eclipse.jkube.kit.build.service.docker.helper.ConfigHelper.initImageConfiguration;
5049
import static org.eclipse.jkube.kit.common.util.BuildReferenceDateUtil.getBuildTimestamp;
5150
import static org.eclipse.jkube.kit.config.service.kubernetes.KubernetesClientUtil.updateResourceConfigNamespace;
51+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.printSummaryIfLastExecuting;
5252

5353
public abstract class AbstractJKubeTask extends DefaultTask implements KubernetesJKubeTask {
5454

@@ -67,16 +67,15 @@ protected AbstractJKubeTask(Class<? extends KubernetesExtension> extensionClass)
6767

6868
@TaskAction
6969
public final void runTask() {
70-
init();
71-
if (shouldSkip()) {
70+
try {
71+
init();
72+
if (shouldSkip()) {
7273
kitLogger.info("`%s` task is skipped.", this.getName());
7374
return;
74-
}
75-
run();
76-
String lastExecutingTask = GradleUtil.getLastExecutingTask(getProject(), getTaskPrioritiesMap());
77-
if (lastExecutingTask != null && lastExecutingTask.equals(getName())) {
78-
SummaryUtil.printSummary(kubernetesExtension.javaProject.getBaseDirectory(), kubernetesExtension.getSummaryEnabledOrDefault());
79-
SummaryUtil.clear();
75+
}
76+
run();
77+
} finally {
78+
printSummaryIfLastExecuting(jKubeServiceHub, getName(), GradleUtil.getLastExecutingTask(getProject(), getTaskPrioritiesMap()));
8079
}
8180
}
8281

@@ -89,8 +88,7 @@ private void init() {
8988
jKubeServiceHub = initJKubeServiceHubBuilder().build();
9089
kubernetesExtension.resources = updateResourceConfigNamespace(kubernetesExtension.getNamespaceOrNull(), kubernetesExtension.resources);
9190
ImageConfigResolver imageConfigResolver = new ImageConfigResolver();
92-
SummaryUtil.initSummary(kubernetesExtension.javaProject.getBuildDirectory(), kitLogger);
93-
SummaryUtil.setSuccessful(true);
91+
jKubeServiceHub.getSummaryService().setSuccessful(true);
9492
try {
9593
resolvedImages = resolveImages(imageConfigResolver);
9694
final JKubeEnricherContext context = JKubeEnricherContext.builder()
@@ -103,6 +101,7 @@ private void init() {
103101
.resources(kubernetesExtension.resources)
104102
.log(kitLogger)
105103
.jKubeBuildStrategy(kubernetesExtension.getBuildStrategyOrDefault())
104+
.summaryService(jKubeServiceHub.getSummaryService())
106105
.build();
107106
final List<String> extraClasspathElements = kubernetesExtension.getUseProjectClassPathOrDefault() ?
108107
kubernetesExtension.javaProject.getCompileClassPathElements() : Collections.emptyList();
@@ -123,7 +122,7 @@ public KubernetesExtension getExtension() {
123122
}
124123

125124
private List<ImageConfiguration> customizeConfig(List<ImageConfiguration> configs) {
126-
return GeneratorManager.generate(configs, initGeneratorContextBuilder().build(), false);
125+
return GeneratorManager.generate(configs, initGeneratorContextBuilder().build(), false, jKubeServiceHub.getSummaryService());
127126
}
128127

129128
private boolean isAnsiEnabled() {
@@ -153,6 +152,7 @@ protected JKubeServiceHub.JKubeServiceHubBuilder initJKubeServiceHubBuilder() {
153152
.build())
154153
.clusterAccess(clusterAccess)
155154
.offline(kubernetesExtension.getOfflineOrDefault())
155+
.summaryEnabled(kubernetesExtension.getSummaryEnabledOrDefault())
156156
.platformMode(kubernetesExtension.getRuntimeMode());
157157
}
158158

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.eclipse.jkube.kit.common.KitLogger;
2323
import org.eclipse.jkube.kit.common.util.KubernetesHelper;
2424
import org.eclipse.jkube.kit.common.util.OpenshiftHelper;
25-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
2625
import org.eclipse.jkube.kit.config.service.ApplyService;
2726
import org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil;
2827

@@ -33,6 +32,8 @@
3332
import java.util.List;
3433

3534
import static org.eclipse.jkube.kit.config.service.kubernetes.KubernetesClientUtil.resolveFallbackNamespace;
35+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
36+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.printSummary;
3637

3738
@SuppressWarnings("CdiInjectionPointsInspection")
3839
public class KubernetesApplyTask extends AbstractJKubeTask {
@@ -63,15 +64,13 @@ public void run() {
6364
kitLogger.info("[[B]]HINT:[[B]] Use the command `%s get pods -w` to watch your pods start up",
6465
clusterAccess.isOpenShift() ? "oc" : "kubectl");
6566
} catch (KubernetesClientException e) {
66-
KubernetesResourceUtil.handleKubernetesClientException(e, kitLogger, kubernetesExtension.getSummaryEnabledOrDefault());
67+
IllegalStateException illegalStateException = KubernetesResourceUtil.handleKubernetesClientException(e, kitLogger, jKubeServiceHub.getSummaryService());
68+
printSummary(jKubeServiceHub);
69+
throw illegalStateException;
6770
} catch (IOException ioException) {
6871
kitLogger.error("Error in loading Kubernetes Manifests ", ioException);
69-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(), ioException.getMessage(), () -> new IllegalStateException(ioException));
70-
} catch (InterruptedException interruptedException) {
71-
Thread.currentThread().interrupt();
72-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
73-
interruptedException.getMessage(),
74-
() -> new IllegalStateException(interruptedException.getMessage(), interruptedException));
72+
handleExceptionAndSummary(jKubeServiceHub, ioException);
73+
throw new IllegalStateException(ioException);
7574
}
7675
}
7776

@@ -80,7 +79,7 @@ protected boolean shouldSkip() {
8079
return super.shouldSkip() || kubernetesExtension.getSkipApplyOrDefault();
8180
}
8281

83-
private void applyEntities(String fileName, final Collection<HasMetadata> entities) throws InterruptedException {
82+
private void applyEntities(String fileName, final Collection<HasMetadata> entities) {
8483
KitLogger serviceLogger = createLogger("[[G]][SVC][[G]] [[s]]");
8584
applyService.applyEntities(fileName, entities, serviceLogger, kubernetesExtension.getServiceUrlWaitTimeSecondsOrDefault());
8685
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
1919
import org.eclipse.jkube.kit.build.service.docker.DockerServiceHub;
20-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
2120
import org.eclipse.jkube.kit.config.image.ImageConfiguration;
2221
import org.eclipse.jkube.kit.config.resource.RuntimeMode;
2322
import org.eclipse.jkube.kit.config.service.BuildServiceConfig;
@@ -30,6 +29,7 @@
3029
import static org.eclipse.jkube.kit.common.util.BuildReferenceDateUtil.getBuildTimestamp;
3130
import static org.eclipse.jkube.kit.common.util.BuildReferenceDateUtil.getBuildTimestampFile;
3231
import static org.eclipse.jkube.kit.common.util.EnvUtil.storeTimestamp;
32+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
3333

3434
@SuppressWarnings("CdiInjectionPointsInspection")
3535
public class KubernetesBuildTask extends AbstractJKubeTask {
@@ -66,8 +66,8 @@ public void run() {
6666
jKubeServiceHub.getBuildService().build(resolvedImages.toArray(new ImageConfiguration[0]));
6767
} catch (JKubeServiceException | IOException e) {
6868
kitLogger.error(e.getMessage());
69-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
70-
e.getMessage(), () -> new GradleException(e.getMessage(), e));
69+
handleExceptionAndSummary(jKubeServiceHub, e);
70+
throw new GradleException(e.getMessage(), e);
7171
}
7272
}
7373

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import io.fabric8.kubernetes.api.model.HasMetadata;
2626
import io.fabric8.kubernetes.client.KubernetesClient;
27-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
2827
import org.gradle.api.GradleException;
2928

3029
public class KubernetesDebugTask extends AbstractJKubeTask {
@@ -46,9 +45,7 @@ public void run() {
4645
"" + kubernetesExtension.getLocalDebugPortOrDefault(), kubernetesExtension.getDebugSuspendOrDefault(),
4746
createLogger("[[Y]][W][[Y]] [[s]]"));
4847
} catch (IOException ex) {
49-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
50-
ex.getMessage(),
51-
() -> new GradleException("Failure in debug task", ex));
48+
throw new GradleException("Failure in debug task", ex);
5249
}
5350
}
5451
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
package org.eclipse.jkube.gradle.plugin.task;
1515

1616
import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
17-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
1817
import org.eclipse.jkube.kit.resource.helm.HelmConfig;
1918

2019
import javax.inject.Inject;
2120

21+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
2222
import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmConfig;
2323
import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmPushConfig;
2424

@@ -42,9 +42,8 @@ public void run() {
4242
jKubeServiceHub.getHelmService().uploadHelmChart(helm);
4343
} catch (Exception exp) {
4444
kitLogger.error("Error performing helm push", exp);
45-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
46-
exp.getMessage(),
47-
() -> new IllegalStateException(exp.getMessage(), exp));
45+
handleExceptionAndSummary(jKubeServiceHub, exp);
46+
throw new IllegalStateException(exp.getMessage(), exp);
4847
}
4948
}
5049
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
package org.eclipse.jkube.gradle.plugin.task;
1515

1616
import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
17-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
1817
import org.eclipse.jkube.kit.resource.helm.HelmConfig;
1918

2019
import javax.inject.Inject;
2120
import java.io.File;
2221
import java.io.IOException;
2322

23+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
2424
import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmConfig;
2525

2626
public class KubernetesHelmTask extends AbstractJKubeTask {
@@ -42,9 +42,8 @@ public void run() {
4242
kubernetesExtension.helm).build();
4343
jKubeServiceHub.getHelmService().generateHelmCharts(helm);
4444
} catch (IOException exception) {
45-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
46-
exception.getMessage(),
47-
() -> new IllegalStateException(exception.getMessage(), exception));
45+
handleExceptionAndSummary(jKubeServiceHub, exception);
46+
throw new IllegalStateException(exception.getMessage(), exception);
4847
}
4948
}
5049

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
2222
import org.eclipse.jkube.kit.common.util.KubernetesHelper;
23-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
2423
import org.eclipse.jkube.kit.config.service.PodLogService;
2524

2625
import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -51,9 +50,7 @@ public void run() {
5150
null,
5251
true);
5352
} catch (IOException exception) {
54-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
55-
exception.getMessage(),
56-
() -> new GradleException("Failure in getting logs", exception));
53+
throw new GradleException("Failure in getting logs", exception);
5754
}
5855
}
5956

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
1717
import org.eclipse.jkube.kit.build.service.docker.DockerServiceHub;
1818
import org.eclipse.jkube.kit.common.RegistryConfig;
19-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
2019
import org.eclipse.jkube.kit.config.service.BuildServiceConfig;
2120
import org.eclipse.jkube.kit.config.service.JKubeServiceException;
2221
import org.eclipse.jkube.kit.config.service.JKubeServiceHub;
2322

2423
import javax.inject.Inject;
2524
import java.util.Collections;
2625

26+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
27+
2728
public class KubernetesPushTask extends AbstractJKubeTask {
2829
@Inject
2930
public KubernetesPushTask(Class<? extends KubernetesExtension> extensionClass) {
@@ -45,9 +46,8 @@ public void run() {
4546
jKubeServiceHub.getBuildService()
4647
.push(resolvedImages, kubernetesExtension.getPushRetriesOrDefault(), initRegistryConfig(), kubernetesExtension.getSkipTagOrDefault());
4748
} catch (JKubeServiceException e) {
48-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
49-
e.getMessage(),
50-
() -> new IllegalStateException("Error in pushing image: " + e.getMessage(), e));
49+
handleExceptionAndSummary(jKubeServiceHub, e);
50+
throw new IllegalStateException("Error in pushing image: " + e.getMessage(), e);
5151
}
5252
}
5353

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.fabric8.kubernetes.api.model.KubernetesList;
2020
import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
2121
import org.eclipse.jkube.kit.common.util.LazyBuilder;
22-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
2322
import org.eclipse.jkube.kit.config.resource.ResourceConfig;
2423
import org.eclipse.jkube.kit.config.service.JKubeServiceHub;
2524
import org.eclipse.jkube.kit.config.resource.ResourceServiceConfig;
@@ -35,6 +34,7 @@
3534

3635
import static org.eclipse.jkube.kit.common.util.DekorateUtil.DEFAULT_RESOURCE_LOCATION;
3736
import static org.eclipse.jkube.kit.common.util.DekorateUtil.useDekorate;
37+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
3838
import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.updateKindFilenameMappings;
3939
import static org.eclipse.jkube.kit.common.JKubeFileInterpolator.interpolate;
4040

@@ -89,13 +89,12 @@ public void run() {
8989
ResourceClassifier resourceClassifier = kubernetesExtension.getResourceClassifier();
9090
KubernetesList resourceList = jKubeServiceHub.getResourceService().generateResources(kubernetesExtension.getPlatformMode(), enricherManager, kitLogger);
9191
final File resourceClassifierDir = new File(kubernetesExtension.getResourceTargetDirectoryOrDefault(), resourceClassifier.getValue());
92-
jKubeServiceHub.getResourceService().writeResources(resourceList, resourceClassifier, kitLogger);
92+
jKubeServiceHub.getResourceService().writeResources(resourceList, resourceClassifier, kitLogger, jKubeServiceHub.getSummaryService());
9393
validateIfRequired(resourceClassifierDir, resourceClassifier);
9494
}
9595
} catch (IOException e) {
96-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
97-
e.getMessage(),
98-
() -> new IllegalStateException("Failed to generate kubernetes descriptor", e));
96+
handleExceptionAndSummary(jKubeServiceHub, e);
97+
throw new IllegalStateException("Failed to generate kubernetes descriptor", e);
9998
}
10099
}
101100

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package org.eclipse.jkube.gradle.plugin.task;
1515

1616
import org.eclipse.jkube.gradle.plugin.KubernetesExtension;
17-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
1817
import org.eclipse.jkube.kit.config.resource.ResourceConfig;
1918

2019
import javax.inject.Inject;
@@ -24,6 +23,8 @@
2423
import java.util.List;
2524
import java.util.Optional;
2625

26+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
27+
2728
public class KubernetesUndeployTask extends AbstractJKubeTask {
2829

2930
@Inject
@@ -45,9 +46,8 @@ public void run() {
4546
jKubeServiceHub.getUndeployService()
4647
.undeploy(environmentResourceDirs, resources, findManifestsToUndeploy().toArray(new File[0]));
4748
} catch (IOException e) {
48-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
49-
e.getMessage(),
50-
() -> new IllegalStateException(e.getMessage(), e));
49+
handleExceptionAndSummary(jKubeServiceHub, e);
50+
throw new IllegalStateException(e.getMessage(), e);
5151
}
5252
}
5353

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.eclipse.jkube.kit.build.service.docker.watch.WatchContext;
2424
import org.eclipse.jkube.kit.common.util.KubernetesHelper;
2525
import org.eclipse.jkube.kit.common.util.ResourceUtil;
26-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
2726
import org.eclipse.jkube.kit.config.resource.ProcessorConfig;
2827
import org.eclipse.jkube.kit.config.service.JKubeServiceHub;
2928
import org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil;
@@ -38,6 +37,8 @@
3837

3938
import static org.eclipse.jkube.kit.common.util.BuildReferenceDateUtil.getBuildTimestamp;
4039
import static org.eclipse.jkube.kit.config.service.kubernetes.KubernetesClientUtil.applicableNamespace;
40+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.handleExceptionAndSummary;
41+
import static org.eclipse.jkube.kit.config.service.kubernetes.SummaryServiceUtil.printSummary;
4142

4243
public class KubernetesWatchTask extends AbstractJKubeTask {
4344
@Inject
@@ -69,11 +70,12 @@ public void run() {
6970
resources,
7071
context);
7172
} catch (KubernetesClientException kubernetesClientException) {
72-
KubernetesResourceUtil.handleKubernetesClientException(kubernetesClientException, kitLogger, kubernetesExtension.getSummaryEnabledOrDefault());
73+
IllegalStateException illegalStateException = KubernetesResourceUtil.handleKubernetesClientException(kubernetesClientException, kitLogger, jKubeServiceHub.getSummaryService());
74+
printSummary(jKubeServiceHub);
75+
throw illegalStateException;
7376
} catch (Exception ioException) {
74-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
75-
ioException.getMessage(),
76-
() -> new IllegalStateException("An error has occurred while while trying to watch the resources", ioException));
77+
handleExceptionAndSummary(jKubeServiceHub, ioException);
78+
throw new IllegalStateException("An error has occurred while while trying to watch the resources", ioException);
7779
}
7880
}
7981
}

0 commit comments

Comments
 (0)