Skip to content

Commit efc8c66

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

File tree

127 files changed

+552
-485
lines changed

Some content is hidden

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

127 files changed

+552
-485
lines changed

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

Lines changed: 6 additions & 6 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;
@@ -75,8 +74,8 @@ public final void runTask() {
7574
run();
7675
String lastExecutingTask = GradleUtil.getLastExecutingTask(getProject(), getTaskPrioritiesMap());
7776
if (lastExecutingTask != null && lastExecutingTask.equals(getName())) {
78-
SummaryUtil.printSummary(kubernetesExtension.javaProject.getBaseDirectory(), kubernetesExtension.getSummaryEnabledOrDefault());
79-
SummaryUtil.clear();
77+
jKubeServiceHub.getSummaryService().printSummary(kubernetesExtension.javaProject.getBaseDirectory());
78+
jKubeServiceHub.getSummaryService().clear();
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: 3 additions & 5 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

@@ -63,14 +62,13 @@ public void run() {
6362
kitLogger.info("[[B]]HINT:[[B]] Use the command `%s get pods -w` to watch your pods start up",
6463
clusterAccess.isOpenShift() ? "oc" : "kubectl");
6564
} catch (KubernetesClientException e) {
66-
KubernetesResourceUtil.handleKubernetesClientException(e, kitLogger, kubernetesExtension.getSummaryEnabledOrDefault());
65+
KubernetesResourceUtil.handleKubernetesClientException(e, kitLogger, jKubeServiceHub.getSummaryService());
6766
} catch (IOException ioException) {
6867
kitLogger.error("Error in loading Kubernetes Manifests ", ioException);
69-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(), ioException.getMessage(), () -> new IllegalStateException(ioException));
68+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(ioException.getMessage(), () -> new IllegalStateException(ioException));
7069
} catch (InterruptedException interruptedException) {
7170
Thread.currentThread().interrupt();
72-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
73-
interruptedException.getMessage(),
71+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(interruptedException.getMessage(),
7472
() -> new IllegalStateException(interruptedException.getMessage(), interruptedException));
7573
}
7674
}

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

Lines changed: 1 addition & 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;
@@ -66,8 +65,7 @@ public void run() {
6665
jKubeServiceHub.getBuildService().build(resolvedImages.toArray(new ImageConfiguration[0]));
6766
} catch (JKubeServiceException | IOException e) {
6867
kitLogger.error(e.getMessage());
69-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
70-
e.getMessage(), () -> new GradleException(e.getMessage(), e));
68+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(e.getMessage(), () -> new GradleException(e.getMessage(), e));
7169
}
7270
}
7371

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

Lines changed: 1 addition & 3 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,8 +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(),
48+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(ex.getMessage(),
5149
() -> new GradleException("Failure in debug task", ex));
5250
}
5351
}

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

Lines changed: 1 addition & 3 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.resource.helm.HelmConfig;
1918

2019
import javax.inject.Inject;
@@ -42,8 +41,7 @@ public void run() {
4241
jKubeServiceHub.getHelmService().uploadHelmChart(helm);
4342
} catch (Exception exp) {
4443
kitLogger.error("Error performing helm push", exp);
45-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
46-
exp.getMessage(),
44+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(exp.getMessage(),
4745
() -> new IllegalStateException(exp.getMessage(), exp));
4846
}
4947
}

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

Lines changed: 1 addition & 3 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.resource.helm.HelmConfig;
1918

2019
import javax.inject.Inject;
@@ -42,8 +41,7 @@ public void run() {
4241
kubernetesExtension.helm).build();
4342
jKubeServiceHub.getHelmService().generateHelmCharts(helm);
4443
} catch (IOException exception) {
45-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
46-
exception.getMessage(),
44+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(exception.getMessage(),
4745
() -> new IllegalStateException(exception.getMessage(), exception));
4846
}
4947
}

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

Lines changed: 1 addition & 3 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,8 +50,7 @@ public void run() {
5150
null,
5251
true);
5352
} catch (IOException exception) {
54-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
55-
exception.getMessage(),
53+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(exception.getMessage(),
5654
() -> new GradleException("Failure in getting logs", exception));
5755
}
5856
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
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;
@@ -45,8 +44,7 @@ public void run() {
4544
jKubeServiceHub.getBuildService()
4645
.push(resolvedImages, kubernetesExtension.getPushRetriesOrDefault(), initRegistryConfig(), kubernetesExtension.getSkipTagOrDefault());
4746
} catch (JKubeServiceException e) {
48-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
49-
e.getMessage(),
47+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(e.getMessage(),
5048
() -> new IllegalStateException("Error in pushing image: " + e.getMessage(), e));
5149
}
5250
}

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

Lines changed: 2 additions & 4 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;
@@ -89,12 +88,11 @@ public void run() {
8988
ResourceClassifier resourceClassifier = kubernetesExtension.getResourceClassifier();
9089
KubernetesList resourceList = jKubeServiceHub.getResourceService().generateResources(kubernetesExtension.getPlatformMode(), enricherManager, kitLogger);
9190
final File resourceClassifierDir = new File(kubernetesExtension.getResourceTargetDirectoryOrDefault(), resourceClassifier.getValue());
92-
jKubeServiceHub.getResourceService().writeResources(resourceList, resourceClassifier, kitLogger);
91+
jKubeServiceHub.getResourceService().writeResources(resourceList, resourceClassifier, kitLogger, jKubeServiceHub.getSummaryService());
9392
validateIfRequired(resourceClassifierDir, resourceClassifier);
9493
}
9594
} catch (IOException e) {
96-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
97-
e.getMessage(),
95+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(e.getMessage(),
9896
() -> new IllegalStateException("Failed to generate kubernetes descriptor", e));
9997
}
10098
}

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

Lines changed: 1 addition & 3 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;
@@ -45,8 +44,7 @@ public void run() {
4544
jKubeServiceHub.getUndeployService()
4645
.undeploy(environmentResourceDirs, resources, findManifestsToUndeploy().toArray(new File[0]));
4746
} catch (IOException e) {
48-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
49-
e.getMessage(),
47+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(e.getMessage(),
5048
() -> new IllegalStateException(e.getMessage(), e));
5149
}
5250
}

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

Lines changed: 2 additions & 4 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;
@@ -69,10 +68,9 @@ public void run() {
6968
resources,
7069
context);
7170
} catch (KubernetesClientException kubernetesClientException) {
72-
KubernetesResourceUtil.handleKubernetesClientException(kubernetesClientException, kitLogger, kubernetesExtension.getSummaryEnabledOrDefault());
71+
KubernetesResourceUtil.handleKubernetesClientException(kubernetesClientException, kitLogger, jKubeServiceHub.getSummaryService());
7372
} catch (Exception ioException) {
74-
SummaryUtil.setFailureIfSummaryEnabledOrThrow(kubernetesExtension.getSummaryEnabledOrDefault(),
75-
ioException.getMessage(),
73+
jKubeServiceHub.getSummaryService().setFailureIfSummaryEnabledOrThrow(ioException.getMessage(),
7674
() -> new IllegalStateException("An error has occurred while while trying to watch the resources", ioException));
7775
}
7876
}

‎jkube-kit/build/api/src/main/java/org/eclipse/jkube/kit/build/api/assembly/AssemblyManager.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
import org.eclipse.jkube.kit.common.KitLogger;
4242
import org.eclipse.jkube.kit.common.archive.ArchiveCompression;
4343
import org.eclipse.jkube.kit.common.archive.JKubeTarArchiver;
44+
import org.eclipse.jkube.kit.common.service.SummaryService;
4445
import org.eclipse.jkube.kit.common.util.FileUtil;
4546
import org.eclipse.jkube.kit.common.util.JKubeProjectUtil;
46-
import org.eclipse.jkube.kit.common.util.SummaryUtil;
4747
import org.eclipse.jkube.kit.config.image.ImageConfiguration;
4848
import org.eclipse.jkube.kit.config.image.build.BuildConfiguration;
4949
import org.eclipse.jkube.kit.config.image.build.DockerFileBuilder;
@@ -95,12 +95,13 @@ public static AssemblyManager getInstance() {
9595
* @param buildConfig configuration for how to build the image
9696
* @param log KitLogger used to display warning if permissions are to be normalized
9797
* @param finalCustomizer finalCustomizer to be applied to the tar archive
98+
* @param summaryService {@link SummaryService}
9899
* @return file holding the path to the created assembly tar file
99100
* @throws IOException IO exception
100101
*/
101102
public File createDockerTarArchive(
102103
String imageName, final JKubeConfiguration configuration, final BuildConfiguration buildConfig, KitLogger log,
103-
ArchiverCustomizer finalCustomizer) throws IOException {
104+
ArchiverCustomizer finalCustomizer, SummaryService summaryService) throws IOException {
104105

105106
final BuildDirs buildDirs = createBuildDirs(imageName, configuration);
106107
final List<ArchiverCustomizer> archiveCustomizers = new ArrayList<>();
@@ -110,7 +111,7 @@ public File createDockerTarArchive(
110111

111112
try {
112113
if (buildConfig.isDockerFileMode()) {
113-
SummaryUtil.setDockerFileImageSummary(imageName, buildConfig.getDockerFileFile().getAbsolutePath());
114+
summaryService.setDockerFileImageSummary(imageName, buildConfig.getDockerFileFile().getAbsolutePath());
114115
createDockerTarArchiveForDockerFile(buildConfig, assemblyConfig, configuration, buildDirs, log, archiveCustomizers);
115116
} else {
116117
createAssemblyArchive(assemblyConfig, configuration, buildDirs, buildConfig.getCompression(), layers);

0 commit comments

Comments
 (0)