From c723d672f9006062b8bcccc3f73b9a6111a60491 Mon Sep 17 00:00:00 2001 From: chandresh pancholi Date: Fri, 29 Oct 2021 12:03:48 +0530 Subject: [PATCH] litmus proxy config move to env variable Signed-off-by: chandresh pancholi --- .../medici/controller/MockController.java | 1 - .../navi/medici/config/LitmusProxyConfig.java | 6 ++++++ .../src/main/resources/application.properties | 20 +++---------------- local_proxy.env | 0 4 files changed, 9 insertions(+), 18 deletions(-) create mode 100644 local_proxy.env diff --git a/litmus-mock/src/main/java/com/navi/medici/controller/MockController.java b/litmus-mock/src/main/java/com/navi/medici/controller/MockController.java index da57290..af3d9e7 100644 --- a/litmus-mock/src/main/java/com/navi/medici/controller/MockController.java +++ b/litmus-mock/src/main/java/com/navi/medici/controller/MockController.java @@ -1,6 +1,5 @@ package com.navi.medici.controller; -import com.navi.medici.context.LitmusContext; import com.navi.medici.litmus.Litmus; import com.navi.medici.variants.Variant; import lombok.RequiredArgsConstructor; diff --git a/litmus-proxy/src/main/java/com/navi/medici/config/LitmusProxyConfig.java b/litmus-proxy/src/main/java/com/navi/medici/config/LitmusProxyConfig.java index b84166d..e2384ea 100644 --- a/litmus-proxy/src/main/java/com/navi/medici/config/LitmusProxyConfig.java +++ b/litmus-proxy/src/main/java/com/navi/medici/config/LitmusProxyConfig.java @@ -1,8 +1,14 @@ package com.navi.medici.config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @Configuration public class LitmusProxyConfig { + @Value("${litmus.api.endpoint}") + String litmusEndpoint; + + @Value("${clickstream.api.endpoint}") + String clickStreamEndpoint; } diff --git a/litmus-proxy/src/main/resources/application.properties b/litmus-proxy/src/main/resources/application.properties index 6830bf6..8eeae68 100644 --- a/litmus-proxy/src/main/resources/application.properties +++ b/litmus-proxy/src/main/resources/application.properties @@ -1,19 +1,6 @@ server.port=${PORT:13000} server.servlet.context-path=/litmus-proxy -spring.datasource.hikari.maximum-pool-size=${DB_POOL_MAX_SIZE:2} -spring.datasource.hikari.minimum-idle=${DB_POOL_MIN_IDLE:1} -spring.datasource.hikari.idle-timeout=${DB_POOL_IDLE_TIMEOUT_IN_MS:30000} -spring.datasource.url=${DATASOURCE_URL:jdbc:postgresql://localhost:5432/litmus}?stringtype=unspecified -spring.datasource.username=${DATASOURCE_USERNAME:postgres} -spring.datasource.password=${DATASOURCE_PASSWORD:admin} -spring.datasource.initialization-mode=${DATA_INITIALIZATION_MODE:never} -spring.jpa.hibernate.ddl-auto=none -#spring.jpa.properties.hibernate.generate_statistics]=true -#spring.jpa.properties.hibernate.show_sql=true -#spring.jpa.properties.hibernate.use_sql_comments=true -#spring.jpa.properties.hibernate.format_sql=true - management.server.port=4001 management.endpoints.web.exposure.include=prometheus,health,info,metric,heapdump,threaddump server.tomcat.mbeanregistry.enabled=true @@ -21,7 +8,6 @@ spring.jmx.enabled=true management.metrics.kafka.consumer.enabled=true management.metrics.kafka.producer.enabled=true -kafka.servers=${KAFKA_SERVER:localhost:9092} -audit.kafka.servers=${AUDIT_KAFKA_SERVER:localhost:9092} -kafka.auditlog.topic=${AUDIT_LOG_TOPIC:audit-logs} -kms.base-url=${KMS_BASE_URL:http://google.com} \ No newline at end of file +litmus.api.endpoint=${LITMUS_API_ENDPOINT:http://localhost:12000/litmus-core/v1} +clickstream.api.endpoint=${CLICK_STREAM_API_ENDPOINT:https://dev-janus.np.navi-tech.in/events/json} + diff --git a/local_proxy.env b/local_proxy.env new file mode 100644 index 0000000..e69de29