move setting to bundled JDK later, this way it doesn't matter if we're caching or freshly bootstrapping

Author: Mpdreamz

src/Elastic.Managed.Ephemeral/EphemeralClusterComposer.cs

@@ -23,6 +23,7 @@ protected EphemeralClusterComposerBase() { }
 			new EnsureJavaHomeEnvironmentVariableIsSet(),
 			new DownloadElasticsearchVersion(),
 			new UnzipElasticsearch(),
+			new SetElasticsearchBundledJdkJavaHome(),
 			new InstallPlugins(),
 
 			new EnsureElasticsearchBatWorksAcrossDrives(),

src/Elastic.Managed.Ephemeral/Tasks/InstallationTasks/SetElasticsearchBundledJdkJavaHome.cs

@@ -0,0 +1,23 @@
+using System;
+using System.IO;
+using Elastic.Managed.ConsoleWriters;
+
+namespace Elastic.Managed.Ephemeral.Tasks.InstallationTasks
+{
+	public class SetElasticsearchBundledJdkJavaHome : ClusterComposeTask
+	{
+		public override void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluster)
+		{
+			
+			var fs = cluster.FileSystem;
+			var jdkFolder = Path.Combine(fs.ElasticsearchHome, "jdk");
+			if (Directory.Exists(jdkFolder))
+			{
+				cluster.Writer?.WriteDiagnostic($"{{{nameof(SetElasticsearchBundledJdkJavaHome)}}} [JAVA_HOME] is set to bundled jdk: {{{jdkFolder}}} ");
+				Environment.SetEnvironmentVariable("JAVA_HOME", jdkFolder);
+			}
+			else 
+				cluster.Writer?.WriteDiagnostic($"{{{nameof(SetElasticsearchBundledJdkJavaHome)}}} [No bundled jdk found] looked in: {{{jdkFolder}}} ");
+		}
+	}
+}

src/Elastic.Managed.Ephemeral/Tasks/InstallationTasks/UnzipElasticsearch.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.IO.Compression;
 using Elastic.Managed.ConsoleWriters;
 using Elastic.Managed.FileSystem;
@@ -30,7 +29,7 @@ public override void Run(IEphemeralCluster<EphemeralClusterConfiguration> cluste
 
                 cluster.Writer?.WriteDiagnostic($"{{{nameof(UnzipElasticsearch)}}} extracted version [{v}] to {{{fs.LocalFolder}}}");
 			}
-
+			
 			if (extractedFolder == fs.ElasticsearchHome) return;
 
 			cluster.Writer?.WriteDiagnostic($"{{{nameof(UnzipElasticsearch)}}} Copying extracted folder {{{extractedFolder}}} => {fs.ElasticsearchHome}");