Update example to use Dekorate 2.7

Author: Sgitario

.openshiftio/application.yaml

@@ -247,6 +247,7 @@ objects:
       app.kubernetes.io/vcs-uri: [email protected]:snowdrop/configmap-example.git
     name: configmap
   spec:
+    path: /
     port:
       targetPort: 8080
     to:

pom.xml

@@ -99,11 +99,6 @@
       <groupId>io.dekorate</groupId>
       <artifactId>kubernetes-junit</artifactId>
       <scope>test</scope>
-      <!--
-      Workaround: We need to exclude annotations, otherwise Openshift always uses the Docker build in tests.
-      Reported by https://github.com/dekorateio/dekorate/issues/821.
-      The same happens with Dekorate 2.7.0.
-      -->
       <exclusions>
         <exclusion>
           <groupId>io.dekorate</groupId>

run_tests_with_s2i.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 SOURCE_REPOSITORY_URL=${1:-https://github.com/snowdrop/configmap-example}
-SOURCE_REPOSITORY_REF=${2:-sb-2.4.x}
+SOURCE_REPOSITORY_REF=${2:-sb-2.5.x}
 
 source scripts/waitFor.sh
 

scripts/waitFor.sh

@@ -16,8 +16,7 @@ waitFor() {
       return 1
     fi
     sleep $LOOP
-    echo "Waiting for pod to be created..."
-    idx=$((idx+1))
+    let "idx+=1"
   done
   # Wait for pod to be ready
   if [[ $(oc wait --for=condition=ready --timeout=$READY_TIMEOUT pod -l $POD_LABEL=$NAME | grep "condition met" | wc -l) -eq 0 ]] ; then

src/test/java/dev/snowdrop/example/LocalTest.java

@@ -19,18 +19,18 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.core.Is.is;
 
-import dev.snowdrop.example.service.GreetingProperties;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+import dev.snowdrop.example.service.GreetingProperties;
+
 @ExtendWith(SpringExtension.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = "spring.cloud.kubernetes.config.enabled=false")
 public class LocalTest {
 
     private static final String GREETING_PATH = "api/greeting";

src/test/java/dev/snowdrop/example/ManagedOpenShiftIT.java

@@ -16,39 +16,28 @@
 
 package dev.snowdrop.example;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 
 import io.dekorate.testing.annotation.Inject;
+import io.dekorate.testing.annotation.Named;
 import io.dekorate.testing.openshift.annotation.OpenshiftIntegrationTest;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.openshift.api.model.Route;
-import io.fabric8.openshift.client.OpenShiftClient;
 
 @DisabledIfSystemProperty(named = "unmanaged-test", matches = "true")
 @OpenshiftIntegrationTest
 public class ManagedOpenShiftIT extends AbstractOpenShiftIT {
     @Inject
     KubernetesClient kubernetesClient;
 
-    String baseUrl;
-
-    @BeforeEach
-    public void setup() throws MalformedURLException {
-        // TODO: In Dekorate 1.7, we can inject Routes directly, so we won't need to do this:
-        Route route = kubernetesClient.adapt(OpenShiftClient.class).routes().withName("configmap").get();
-        String protocol = route.getSpec().getTls() == null ? "http" : "https";
-        int port = "http".equals(protocol) ? 80 : 443;
-        URL url = new URL(protocol, route.getSpec().getHost(), port, route.getSpec().getPath());
-        baseUrl = url.toString();
-    }
+    @Inject
+    @Named("configmap")
+    URL baseUrl;
 
     @Override
     protected String baseURL() {
-        return baseUrl;
+        return baseUrl.toString();
     }
 
     @Override

src/test/java/dev/snowdrop/example/UnmanagedOpenShiftIT.java

@@ -16,39 +16,28 @@
 
 package dev.snowdrop.example;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
 import io.dekorate.testing.annotation.Inject;
+import io.dekorate.testing.annotation.Named;
 import io.dekorate.testing.openshift.annotation.OpenshiftIntegrationTest;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.openshift.api.model.Route;
-import io.fabric8.openshift.client.OpenShiftClient;
 
 @EnabledIfSystemProperty(named = "unmanaged-test", matches = "true")
 @OpenshiftIntegrationTest(deployEnabled = false, buildEnabled = false, pushEnabled = false)
 public class UnmanagedOpenShiftIT extends AbstractOpenShiftIT {
     @Inject
     KubernetesClient kubernetesClient;
 
-    String baseUrl;
-
-    @BeforeEach
-    public void setup() throws MalformedURLException {
-        // TODO: In Dekorate 1.7, we can inject Routes directly, so we won't need to do this:
-        Route route = kubernetesClient.adapt(OpenShiftClient.class).routes().withName("configmap").get();
-        String protocol = route.getSpec().getTls() == null ? "http" : "https";
-        int port = "http".equals(protocol) ? 80 : 443;
-        URL url = new URL(protocol, route.getSpec().getHost(), port, "/");
-        baseUrl = url.toString();
-    }
+    @Inject
+    @Named("configmap")
+    URL baseUrl;
 
     @Override
     protected String baseURL() {
-        return baseUrl;
+        return baseUrl.toString();
     }
 
     @Override