From afc6e9846702e31c46241942bd6b30740f2c4730 Mon Sep 17 00:00:00 2001 From: Aowss Ibrahim Date: Mon, 15 Apr 2024 19:28:18 -0400 Subject: [PATCH] Renaming the config files so that only one is picked up, i.e. no overriding from application.yaml --- .../{application.yaml => application-cloud.yaml} | 3 +++ .../src/main/resources/application-local.yaml | 3 +++ .../{application.yaml => application-cloud.yaml} | 9 ++++++--- .../src/main/resources/application-local.yaml | 9 ++++++--- .../{application.yaml => application-cloud.yaml} | 9 ++++++--- .../task/src/main/resources/application-local.yaml | 9 ++++++--- 6 files changed, 30 insertions(+), 12 deletions(-) rename spring-boot/error-handling/src/main/resources/{application.yaml => application-cloud.yaml} (95%) rename spring-boot/rest-connector/src/main/resources/{application.yaml => application-cloud.yaml} (96%) rename spring-boot/task/src/main/resources/{application.yaml => application-cloud.yaml} (97%) diff --git a/spring-boot/error-handling/src/main/resources/application.yaml b/spring-boot/error-handling/src/main/resources/application-cloud.yaml similarity index 95% rename from spring-boot/error-handling/src/main/resources/application.yaml rename to spring-boot/error-handling/src/main/resources/application-cloud.yaml index d8015ae..ad2b63a 100644 --- a/spring-boot/error-handling/src/main/resources/application.yaml +++ b/spring-boot/error-handling/src/main/resources/application-cloud.yaml @@ -1,3 +1,6 @@ +server: + port: 9000 + # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options diff --git a/spring-boot/error-handling/src/main/resources/application-local.yaml b/spring-boot/error-handling/src/main/resources/application-local.yaml index 0f331d2..9baff20 100644 --- a/spring-boot/error-handling/src/main/resources/application-local.yaml +++ b/spring-boot/error-handling/src/main/resources/application-local.yaml @@ -1,3 +1,6 @@ +server: + port: 9000 + zeebe: client: broker: diff --git a/spring-boot/rest-connector/src/main/resources/application.yaml b/spring-boot/rest-connector/src/main/resources/application-cloud.yaml similarity index 96% rename from spring-boot/rest-connector/src/main/resources/application.yaml rename to spring-boot/rest-connector/src/main/resources/application-cloud.yaml index ba759ae..cde3f98 100644 --- a/spring-boot/rest-connector/src/main/resources/application.yaml +++ b/spring-boot/rest-connector/src/main/resources/application-cloud.yaml @@ -1,3 +1,9 @@ +server: + port: 9000 + +api: + url: http://${ENV:prod}-rates:9999/exchangeRates + # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options @@ -16,6 +22,3 @@ camunda: enabled: false webhook: enabled: false - -api: - url: http://${ENV:prod}-rates:9999/exchangeRates diff --git a/spring-boot/rest-connector/src/main/resources/application-local.yaml b/spring-boot/rest-connector/src/main/resources/application-local.yaml index d559514..a4acda6 100644 --- a/spring-boot/rest-connector/src/main/resources/application-local.yaml +++ b/spring-boot/rest-connector/src/main/resources/application-local.yaml @@ -1,3 +1,9 @@ +server: + port: 9000 + +api: + url: http://${ENV:prod}-rates:9999/exchangeRates + zeebe: client: broker: @@ -16,6 +22,3 @@ camunda: enabled: false webhook: enabled: false - -api: - url: http://${ENV:prod}-rates:9999/exchangeRates \ No newline at end of file diff --git a/spring-boot/task/src/main/resources/application.yaml b/spring-boot/task/src/main/resources/application-cloud.yaml similarity index 97% rename from spring-boot/task/src/main/resources/application.yaml rename to spring-boot/task/src/main/resources/application-cloud.yaml index 32deb15..749d152 100644 --- a/spring-boot/task/src/main/resources/application.yaml +++ b/spring-boot/task/src/main/resources/application-cloud.yaml @@ -1,3 +1,9 @@ +server: + port: 9000 + +api: + url: http://${ENV:prod}-rates:9999/exchangeRates + # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options @@ -14,6 +20,3 @@ tasklist: keycloak-url: https://login.cloud.camunda.io/oauth/token client-id: ${zeebe.client.cloud.clientId} client-secret: ${zeebe.client.cloud.clientSecret} - -api: - url: http://${ENV:prod}-rates:9999/exchangeRates diff --git a/spring-boot/task/src/main/resources/application-local.yaml b/spring-boot/task/src/main/resources/application-local.yaml index 47f4606..01c7fe8 100644 --- a/spring-boot/task/src/main/resources/application-local.yaml +++ b/spring-boot/task/src/main/resources/application-local.yaml @@ -1,3 +1,9 @@ +server: + port: 9000 + +api: + url: http://${ENV:prod}-rates:9999/exchangeRates + # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options @@ -24,6 +30,3 @@ camunda: enabled: false webhook: enabled: false - -api: - url: http://${ENV:prod}-rates:9999/exchangeRates