diff --git a/.gitea/workflows/test_build.yml b/.gitea/workflows/test_build.yml index 05e8adb..ae070cd 100644 --- a/.gitea/workflows/test_build.yml +++ b/.gitea/workflows/test_build.yml @@ -17,4 +17,4 @@ jobs: - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v3 - name: Gradle build - run: ./gradlew build --debug \ No newline at end of file + run: ./gradlew build --info \ No newline at end of file diff --git a/build.gradle b/build.gradle index aaa90d3..49a3976 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,10 @@ java { } } +test { + systemProperty 'spring.profiles.active', 'test' +} + repositories { mavenCentral() } diff --git a/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java b/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java index 0b2aa4b..e24e6f5 100644 --- a/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java +++ b/src/main/java/com/hithomelabs/CFTunnels/Config/OpenApiConfig.java @@ -2,6 +2,7 @@ package com.hithomelabs.CFTunnels.Config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,9 +11,12 @@ import java.util.ArrayList; @Configuration public class OpenApiConfig { + @Value("${api.baseUrl}") + private String baseUrl; + @Bean public OpenAPI openAPI(){ - Server httpsServer = new Server().url("https://testcf.hithomelabs.com"); + Server httpsServer = new Server().url(baseUrl); OpenAPI openApi = new OpenAPI(); ArrayList servers = new ArrayList<>(); servers.add(httpsServer); diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties new file mode 100644 index 0000000..fdb25ce --- /dev/null +++ b/src/main/resources/application-local.properties @@ -0,0 +1 @@ +api.baseUrl=http://localhost:8080 \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 0000000..dec0f4b --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1 @@ +api.baseUrl=https://cftunnels.hithomelabs.com \ No newline at end of file diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties new file mode 100644 index 0000000..e5c014b --- /dev/null +++ b/src/main/resources/application-test.properties @@ -0,0 +1 @@ +api.baseUrl=https://testcf.hithomelabs.com \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2c265e1..9b04cc9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,3 +2,4 @@ spring.application.name=CFTunnels cloudflare.accountId=${CLOUDFLARE_ACCOUNT_ID} cloudflare.apiKey=${CLOUDFLARE_API_KEY} cloudflare.email=${CLOUDFLARE_EMAIL} +spring.profiles.active=${ENV}