Updates due to spring-boot auto-configuration changes in v2.7+ (#65)

* updated due to spring-boot autoconfiguration changes in version 2.7 https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#changes-to-auto-configuration

Author: kilmajster

.github/test-app/pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.4</version>
+		<version>2.7.10</version>
 		<relativePath/>
 	</parent>
 	<groupId>io.github.kilmajster</groupId>
 	<artifactId>test-app</artifactId>
-	<version>0.0.1</version>
+	<version>0.0.2</version>
 	<name>test-app</name>
 	<description>Dummy app for tests</description>
 	<properties>

.github/test-app/src/main/java/io/github/kilmajster/App.java

@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@SpringBootApplication(scanBasePackages = "io.github.kilmajster")
+@SpringBootApplication
 public class App {
 	public static void main(String... args) { SpringApplication.run(App.class, args); }
 

.github/test-app/src/main/resources/application.properties

@@ -0,0 +1,2 @@
+ngrok.enabled=true
+ngrok.authToken=${NGROK_AUTH_TOKEN}

.github/test-app/src/test/java/io/github/kilmajster/AppTests.java

@@ -3,61 +3,65 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.Arrays;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @ExtendWith(OutputCaptureExtension.class)
 class AppTests {
 
-    private final static Logger log = LoggerFactory.getLogger(AppTests.class);
-    private static final int WAIT_FOR_STARTUP_SECONDS = 90;
-    private static final String HTTPS_NGROK_TUNNEL_REGEX = "(https:\\/\\/)?(([^.]+)\\.)?ngrok\\.io";
+    static final int WAIT_FOR_STARTUP_SECONDS = 90;
+
+    @LocalServerPort
+    int serverPort;
 
     @Test
-    public void shouldStartNgrok(CapturedOutput output) throws IOException, URISyntaxException, InterruptedException {
-        log.info("[ TEST ] Waiting for ngrok...");
+    void should_start_ngrok_and_log_tunnel_details(CapturedOutput output) throws IOException, URISyntaxException, InterruptedException {
+        System.out.println("[automation-test] Waiting for ngrok startup confirmation in output logs...");
+        waitForNgrokStartConfirmationInLogs(output);
+        final String ngrokHttpsTunnelUrl = extractNgrokHttpsTunnelUrlFromLogs(output);
+        System.out.println("[automation-test] Ngrok tunnel is running between ::" + serverPort + " <-> " + ngrokHttpsTunnelUrl);
+
+        System.out.println("[automation-test] Executing GET request...");
+        long timerStart = System.currentTimeMillis();
+        final ResponseEntity<String> responseFromTunnel = new RestTemplate()
+                .getForEntity(
+                        new URL(ngrokHttpsTunnelUrl).toURI(),
+                        String.class
+                );
+        long timerStop = System.currentTimeMillis();
+        System.out.println("[automation-test] " + ngrokHttpsTunnelUrl + " responded in "
+                + (timerStop - timerStart) + "ms with\n\n" + responseFromTunnel + "\n");
+
+        assertThat(responseFromTunnel.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(responseFromTunnel.getBody()).isEqualTo("<h1>Hello World!</h1>");
+    }
 
-        boolean ngrokStarted = false;
+    private String extractNgrokHttpsTunnelUrlFromLogs(CapturedOutput output) {
+        return Arrays.stream(StringUtils.split(output.toString(), " "))
+                .filter(s -> s.startsWith("https://") && s.contains(".ngrok.io")).findFirst().get();
+    }
 
-        Thread.sleep(1000);
+    private void waitForNgrokStartConfirmationInLogs(CapturedOutput output) throws InterruptedException {
         for (int i = WAIT_FOR_STARTUP_SECONDS; i > 0; i--) {
             Thread.sleep(1000);
-            if (output.toString().contains("Ngrok started successfully!")) {
-                ngrokStarted = true;
-                log.info("[ TEST ] Ngrok start detected!");
-                break;
+            if (output.toString().contains("Ngrok started successfully!") || output.toString().contains("Ngrok was already running!")) {
+                return;
             }
         }
-
-        assertThat(ngrokStarted).isTrue();
-
-        Pattern pattern = Pattern.compile(HTTPS_NGROK_TUNNEL_REGEX);
-        Matcher matcher = pattern.matcher(output.getOut());
-
-        assertThat(matcher.find()).isTrue();
-        final String ngrokHttpsRemoteUrl = StringUtils.split(matcher.group(), "[")[1];
-        log.info("[ TEST ] Captured ngrok tunnel url = [ {} ]", ngrokHttpsRemoteUrl);
-
-        ResponseEntity<String> responseFromTunnel = new RestTemplate().getForEntity(new URL(ngrokHttpsRemoteUrl).toURI(), String.class);
-
-        log.info("Response from [ {} ] = \n\n\n{}\n\n", ngrokHttpsRemoteUrl, responseFromTunnel.toString());
-
-        assertThat(responseFromTunnel.getStatusCode()).isEqualTo(HttpStatus.OK);
-        assertThat(responseFromTunnel.getBody()).isEqualTo("<h1>Hello World!</h1>");
+        fail("Ngrok not started!");
     }
-}
+}

.github/test-app/src/test/resources/application.properties

@@ -22,13 +22,10 @@ jobs:
       - name: Silent install main project
         run: mvn --batch-mode --no-transfer-progress install -Dmaven.test.skip=true
 
-      - name: Add ngrok auth token application.properties
-        run: |
-          printf ${{secrets.NGROK_AUTH_TOKEN_PROPERTY}} >> .github/test-app/src/test/resources/application.properties
-        shell: bash
-
       - name: Run automation tests with latest ngrok-spring-boot-starter version on test-app
         working-directory: ./.github/test-app/
+        env:
+          NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
         run: mvn --batch-mode --no-transfer-progress test
 
 

.github/workflows/automation-test-macos.yml

@@ -22,11 +22,8 @@ jobs:
       - name: Silent install main project
         run: mvn --batch-mode --no-transfer-progress install -Dmaven.test.skip=true
 
-      - name: Add ngrok auth token application.properties
-        run: |
-          printf ${{secrets.NGROK_AUTH_TOKEN_PROPERTY}} >> .github/test-app/src/test/resources/application.properties
-        shell: bash
-
       - name: Run automation tests with latest ngrok-spring-boot-starter version on test-app
         working-directory: ./.github/test-app/
+        env:
+          NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
         run: mvn --batch-mode --no-transfer-progress test

.github/workflows/automation-test-ubuntu.yml

@@ -22,11 +22,8 @@ jobs:
       - name: Silent install main project
         run: mvn --batch-mode --no-transfer-progress install -DskipTests
 
-      - name: Add ngrok auth token application.properties
-        run: |
-          printf ${{secrets.NGROK_AUTH_TOKEN_PROPERTY}} >> .github/test-app/src/test/resources/application.properties
-        shell: bash
-
       - name: Run automation tests with latest ngrok-spring-boot-starter version on test-app
         working-directory: ./.github/test-app/
+        env:
+          NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
         run: mvn --batch-mode --no-transfer-progress test

.github/workflows/automation-test-windows.yml

@@ -59,7 +59,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.6</version>
+        <version>2.7.10</version>
         <relativePath/>
     </parent>