Merge pull request #5 from kokuwaio/upload-verification

Merge main into PR
TechnologyBrewery · Dec 4, 2023 · db6cb0d · db6cb0d
2 parents 35e43f4 + dc91659
commit db6cb0d
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Add following dependency to your pom.xml:
 <dependency>
   <groupId>io.kokuwa.maven</groupId>
   <artifactId>helm-maven-plugin</artifactId>
-  <version>6.12.0</version>
+  <version>6.13.0</version>
 </dependency>
 ```
 
@@ -49,7 +49,7 @@ The default setting is to construct the Helm download URL based upon the detecte
     <plugin>
       <groupId>io.kokuwa.maven</groupId>
       <artifactId>helm-maven-plugin</artifactId>
-      <version>6.12.0</version>
+      <version>6.13.0</version>
       <configuration>
         <chartDirectory>${project.basedir}</chartDirectory>
         <chartVersion>${project.version}</chartVersion>
@@ -70,7 +70,7 @@ If you leave `helmVersion` and `helmDownloadUrl` empty the plugin will determine
     <plugin>
       <groupId>io.kokuwa.maven</groupId>
       <artifactId>helm-maven-plugin</artifactId>
-      <version>6.12.0</version>
+      <version>6.13.0</version>
       <configuration>
         <chartDirectory>${project.basedir}</chartDirectory>
         <chartVersion>${project.version}</chartVersion>
@@ -94,7 +94,7 @@ When `useLocalHelmBinary` is enabled, the plugin by default will search for the
     <plugin>
       <groupId>io.kokuwa.maven</groupId>
       <artifactId>helm-maven-plugin</artifactId>
-      <version>6.12.0</version>
+      <version>6.13.0</version>
       <configuration>
         <chartDirectory>${project.basedir}</chartDirectory>
         <chartVersion>${project.version}</chartVersion>
@@ -117,7 +117,7 @@ and disables the auto-detection feature:
     <plugin>
       <groupId>io.kokuwa.maven</groupId>
       <artifactId>helm-maven-plugin</artifactId>
-      <version>6.12.0</version>
+      <version>6.13.0</version>
       <configuration>
         <chartDirectory>${project.basedir}</chartDirectory>
         <chartVersion>${project.version}</chartVersion>
@@ -141,7 +141,7 @@ and disables the auto-detection feature:
     <plugin>
       <groupId>io.kokuwa.maven</groupId>
       <artifactId>helm-maven-plugin</artifactId>
-      <version>6.12.0</version>
+      <version>6.13.0</version>
       <configuration>
         <chartDirectory>${project.basedir}</chartDirectory>
         <chartVersion>${project.version}</chartVersion>
@@ -173,7 +173,7 @@ and disables the auto-detection feature:
     <plugin>
       <groupId>io.kokuwa.maven</groupId>
       <artifactId>helm-maven-plugin</artifactId>
-      <version>6.12.0</version>
+      <version>6.13.0</version>
       <configuration>
         <chartDirectory>${project.basedir}</chartDirectory>
         <chartVersion>${project.version}</chartVersion>

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>helm-maven-plugin</artifactId>
-	<version>6.12.1-SNAPSHOT</version>
+	<version>6.13.0-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>Helm Maven Plugin</name>
@@ -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-executables/x86_64-helm/helm → src/bin/amd64/helm b/src/it/helm-executables/x86_64-helm/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/test/java/io/kokuwa/maven/helm/HelmMojoTest.java b/src/test/java/io/kokuwa/maven/helm/HelmMojoTest.java
@@ -38,9 +38,8 @@ class Executable {
 		void fixed(LintMojo mojo) {
 			mojo.setUseLocalHelmBinary(true);
 			mojo.setAutoDetectLocalHelmBinary(false);
-			mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory());
-			Path expected = Paths.get(MojoExtension.determineHelmExecutableDirectory().toString())
-					.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
@@ -104,7 +104,7 @@ void localHelm(InitMojo mojo) {
 		mojo.setUseLocalHelmBinary(true);
 		mojo.setFallbackBinaryDownload(false);
 		mojo.setHelmVersion(null);
-		mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory());
+		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;
 
@@ -114,7 +116,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 			// preconfigure
 
 			mojo.setChartDirectory(new File("src/test/resources/simple")); // set some sane defaults for tests
-			mojo.setHelmExecutableDirectory(determineHelmExecutableDirectory());
+			mojo.setHelmExecutableDirectory(determineHelmExecutableDirectory().toFile()); // avoid download helm
 			mojo.setHelmVersion("3.12.0"); // avoid github api
 
 			return mojo;
@@ -125,13 +127,10 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 
 	/**
 	 * Determines which helm executable to use based on the machine's architecture.
+	 *
 	 * @return location of appropriate helm executable
 	 */
-	public static File determineHelmExecutableDirectory() {
-		if (System.getProperty("os.arch").equals("aarch64")) {
-			return new File("src/it/helm-executables/aarch64-helm/");
-		} else {
-			return new File("src/it/helm-executables/x86_64-helm/");
-		}
+	public static Path determineHelmExecutableDirectory() {
+		return Paths.get("src/bin/" + System.getProperty("os.arch")).toAbsolutePath();
 	}
 }