chore(jkube-kit-config-service): removed code duplication in giving h…

…int.
eclipse-jkube · Sep 1, 2023 · 1f43d07 · 1f43d07
1 parent f0e0c64
commit 1f43d07
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/...service/src/main/java/org/eclipse/jkube/kit/config/service/AbstractImageBuildService.java b/...service/src/main/java/org/eclipse/jkube/kit/config/service/AbstractImageBuildService.java
@@ -46,6 +46,16 @@ private interface ImageConfigurationProcessor {
     void process(ImageConfiguration imageConfiguration) throws JKubeServiceException;
   }
 
+  protected String getHintFromException(Exception ex) {
+    String message = "Error while trying to push the image: " + ex.getMessage();
+    if(ex.getMessage().contains("denied") || ex.getMessage().contains("unauthorized")) {
+      message += "\nPossible issues: invalid credentials or incorrect image name or registry." +
+                 "\nHint: Check your credentials." +
+                 "\nHint: Image name can be modified with the jkube.generator.name property";
+    }
+    return message;
+  }
+
   private void processImage(ImageConfigurationProcessor imageConfigurationConsumer, String skipMessage, ImageConfiguration... imageConfigurations) throws JKubeServiceException {
     if (imageConfigurations != null) {
       for (ImageConfiguration imageConfiguration : imageConfigurations) {

diff --git a/...ice/src/main/java/org/eclipse/jkube/kit/config/service/kubernetes/DockerBuildService.java b/...ice/src/main/java/org/eclipse/jkube/kit/config/service/kubernetes/DockerBuildService.java
@@ -70,13 +70,7 @@ protected void pushSingleImage(ImageConfiguration imageConfiguration, int retrie
         try {
             dockerServices.getRegistryService().pushImage(imageConfiguration, retries, registryConfig, skipTag);
         } catch (IOException ex) {
-            String message = "Error while trying to push the image: " + ex.getMessage();
-            if(ex.getMessage().contains("denied") || ex.getMessage().contains("unauthorized")) {
-                message += "\nPossible issues: invalid credentials or incorrect image name or registry." +
-                            "\nHint: Check your credentials." +
-                            "\nHint: Image name can be modified with the jkube.generator.name property";
-            }
-            throw new JKubeServiceException(message, ex);
+            throw new JKubeServiceException(getHintFromException(ex), ex);
         }
     }
 

diff --git a/...ervice/src/main/java/org/eclipse/jkube/kit/config/service/kubernetes/JibBuildService.java b/...ervice/src/main/java/org/eclipse/jkube/kit/config/service/kubernetes/JibBuildService.java
@@ -116,13 +116,7 @@ protected void pushSingleImage(ImageConfiguration imageConfiguration, int retrie
                 log
             );
         } catch (Exception ex) {
-            String message = "Error while trying to push the image: " + ex.getMessage();
-            if(ex.getMessage().contains("denied") || ex.getMessage().contains("unauthorized")) {
-                message += "\nPossible issues: invalid credentials or incorrect image name or registry." +
-                           "\nHint: Check your credentials." +
-                           "\nHint: Image name can be modified with the jkube.generator.name property";
-            }
-            throw new JKubeServiceException(message, ex);
+            throw new JKubeServiceException(getHintFromException(ex), ex);
         }
     }