Merge pull request Intersmash#36 from jstourac/cliLaunchScript

tommaso-borgato · May 10, 2023 · e201f43 · e201f43
2 parents fdd4422 + ed75e14
commit e201f43
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java
@@ -243,9 +243,8 @@ public BuildInput getBuildInput() {
 			public List<EnvVar> getEnvVars() {
 				List<EnvVar> list = new ArrayList<>();
 				list.add(new EnvVarBuilder().withName(TEST_ENV_VAR.getName()).withValue(TEST_ENV_VAR.getValue()).build());
-				list.add(new EnvVarBuilder().withName("CLI_LAUNCH_SCRIPT").withValue("/opt/server/extensions/configure.cli")
-						.build());
-
+				// Let's skip addition of the CLI_LAUNCH_SCRIPT environment variable here to test that it's added automatically
+				// in org.jboss.intersmash.tools.provision.openshift.WildflyImageOpenShiftProvisioner#deployImage().
 				list.add(new EnvVarBuilder().withName("ADMIN_USERNAME").withValue("admin").build());
 				list.add(new EnvVarBuilder().withName("ADMIN_PASSWORD").withValue("pass.1234").build());
 				if (!Strings.isNullOrEmpty(IntersmashConfig.getMavenMirrorUrl())) {

diff --git a/...java/org/jboss/intersmash/tools/provision/openshift/WildflyImageOpenShiftProvisioner.java b/...java/org/jboss/intersmash/tools/provision/openshift/WildflyImageOpenShiftProvisioner.java
@@ -61,6 +61,7 @@
 public class WildflyImageOpenShiftProvisioner implements OpenShiftProvisioner<WildflyImageOpenShiftApplication> {
 
 	private final WildflyImageOpenShiftApplication wildflyApplication;
+	private final String CLI_LAUNCH_SCRIPT = "CLI_LAUNCH_SCRIPT";
 	private FailFastCheck ffCheck = () -> false;
 
 	public WildflyImageOpenShiftProvisioner(@NonNull WildflyImageOpenShiftApplication wildflyApplication) {
@@ -285,14 +286,23 @@ private void deployImage() {
 
 		// mount postconfigure CLI commands
 		if (!wildflyApplication.getCliScript().isEmpty()) {
+			final String extensionPath = "/opt/server/extensions";
+			final String scriptName = "configure.cli";
+
 			appBuilder.configMap("jboss-cli")
-					.configEntry("configure.cli", String.join("\n", wildflyApplication.getCliScript()));
+					.configEntry(scriptName, String.join("\n", wildflyApplication.getCliScript()));
 
 			appBuilder.deploymentConfig()
 					.podTemplate()
 					.addConfigMapVolume("jboss-cli", "jboss-cli", "0755")
 					.container()
-					.addVolumeMount("jboss-cli", "/opt/server/extensions", false);
+					.addVolumeMount("jboss-cli", extensionPath, false);
+
+			if (wildflyApplication.getEnvVars().stream().noneMatch((envVar -> envVar.getName().equals(CLI_LAUNCH_SCRIPT)))) {
+				// Application doesn't provide necessary env variable value to the extension script, so let's define it here.
+				addEnvVariable(appBuilder, CLI_LAUNCH_SCRIPT, extensionPath + "/" + scriptName, true,
+						!BinarySource.class.isAssignableFrom(wildflyApplication.getBuildInput().getClass()));
+			}
 		}
 
 		// mount secrets to /etc/secrets