From 319bd03e6eb8e7060db1d9a374013a82e48bc374 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Thu, 29 Aug 2024 13:18:41 +0530 Subject: [PATCH] chore : Add a debug log statement for application config file location while inferring ports Add a debug log statement in generators of these frameworks while resolving default web ports: - Spring Boot - Thorntail - Helidon - Quarkus - Micronaut Signed-off-by: Rohan Kumar --- .../eclipse/jkube/kit/common/JavaProject.java | 10 +------ .../jkube/kit/common/PropertiesExtender.java | 29 ------------------- .../jkube/kit/common/util/PropertiesUtil.java | 12 ++++++++ .../common/util/SpringBootConfiguration.java | 5 +--- .../jkube/kit/common/util/SpringBootUtil.java | 24 +++++++-------- .../jkube/kit/common/util/ThorntailUtil.java | 6 ++++ .../util/SpringBootConfigurationTest.java | 1 - .../kit/common/util/SpringBootUtilTest.java | 1 - .../api/DefaultGeneratorManager.java | 7 ----- .../eclipse/jkube/helidon/HelidonUtils.java | 6 ++++ .../enricher/HelidonHealthCheckEnricher.java | 3 ++ .../helidon/generator/HelidonGenerator.java | 3 ++ .../jkube/micronaut/MicronautUtils.java | 6 ++++ .../generator/MicronautGenerator.java | 3 ++ .../eclipse/jkube/quarkus/QuarkusUtils.java | 6 ++++ .../enricher/QuarkusHealthCheckEnricher.java | 3 ++ .../quarkus/generator/QuarkusGenerator.java | 3 ++ .../generator/SpringBootGenerator.java | 3 ++ .../springboot/watcher/SpringBootWatcher.java | 3 ++ .../ThorntailV2HealthCheckEnricher.java | 4 +++ .../v2/generator/ThorntailV2Generator.java | 9 ++++++ 21 files changed, 83 insertions(+), 64 deletions(-) delete mode 100644 jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java index a7287cbb98..279fd9e99b 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/JavaProject.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.Serializable; -import java.net.URL; import java.time.LocalDate; import java.util.List; import java.util.Locale; @@ -38,14 +37,7 @@ public class JavaProject implements Serializable { private static final long serialVersionUID = 6438404976521622633L; - - /** - * Properties file for the project - * - * @param propertiesFile for the project. - * @return Properties file for the project. - */ - private URL propertiesFile; + /** * Project's name. * diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java deleted file mode 100644 index 3174ba635a..0000000000 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/PropertiesExtender.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * 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.common; - -import java.net.URL; -import java.util.Properties; - -import lombok.Getter; -import lombok.Setter; - -// This class expends Properties class -// with URL of properties file path. -public class PropertiesExtender extends Properties { - @Getter - @Setter - private URL propertiesFile; -} diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/PropertiesUtil.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/PropertiesUtil.java index 932c82a554..afa7340477 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/PropertiesUtil.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/PropertiesUtil.java @@ -15,6 +15,7 @@ import io.fabric8.kubernetes.client.utils.Utils; import org.eclipse.jkube.kit.common.JavaProject; +import org.eclipse.jkube.kit.common.KitLogger; import java.io.IOException; import java.io.InputStream; @@ -24,6 +25,7 @@ import java.nio.file.Path; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Properties; @@ -115,4 +117,14 @@ public static Properties fromApplicationConfig(JavaProject javaProject, String[] } return javaProject.getProperties(); } + + public static void logApplicationConfigurationFileSource(KitLogger logger, JavaProject javaProject, List appConfigSources) { + final URLClassLoader urlClassLoader = getClassLoader(javaProject); + appConfigSources.forEach(s -> { + URL ymlResource = urlClassLoader.findResource(s); + if (ymlResource != null) { + logger.info("Loading application configuration from : %s", ymlResource); + } + }); + } } diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootConfiguration.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootConfiguration.java index 05f733e08d..7349afe7d7 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootConfiguration.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootConfiguration.java @@ -16,7 +16,6 @@ import lombok.Builder; import lombok.Getter; import org.eclipse.jkube.kit.common.JavaProject; -import org.eclipse.jkube.kit.common.PropertiesExtender; import java.util.Optional; import java.util.Properties; @@ -39,11 +38,9 @@ public class SpringBootConfiguration { private boolean managementHealthProbesEnabled; public static SpringBootConfiguration from(JavaProject project) { - final PropertiesExtender properties = SpringBootUtil.getSpringBootApplicationProperties( + final Properties properties = SpringBootUtil.getSpringBootApplicationProperties( SpringBootUtil.getSpringBootActiveProfile(project), JKubeProjectUtil.getClassLoader(project)); - project.setPropertiesFile(properties.getPropertiesFile()); - final int majorVersion = SpringBootUtil.getSpringBootVersion(project) .map(semVer -> { try { diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootUtil.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootUtil.java index deafdb268c..09626e8f95 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootUtil.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/SpringBootUtil.java @@ -16,14 +16,15 @@ import java.io.File; import java.net.URL; import java.net.URLClassLoader; +import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Properties; import org.eclipse.jkube.kit.common.JavaProject; import org.eclipse.jkube.kit.common.Plugin; -import org.eclipse.jkube.kit.common.PropertiesExtender; import static org.eclipse.jkube.kit.common.util.PropertiesUtil.getPropertiesFromResource; @@ -39,6 +40,7 @@ public class SpringBootUtil { public static final String SPRING_BOOT_GRADLE_PLUGIN_ARTIFACT_ID = "org.springframework.boot.gradle.plugin"; public static final String DEV_TOOLS_REMOTE_SECRET = "spring.devtools.remote.secret"; public static final String DEV_TOOLS_REMOTE_SECRET_ENV = "SPRING_DEVTOOLS_REMOTE_SECRET"; + private static final String[] SPRING_BOOT_APP_CONFIG_FILES_LIST = new String[] {"application.properties", "application.yml"}; private static final String PLACEHOLDER_PREFIX = "${"; private static final String PLACEHOLDER_SUFFIX = "}"; @@ -65,22 +67,14 @@ public static Properties getSpringBootApplicationProperties(URLClassLoader compi * @param compileClassLoader compile class loader * @return properties object */ - public static PropertiesExtender getSpringBootApplicationProperties(String springActiveProfile, URLClassLoader compileClassLoader) { + public static Properties getSpringBootApplicationProperties(String springActiveProfile, URLClassLoader compileClassLoader) { URL ymlResource = compileClassLoader.findResource("application.yml"); URL propertiesResource = compileClassLoader.findResource("application.properties"); - + Properties props = YamlUtil.getPropertiesFromYamlResource(springActiveProfile, ymlResource); props.putAll(getPropertiesFromResource(propertiesResource)); - props = new SpringBootPropertyPlaceholderHelper(PLACEHOLDER_PREFIX, PLACEHOLDER_SUFFIX, VALUE_SEPARATOR, true) - .replaceAllPlaceholders(props); - - // Extend Properties object with resources file path - PropertiesExtender propsExtender = new PropertiesExtender(); - URL propertiesFile = ymlResource != null ? ymlResource : propertiesResource; - propsExtender.setPropertiesFile(propertiesFile); - propsExtender.putAll(props); - - return propsExtender; + return new SpringBootPropertyPlaceholderHelper(PLACEHOLDER_PREFIX, PLACEHOLDER_SUFFIX, VALUE_SEPARATOR, true) + .replaceAllPlaceholders(props); } /** @@ -158,5 +152,9 @@ public static File findNativeArtifactFile(JavaProject project) { } return null; } + + public static List getSpringBootAppConfigFiles() { + return Arrays.asList(SPRING_BOOT_APP_CONFIG_FILES_LIST); + } } diff --git a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/ThorntailUtil.java b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/ThorntailUtil.java index f380ef485f..8dc475c6ea 100644 --- a/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/ThorntailUtil.java +++ b/jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/ThorntailUtil.java @@ -15,6 +15,8 @@ import org.eclipse.jkube.kit.common.JavaProject; +import java.util.Arrays; +import java.util.List; import java.util.Properties; import static org.eclipse.jkube.kit.common.util.PropertiesUtil.fromApplicationConfig; @@ -34,4 +36,8 @@ private ThorntailUtil() {} public static Properties getThorntailProperties(JavaProject javaProject) { return fromApplicationConfig(javaProject, THORNTAIL_APP_CONFIG_FILES_LIST); } + + public static List getThorntailAppConfigFiles() { + return Arrays.asList(THORNTAIL_APP_CONFIG_FILES_LIST); + } } diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootConfigurationTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootConfigurationTest.java index bea2af32a4..4271d9e4a8 100644 --- a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootConfigurationTest.java +++ b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootConfigurationTest.java @@ -60,7 +60,6 @@ void setUp(@TempDir Path target) throws IOException { project = JavaProject.builder() .properties(properties) .outputDirectory(target.toFile()) - .baseDirectory(target.toFile()) .build(); } diff --git a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootUtilTest.java b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootUtilTest.java index ffa97f8397..76162b7ada 100644 --- a/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootUtilTest.java +++ b/jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/SpringBootUtilTest.java @@ -99,7 +99,6 @@ void getSpringBootApplicationProperties_withCompileClassloader_shouldLoadPropert JavaProject javaProject = JavaProject.builder() .compileClassPathElement(Objects.requireNonNull(getClass().getResource("/util/springboot/resources")).getPath()) .outputDirectory(new File("target")) - .baseDirectory(new File("target")) .build(); URLClassLoader compileClassLoader = JKubeProjectUtil.getClassLoader(javaProject); diff --git a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java index 39157955b5..7937a95483 100644 --- a/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java +++ b/jkube-kit/generator/api/src/main/java/org/eclipse/jkube/generator/api/DefaultGeneratorManager.java @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import java.net.URL; import java.util.List; import java.util.Properties; import java.util.Set; @@ -103,12 +102,6 @@ private List generateImages(List imageCo if (generator.isApplicable(ret)) { log.info("Running generator %s", generator.getName()); ret = generator.customize(ret, genCtx.isPrePackagePhase()); - URL propFileURL = genCtx.getProject().getPropertiesFile(); - if (propFileURL != null) { - log.info("The following properties file is used %s", propFileURL); - } else { - log.info("No properties file found"); - } } } return ret; diff --git a/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/HelidonUtils.java b/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/HelidonUtils.java index 4baa8b0ff3..933fa85aef 100644 --- a/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/HelidonUtils.java +++ b/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/HelidonUtils.java @@ -16,6 +16,8 @@ import org.eclipse.jkube.kit.common.JavaProject; import org.eclipse.jkube.kit.common.util.JKubeProjectUtil; +import java.util.Arrays; +import java.util.List; import java.util.Properties; import static org.eclipse.jkube.kit.common.util.PropertiesUtil.fromApplicationConfig; @@ -46,4 +48,8 @@ public static Properties getHelidonConfiguration(JavaProject javaProject) { public static String extractPort(Properties properties, String defaultValue) { return properties.getProperty(HELIDON_HTTP_PORT, defaultValue); } + + public static List getHelidonAppConfigFiles() { + return Arrays.asList(HELIDON_APP_CONFIG_FILES_LIST); + } } diff --git a/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/enricher/HelidonHealthCheckEnricher.java b/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/enricher/HelidonHealthCheckEnricher.java index 470e51501f..99803ca910 100644 --- a/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/enricher/HelidonHealthCheckEnricher.java +++ b/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/enricher/HelidonHealthCheckEnricher.java @@ -17,9 +17,11 @@ import org.eclipse.jkube.microprofile.enricher.AbstractMicroprofileHealthCheckEnricher; import static org.eclipse.jkube.helidon.HelidonUtils.extractPort; +import static org.eclipse.jkube.helidon.HelidonUtils.getHelidonAppConfigFiles; import static org.eclipse.jkube.helidon.HelidonUtils.getHelidonConfiguration; import static org.eclipse.jkube.helidon.HelidonUtils.hasHelidonHealthDependency; import static org.eclipse.jkube.kit.common.Configs.asInteger; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; public class HelidonHealthCheckEnricher extends AbstractMicroprofileHealthCheckEnricher { private static final String DEFAULT_HELIDON_PORT = "8080"; @@ -34,6 +36,7 @@ protected boolean shouldAddProbe() { @Override protected int getPort() { + logApplicationConfigurationFileSource(log, getContext().getProject(), getHelidonAppConfigFiles()); return asInteger(extractPort(getHelidonConfiguration(getContext().getProject()), DEFAULT_HELIDON_PORT)); } } \ No newline at end of file diff --git a/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/generator/HelidonGenerator.java b/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/generator/HelidonGenerator.java index aa0ed1195e..6e480194fe 100644 --- a/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/generator/HelidonGenerator.java +++ b/jkube-kit/jkube-kit-helidon/src/main/java/org/eclipse/jkube/helidon/generator/HelidonGenerator.java @@ -23,8 +23,10 @@ import java.util.Optional; import static org.eclipse.jkube.helidon.HelidonUtils.extractPort; +import static org.eclipse.jkube.helidon.HelidonUtils.getHelidonAppConfigFiles; import static org.eclipse.jkube.helidon.HelidonUtils.getHelidonConfiguration; import static org.eclipse.jkube.helidon.HelidonUtils.hasHelidonDependencies; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; public class HelidonGenerator extends JavaExecGenerator { public static final String HELIDON = "helidon"; @@ -62,6 +64,7 @@ protected Arguments getBuildEntryPoint() { @Override protected String getDefaultWebPort() { + logApplicationConfigurationFileSource(log, getContext().getProject(), getHelidonAppConfigFiles()); return extractPort(getHelidonConfiguration(getProject()), super.getDefaultWebPort()); } diff --git a/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/MicronautUtils.java b/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/MicronautUtils.java index c4f50bd86b..cf14e4647c 100644 --- a/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/MicronautUtils.java +++ b/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/MicronautUtils.java @@ -16,6 +16,8 @@ import org.eclipse.jkube.kit.common.JavaProject; import org.eclipse.jkube.kit.common.util.JKubeProjectUtil; +import java.util.Arrays; +import java.util.List; import java.util.Properties; import static org.eclipse.jkube.kit.common.util.PropertiesUtil.fromApplicationConfig; @@ -53,4 +55,8 @@ public static boolean hasNativeImagePackaging(JavaProject javaProject) { } return false; } + + public static List getMicronautAppConfigFiles() { + return Arrays.asList(MICRONAUT_APP_CONFIG_FILES_LIST); + } } diff --git a/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/generator/MicronautGenerator.java b/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/generator/MicronautGenerator.java index 00cfd56753..bb49356314 100644 --- a/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/generator/MicronautGenerator.java +++ b/jkube-kit/jkube-kit-micronaut/src/main/java/org/eclipse/jkube/micronaut/generator/MicronautGenerator.java @@ -23,7 +23,9 @@ import org.eclipse.jkube.kit.common.AssemblyConfiguration; import org.eclipse.jkube.kit.config.image.ImageConfiguration; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; import static org.eclipse.jkube.micronaut.MicronautUtils.extractPort; +import static org.eclipse.jkube.micronaut.MicronautUtils.getMicronautAppConfigFiles; import static org.eclipse.jkube.micronaut.MicronautUtils.getMicronautConfiguration; import static org.eclipse.jkube.micronaut.MicronautUtils.hasMicronautPlugin; @@ -79,6 +81,7 @@ protected AssemblyConfiguration createAssembly() { @Override protected String getDefaultWebPort() { + logApplicationConfigurationFileSource(log, getContext().getProject(), getMicronautAppConfigFiles()); return extractPort( getMicronautConfiguration(getProject()), super.getDefaultWebPort() ); diff --git a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java index 803abb3bb1..a0aa531a00 100644 --- a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java +++ b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java @@ -14,6 +14,8 @@ package org.eclipse.jkube.quarkus; import java.io.File; +import java.util.Arrays; +import java.util.List; import java.util.Optional; import java.util.Properties; import java.util.stream.Collectors; @@ -198,6 +200,10 @@ public static boolean isStartupEndpointSupported(JavaProject javaProject) { return isVersionAtLeast(QUARKUS_MAJOR_VERSION_SINCE_STARTUP_CHANGE, QUARKUS_MINOR_VERSION_SINCE_STARTUP_CHANGE, findQuarkusVersion(javaProject)); } + public static List getQuarkusAppConfigFiles() { + return Arrays.asList(QUARKUS_APP_CONFIG_FILES_LIST); + } + private static String resolveQuarkusNonApplicationRootPath(String quarkusVersion, Properties quarkusProperties) { final String defaultValue = isVersionAtLeast(QUARKUS2_MAJOR_VERSION, QUARKUS2_MINOR_VERSION, quarkusVersion) ? DEFAULT_NON_APPLICATION_ROOT_AFTER_2_0 : DEFAULT_NON_APPLICATION_ROOT_BEFORE_2_0; diff --git a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java index ee4bfa5191..d5dc6a4a72 100644 --- a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java +++ b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java @@ -28,8 +28,10 @@ import org.apache.commons.lang3.StringUtils; import static org.eclipse.jkube.kit.common.Configs.asInteger; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; import static org.eclipse.jkube.quarkus.QuarkusUtils.QUARKUS_GROUP_ID; import static org.eclipse.jkube.quarkus.QuarkusUtils.concatPath; +import static org.eclipse.jkube.quarkus.QuarkusUtils.getQuarkusAppConfigFiles; import static org.eclipse.jkube.quarkus.QuarkusUtils.isStartupEndpointSupported; import static org.eclipse.jkube.quarkus.QuarkusUtils.resolveCompleteQuarkusHealthRootPath; import static org.eclipse.jkube.quarkus.QuarkusUtils.extractPort; @@ -87,6 +89,7 @@ private Probe discoverQuarkusHealthCheck(int initialDelay, Function configs) { @Override protected String getDefaultWebPort() { + logApplicationConfigurationFileSource(log, getContext().getProject(), getQuarkusAppConfigFiles()); return extractPort(getProject(), getQuarkusConfiguration(getProject()), super.getDefaultWebPort()); } diff --git a/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/generator/SpringBootGenerator.java b/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/generator/SpringBootGenerator.java index 41d01bee0f..825a3b7a97 100644 --- a/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/generator/SpringBootGenerator.java +++ b/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/generator/SpringBootGenerator.java @@ -32,7 +32,9 @@ import lombok.Getter; import org.apache.commons.lang3.StringUtils; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; import static org.eclipse.jkube.kit.common.util.SpringBootUtil.DEV_TOOLS_REMOTE_SECRET; +import static org.eclipse.jkube.kit.common.util.SpringBootUtil.getSpringBootAppConfigFiles; import static org.eclipse.jkube.kit.common.util.SpringBootUtil.isSpringBootRepackage; import static org.eclipse.jkube.springboot.SpringBootDevtoolsUtils.addDevToolsFilesToFatJar; import static org.eclipse.jkube.springboot.SpringBootDevtoolsUtils.ensureSpringDevToolSecretToken; @@ -108,6 +110,7 @@ protected boolean isFatJar() { @Override protected String getDefaultWebPort() { + logApplicationConfigurationFileSource(log, getProject(), getSpringBootAppConfigFiles()); return "" + SpringBootConfiguration.from(getProject()).getServerPort(); } diff --git a/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java b/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java index e049a02a1e..601c9ac75c 100644 --- a/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java +++ b/jkube-kit/jkube-kit-spring-boot/src/main/java/org/eclipse/jkube/springboot/watcher/SpringBootWatcher.java @@ -45,7 +45,9 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import org.apache.commons.lang3.StringUtils; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; import static org.eclipse.jkube.kit.common.util.SpringBootUtil.DEV_TOOLS_REMOTE_SECRET; +import static org.eclipse.jkube.kit.common.util.SpringBootUtil.getSpringBootAppConfigFiles; import static org.eclipse.jkube.kit.common.util.SpringBootUtil.getSpringBootPluginConfiguration; import static org.eclipse.jkube.springboot.SpringBootDevtoolsUtils.getSpringBootDevToolsJar; @@ -159,6 +161,7 @@ private String validateSpringBootDevtoolsSettings() { throw new IllegalStateException("devtools needs to be included in fat jar"); } + logApplicationConfigurationFileSource(log, getContext().getBuildContext().getProject(), getSpringBootAppConfigFiles()); Properties properties = SpringBootUtil.getSpringBootApplicationProperties( JKubeProjectUtil.getClassLoader(getContext().getBuildContext().getProject())); String remoteSecret = properties.getProperty(DEV_TOOLS_REMOTE_SECRET, System.getProperty(DEV_TOOLS_REMOTE_SECRET)); diff --git a/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/enricher/ThorntailV2HealthCheckEnricher.java b/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/enricher/ThorntailV2HealthCheckEnricher.java index 341ba313ed..380f7383d1 100644 --- a/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/enricher/ThorntailV2HealthCheckEnricher.java +++ b/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/enricher/ThorntailV2HealthCheckEnricher.java @@ -24,6 +24,9 @@ import java.util.Properties; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; +import static org.eclipse.jkube.kit.common.util.ThorntailUtil.getThorntailAppConfigFiles; + /** * Enriches thorntail-v2 containers with health checks if the monitoring fraction is present. */ @@ -91,6 +94,7 @@ protected String getScheme() { } protected int getPort() { + logApplicationConfigurationFileSource(log, getContext().getProject(), getThorntailAppConfigFiles()); final Properties properties = ThorntailUtil.getThorntailProperties(getContext().getProject()); properties.putAll(System.getProperties()); if (properties.containsKey("thorntail.http.port")) { diff --git a/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/generator/ThorntailV2Generator.java b/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/generator/ThorntailV2Generator.java index 760b98fbca..a4f1fb8b32 100644 --- a/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/generator/ThorntailV2Generator.java +++ b/jkube-kit/jkube-kit-thorntail-v2/src/main/java/org/eclipse/jkube/thorntail/v2/generator/ThorntailV2Generator.java @@ -21,6 +21,9 @@ import java.util.List; import java.util.Map; +import static org.eclipse.jkube.kit.common.util.PropertiesUtil.logApplicationConfigurationFileSource; +import static org.eclipse.jkube.kit.common.util.ThorntailUtil.getThorntailAppConfigFiles; + public class ThorntailV2Generator extends JavaExecGenerator { public ThorntailV2Generator(GeneratorContext context) { @@ -46,4 +49,10 @@ protected Map getEnv(boolean isPrepackagePhase) { ret.put("AB_OFF", "true"); return ret; } + + @Override + protected String getDefaultWebPort() { + logApplicationConfigurationFileSource(log, getProject(), getThorntailAppConfigFiles()); + return super.getDefaultWebPort(); + } }