Moved helm binaries to src/bin, adjusted tests

kokuwaio · Nov 30, 2023 · b6bd0d7 · b6bd0d7
1 parent c2587cc
commit b6bd0d7
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -88,7 +88,7 @@
 		<!-- we have flaky tests with caching of Authenticator.setDefault() -->
 		<surefire.rerunFailingTestsCount>3</surefire.rerunFailingTestsCount>
 
-		<invoker.debug>true</invoker.debug>
+		<invoker.debug>false</invoker.debug>
 		<invoker.parallelThreads>0.5C</invoker.parallelThreads>
 		<invoker.settingsFile>${project.basedir}/src/it/settings.xml</invoker.settingsFile>
 

diff --git a/src/bin/aarch64/helm b/src/bin/aarch64/helm
diff --git a/src/it/helm → src/bin/amd64/helm b/src/it/helm → src/bin/amd64/helm
diff --git a/src/it/helm.exe → src/bin/amd64/helm.exe b/src/it/helm.exe → src/bin/amd64/helm.exe
diff --git a/src/it/dependency-with-overwrite/pom.xml b/src/it/dependency-with-overwrite/pom.xml
@@ -20,7 +20,7 @@
 				<configuration>
 					<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 					<useLocalHelmBinary>true</useLocalHelmBinary>
-					<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+					<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 					<helmExtraRepos>
 						<helmExtraRepo>
 							<name>kokuwaio</name>

diff --git a/src/it/extension/pom.xml b/src/it/extension/pom.xml
@@ -20,7 +20,7 @@
 				<configuration>
 					<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 					<useLocalHelmBinary>true</useLocalHelmBinary>
-					<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+					<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 					<helmExtraRepos>
 						<helmExtraRepo>
 							<name>kokuwaio</name>

diff --git a/src/it/init-with-debug/pom.xml b/src/it/init-with-debug/pom.xml
@@ -24,7 +24,7 @@
 						<configuration>
 							<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 							<useLocalHelmBinary>true</useLocalHelmBinary>
-							<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+							<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 							<helmExtraRepos>
 								<helmExtraRepo>
 									<name>kokuwaio-with-credentials</name>

diff --git a/src/it/init-with-helm-from-directory/pom.xml b/src/it/init-with-helm-from-directory/pom.xml
@@ -26,7 +26,7 @@
 						<configuration>
 							<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 							<useLocalHelmBinary>true</useLocalHelmBinary>
-							<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+							<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 							<addDefaultRepo>false</addDefaultRepo>
 							<chartDirectory>${project.basedir}/src/main/helm</chartDirectory>
 							<chartVersion>1.0.0</chartVersion>

diff --git a/src/it/init-with-helm-from-directory/postbuild.bsh b/src/it/init-with-helm-from-directory/postbuild.bsh
@@ -1,5 +1,6 @@
 // verify that configured helm was used
 
+System.out.println(basedir);
 return org.codehaus.plexus.util.FileUtils
 	.fileRead(basedir + "/build.log")
-	.contains("Using local HELM binary [" + basedir + "/../helm]")
+	.contains("Using local HELM binary [" + basedir + "/../../../src/bin/amd64/helm]")
diff --git a/src/it/init-without-k8s-warning/pom.xml b/src/it/init-without-k8s-warning/pom.xml
@@ -24,7 +24,7 @@
 						<configuration>
 							<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 							<useLocalHelmBinary>true</useLocalHelmBinary>
-							<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+							<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 							<addDefaultRepo>false</addDefaultRepo>
 							<chartDirectory>${project.basedir}/src/main/helm</chartDirectory>
 							<chartVersion>1.0.0</chartVersion>

diff --git a/src/it/lint-with-dependency/pom.xml b/src/it/lint-with-dependency/pom.xml
@@ -28,7 +28,7 @@
 				<configuration>
 					<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 					<useLocalHelmBinary>true</useLocalHelmBinary>
-					<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+					<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 					<helmExtraRepos>
 						<helmExtraRepo>
 							<name>kokuwaio</name>

diff --git a/src/it/path with spaces/pom.xml b/src/it/path with spaces/pom.xml
@@ -20,7 +20,7 @@
 				<configuration>
 					<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 					<useLocalHelmBinary>true</useLocalHelmBinary>
-					<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+					<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 					<helmExtraRepos>
 						<helmExtraRepo>
 							<name>kokuwaio</name>

diff --git a/src/it/pom.xml b/src/it/pom.xml
@@ -20,6 +20,8 @@
 		<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
 		<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
 
+		<test.helmExecutableDirectory>${project.basedir}/../../../src/bin/amd64</test.helmExecutableDirectory>
+
 		<!-- ===================================================================== -->
 		<!-- ============================= Libaries ============================== -->
 		<!-- ===================================================================== -->

diff --git a/src/it/push-with-auth-from-pom/pom.xml b/src/it/push-with-auth-from-pom/pom.xml
@@ -27,7 +27,7 @@
 						<configuration>
 							<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 							<useLocalHelmBinary>true</useLocalHelmBinary>
-							<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+							<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 							<addDefaultRepo>false</addDefaultRepo>
 							<chartDirectory>${project.basedir}/src/main/helm</chartDirectory>
 							<chartVersion>1.0.0</chartVersion>

diff --git a/src/it/push-with-auth-from-pom/postbuild.bsh b/src/it/push-with-auth-from-pom/postbuild.bsh
@@ -2,4 +2,4 @@
 
 return org.codehaus.plexus.util.FileUtils
 	.fileRead(basedir + "/build.log")
-	.contains(basedir + "/../helm registry login 127.0.0.1 --username auth-from-pom --password-stdin\n")
+	.contains(basedir + "/../../../src/bin/amd64/helm registry login 127.0.0.1 --username auth-from-pom --password-stdin\n")
diff --git a/src/it/push-with-auth-from-settings/pom.xml b/src/it/push-with-auth-from-settings/pom.xml
@@ -27,7 +27,7 @@
 						<configuration>
 							<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 							<useLocalHelmBinary>true</useLocalHelmBinary>
-							<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+							<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 							<addDefaultRepo>false</addDefaultRepo>
 							<chartDirectory>${project.basedir}/src/main/helm</chartDirectory>
 							<chartVersion>1.0.0</chartVersion>

diff --git a/src/it/push-with-auth-from-settings/postbuild.bsh b/src/it/push-with-auth-from-settings/postbuild.bsh
@@ -2,4 +2,4 @@
 
 return org.codehaus.plexus.util.FileUtils
 	.fileRead(basedir + "/build.log")
-	.contains(basedir + "/../helm registry login 127.0.0.1 --username auth-from-settings --password-stdin\n")
+	.contains(basedir + "/../../../src/bin/amd64/helm registry login 127.0.0.1 --username auth-from-settings --password-stdin\n")
diff --git a/src/it/push-without-auth/pom.xml b/src/it/push-without-auth/pom.xml
@@ -27,7 +27,7 @@
 						<configuration>
 							<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 							<useLocalHelmBinary>true</useLocalHelmBinary>
-							<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+							<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 							<addDefaultRepo>false</addDefaultRepo>
 							<chartDirectory>${project.basedir}/src/main/helm</chartDirectory>
 							<chartVersion>1.0.0</chartVersion>

diff --git a/src/it/push-without-auth/postbuild.bsh b/src/it/push-without-auth/postbuild.bsh
@@ -2,4 +2,4 @@
 
 return org.codehaus.plexus.util.FileUtils
 	.fileRead(basedir + "/build.log")
-	.contains(basedir + "/../helm push " + basedir + "/target/helm/repo/app-1.0.0.tgz oci://127.0.0.1\n")
+	.contains(basedir + "/../../../src/bin/amd64/helm push " + basedir + "/target/helm/repo/app-1.0.0.tgz oci://127.0.0.1\n")
diff --git a/src/it/template-with-additional-arguments/pom.xml b/src/it/template-with-additional-arguments/pom.xml
@@ -26,7 +26,7 @@
 				<configuration>
 					<autoDetectLocalHelmBinary>false</autoDetectLocalHelmBinary>
 					<useLocalHelmBinary>true</useLocalHelmBinary>
-					<helmExecutableDirectory>${project.basedir}/..</helmExecutableDirectory>
+					<helmExecutableDirectory>${test.helmExecutableDirectory}</helmExecutableDirectory>
 					<addDefaultRepo>false</addDefaultRepo>
 					<chartDirectory>${project.basedir}/src/main/helm</chartDirectory>
 					<chartVersion>1.0.0</chartVersion>

diff --git a/src/main/java/io/kokuwa/maven/helm/AbstractHelmMojo.java b/src/main/java/io/kokuwa/maven/helm/AbstractHelmMojo.java
@@ -295,7 +295,7 @@ Path getHelmExecutablePath() throws MojoExecutionException {
 		if (useLocalHelmBinary && autoDetectLocalHelmBinary) {
 			optional = Stream.of(System.getenv("PATH").split(Pattern.quote(File.pathSeparator))).map(Paths::get);
 			if (helmExecutableDirectory != null) {
-				// if defined, search also in helm executable directory (eg. used for fallback binary download)
+				// if defined, search also in helm executable directory (e.g. used for fallback binary download)
 				optional = Stream.concat(optional, Stream.of(helmExecutableDirectory.toPath()));
 			}
 		} else {

diff --git a/src/test/java/io/kokuwa/maven/helm/AbstractMojoTest.java b/src/test/java/io/kokuwa/maven/helm/AbstractMojoTest.java
@@ -127,7 +127,7 @@ static Server getServer(String id, String username, String password) {
 	}
 
 	static Path copyPackagedHelmChartToOutputdirectory(AbstractHelmMojo mojo) {
-		Path source = Paths.get("src/test/resources/app-0.1.0.tgz");
+		Path source = Paths.get("src/test/resources/__files/app-0.1.0.tgz");
 		Path target = mojo.getOutputDirectory().resolve("app-0.1.0.tgz");
 		assertDoesNotThrow(() -> Files.createDirectories(target.getParent()));
 		assertDoesNotThrow(() -> Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING));

diff --git a/src/test/java/io/kokuwa/maven/helm/HelmMojoTest.java b/src/test/java/io/kokuwa/maven/helm/HelmMojoTest.java
@@ -21,6 +21,7 @@
 import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.api.condition.OS;
 
+import io.kokuwa.maven.helm.junit.MojoExtension;
 import io.kokuwa.maven.helm.pojo.K8SCluster;
 import io.kokuwa.maven.helm.pojo.ValueOverride;
 
@@ -37,8 +38,8 @@ class Executable {
 		void fixed(LintMojo mojo) {
 			mojo.setUseLocalHelmBinary(true);
 			mojo.setAutoDetectLocalHelmBinary(false);
-			mojo.setHelmExecutableDirectory(new File("src/it"));
-			Path expected = Paths.get("src/it").resolve(HELM).toAbsolutePath();
+			mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory().toFile());
+			Path expected = MojoExtension.determineHelmExecutableDirectory().resolve(HELM);
 			Path actual = assertDoesNotThrow(() -> mojo.getHelmExecutablePath());
 			assertEquals(expected, actual);
 		}

diff --git a/src/test/java/io/kokuwa/maven/helm/InitMojoTest.java b/src/test/java/io/kokuwa/maven/helm/InitMojoTest.java
@@ -26,6 +26,7 @@
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 
+import io.kokuwa.maven.helm.junit.MojoExtension;
 import io.kokuwa.maven.helm.pojo.HelmRepository;
 import io.kokuwa.maven.helm.pojo.RepoType;
 
@@ -103,7 +104,7 @@ void localHelm(InitMojo mojo) {
 		mojo.setUseLocalHelmBinary(true);
 		mojo.setFallbackBinaryDownload(false);
 		mojo.setHelmVersion(null);
-		mojo.setHelmExecutableDirectory(new File("src/it"));
+		mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory().toFile());
 		assertHelm(mojo, "version", "repo add stable " + InitMojo.STABLE_HELM_REPO);
 	}
 

diff --git a/src/test/java/io/kokuwa/maven/helm/junit/MojoExtension.java b/src/test/java/io/kokuwa/maven/helm/junit/MojoExtension.java
@@ -8,6 +8,8 @@
 import java.io.File;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -112,12 +114,21 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 			// preconfigure
 
 			mojo.setChartDirectory(new File("src/test/resources/simple")); // set some sane defaults for tests
-			mojo.setHelmExecutableDirectory(new File("src/it")); // avoid download helm
+			mojo.setHelmExecutableDirectory(determineHelmExecutableDirectory().toFile()); // avoid download helm
 			mojo.setHelmVersion("3.12.0"); // avoid github api
 
 			return mojo;
 		} catch (ReflectiveOperationException e) {
 			throw new ParameterResolutionException("Failed to setup mockito.", e);
 		}
 	}
+
+	/**
+	 * Determines which helm executable to use based on the machine's architecture.
+	 *
+	 * @return location of appropriate helm executable
+	 */
+	public static Path determineHelmExecutableDirectory() {
+		return Paths.get("src/bin/" + System.getProperty("os.arch")).toAbsolutePath();
+	}
 }
diff --git a/src/test/resources/app-0.1.0.tgz → src/test/resources/__files/app-0.1.0.tgz b/src/test/resources/app-0.1.0.tgz → src/test/resources/__files/app-0.1.0.tgz