From ff12308760568980d1a7cb0a3f9a5a4faef84297 Mon Sep 17 00:00:00 2001 From: Cho-William Date: Thu, 7 Dec 2023 15:12:33 -0500 Subject: [PATCH] added requested changes to finalize upload verification --- src/main/java/io/kokuwa/maven/helm/UploadMojo.java | 10 +++++----- src/test/java/io/kokuwa/maven/helm/UploadMojoTest.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/kokuwa/maven/helm/UploadMojo.java b/src/main/java/io/kokuwa/maven/helm/UploadMojo.java index 53998912..f4ee5e45 100644 --- a/src/main/java/io/kokuwa/maven/helm/UploadMojo.java +++ b/src/main/java/io/kokuwa/maven/helm/UploadMojo.java @@ -51,6 +51,8 @@ public class UploadMojo extends AbstractHelmMojo { private static final ObjectMapper MAPPER = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT); + private static final ObjectMapper YAML_MAPPER = new YAMLMapper() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); private static final String CATALOG_ARTIFACT_NAME = "helm-catalog"; private static final String CATALOG_ARTIFACT_TYPE = "json"; @@ -127,7 +129,7 @@ public void execute() throws MojoExecutionException { } if (uploadVerificationTimeout != null && uploadVerificationTimeout <= 0) { - throw new IllegalArgumentException("Timeout must be a positive value."); + throw new MojoExecutionException("Timeout must be a positive value."); } getLog().info("Uploading to " + getHelmUploadUrl() + "\n"); @@ -311,11 +313,9 @@ private void uploadSingle(Path chart) throws MojoExecutionException, IOException } private boolean verifyUpload(Path chartPath) throws MojoExecutionException { - ObjectMapper mapper = new YAMLMapper() - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); String chartName; try { - chartName = mapper.readValue(chartPath.toFile(), HelmChart.class).getName(); + chartName = YAML_MAPPER.readValue(chartPath.toFile(), HelmChart.class).getName(); } catch (IOException e) { throw new MojoExecutionException("Unable to read chart from " + chartPath, e); } @@ -332,7 +332,7 @@ private boolean verifyUpload(Path chartPath) throws MojoExecutionException { "--version", getChartVersion(), "--repo", getHelmUploadUrl()) .execute("show chart failed"); verificationSuccess = true; - } catch (Exception e) { + } catch (Exception MojoExecutionException) { getLog().info("Upload verification failed, retrying..."); try { Thread.sleep(1000); diff --git a/src/test/java/io/kokuwa/maven/helm/UploadMojoTest.java b/src/test/java/io/kokuwa/maven/helm/UploadMojoTest.java index c81135c3..bc88e351 100644 --- a/src/test/java/io/kokuwa/maven/helm/UploadMojoTest.java +++ b/src/test/java/io/kokuwa/maven/helm/UploadMojoTest.java @@ -392,7 +392,7 @@ void timeoutTimeNotPositive(UploadMojo mojo) throws Exception { mojo.setUploadVerificationTimeout(-1); mojo.setChartVersion("0.1.0"); copyPackagedHelmChartToOutputdirectory(mojo); - assertThrows(IllegalArgumentException.class, mojo::execute, "Nonpositive timeout must fail."); + assertThrows(MojoExecutionException.class, mojo::execute, "Nonpositive timeout must fail."); } private void assertUpload(UploadMojo mojo, RequestMethod method, String path, String authorization) {