test: Refactored Ingress tests to make them fluent and readable

Signed-off-by: Marc Nuri <marc@marcnuri.com>
eclipse-jkube · Jan 26, 2021 · 1b813f6 · 1b813f6
1 parent 3d199d7
commit 1b813f6
Show file tree

Hide file tree

Showing 4 changed files with 188 additions and 157 deletions.
diff --git a/...onfig/resource/src/main/java/org/eclipse/jkube/kit/config/resource/IngressRuleConfig.java b/...onfig/resource/src/main/java/org/eclipse/jkube/kit/config/resource/IngressRuleConfig.java
@@ -18,6 +18,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Singular;
 
 import java.util.List;
 
@@ -28,5 +29,6 @@
 @EqualsAndHashCode
 public class IngressRuleConfig {
     private String host;
+    @Singular
     private List<IngressRulePathConfig> paths;
 }
diff --git a/...config/resource/src/main/java/org/eclipse/jkube/kit/config/resource/IngressTlsConfig.java b/...config/resource/src/main/java/org/eclipse/jkube/kit/config/resource/IngressTlsConfig.java
@@ -18,6 +18,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Singular;
 
 import java.util.List;
 
@@ -27,6 +28,7 @@
 @Getter
 @EqualsAndHashCode
 public class IngressTlsConfig {
+    @Singular
     private List<String> hosts;
     private String secretName;
 }
diff --git a/...it/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/IngressEnricher.java b/...it/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/IngressEnricher.java
@@ -77,7 +77,7 @@ public void create(PlatformMode platformMode, final KubernetesListBuilder listBu
             listBuilder.accept(new TypedVisitor<ServiceBuilder>() {
                 @Override
                 public void visit(ServiceBuilder serviceBuilder) {
-                    Ingress ingress = addIngress(listBuilder, serviceBuilder, getRouteDomain(resourceConfig), getIngressRuleXMLConfig(resourceConfig), getIngressTlsXMLConfig(resourceConfig), log);
+                    Ingress ingress = generateIngress(listBuilder, serviceBuilder, getRouteDomain(resourceConfig), getIngressRuleXMLConfig(resourceConfig), getIngressTlsXMLConfig(resourceConfig), log);
                     if (ingress != null) {
                         listBuilder.addToItems(ingress);
                     }
@@ -86,7 +86,7 @@ public void visit(ServiceBuilder serviceBuilder) {
         }
     }
 
-    protected static Ingress addIngress(KubernetesListBuilder listBuilder, ServiceBuilder serviceBuilder, String routeDomainPostfix, List<IngressRuleConfig> ingressRuleConfigs, List<IngressTlsConfig> ingressTlsConfigs, KitLogger log) {
+    protected static Ingress generateIngress(KubernetesListBuilder listBuilder, ServiceBuilder serviceBuilder, String routeDomainPostfix, List<IngressRuleConfig> ingressRuleConfigs, List<IngressTlsConfig> ingressTlsConfigs, KitLogger log) {
         ObjectMeta serviceMetadata = serviceBuilder.buildMetadata();
         if (serviceMetadata == null) {
             log.info("No Metadata for service! ");
@@ -256,15 +256,15 @@ public void visit(IngressBuilder builder) {
 
     /**
      * Should we try to create an external URL for the given service?
-     * <p>
-     * By default lets ignore the kubernetes services and any service which does not expose ports 80 and 443
+     *
+     * <p> By default let's ignore the kubernetes services and any service which does not expose ports 80 and 443
      *
      * @return true if we should create an Ingress for this service.
      */
     static boolean shouldCreateExternalURLForService(ServiceBuilder service, KitLogger log) {
         String serviceName = service.buildMetadata().getName();
         ServiceSpec spec = service.buildSpec();
-        if (spec != null && !isKuberentesSystemService(serviceName)) {
+        if (spec != null && !isKubernetesSystemService(serviceName)) {
             List<ServicePort> ports = spec.getPorts();
             log.debug("Service " + serviceName + " has ports: " + ports);
             if (ports.size() == 1) {
@@ -280,7 +280,7 @@ static boolean shouldCreateExternalURLForService(ServiceBuilder service, KitLogg
         return false;
     }
 
-    private static boolean isKuberentesSystemService(String serviceName) {
+    private static boolean isKubernetesSystemService(String serviceName) {
         return "kubernetes".equals(serviceName) || "kubernetes-ro".equals(serviceName);
     }