From c844c6cea30b5bacf7a6860f597abad9c38b91a6 Mon Sep 17 00:00:00 2001 From: gulnaz Date: Tue, 24 Sep 2024 11:37:36 +0300 Subject: [PATCH] SUPPORT-8558: rename environment variables --- src/main/resources/application.properties | 22 +++++++++++----------- test.env | 22 ++++++++++------------ 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 153cb49..df15b7e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -10,10 +10,10 @@ spring.kafka.bootstrap.servers=${OUT_KAFKA_SERVERS} # # kafka in consumer (with possibility for default bean) #host1:port1, host2:port2 -spring.kafka.consumer.bootstrap.servers=${IN_KAFKA_SERVERS} +spring.kafka.consumer.bootstrap.servers=${AV_KAFKA_SERVERS} spring.kafka.consumer.security.protocol=SASL_PLAINTEXT #login password to set -spring.kafka.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${IN_KAFKA_USERNAME}" password="${IN_KAFKA_PASSWORD}"; +spring.kafka.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${AV_KAFKA_USERNAME}" password="${AV_KAFKA_PASSWORD}"; spring.kafka.consumer.properties.sasl.mechanism=SCRAM-SHA-256 # spring.kafka.consumer.enable.auto.commit=false @@ -23,25 +23,25 @@ spring.kafka.listener.ack.mode=MANUAL_IMMEDIATE # # kafka out producer (with possibility for default bean) #host1:port1, host2:port2 -spring.kafka.producer.bootstrap.servers=${OUT_KAFKA_SERVERS} +spring.kafka.producer.bootstrap.servers=${ERVU_KAFKA_SERVERS} spring.kafka.producer.security.protocol=SASL_PLAINTEXT #login password to set -spring.kafka.producer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${OUT_KAFKA_USERNAME}" password="${OUT_KAFKA_PASSWORD}"; +spring.kafka.producer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${ERVU_KAFKA_USERNAME}" password="${ERVU_KAFKA_PASSWORD}"; spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-256 # # kafka out general spring.kafka.properties.security.protocol=SASL_PLAINTEXT #login password to set -spring.kafka.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${OUT_KAFKA_USERNAME}" password="${OUT_KAFKA_PASSWORD}"; +spring.kafka.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${ERVU_KAFKA_USERNAME}" password="${ERVU_KAFKA_PASSWORD}"; spring.kafka.properties.sasl.mechanism=SCRAM-SHA-256 # spring kafka default beans properties <- end # # kafka out consumer (not for default bean creation by spring) #host1:port1, host2:port2 -spring.kafka.out.consumer.bootstrap.servers=${OUT_KAFKA_SERVERS} +spring.kafka.out.consumer.bootstrap.servers=${ERVU_KAFKA_SERVERS} spring.kafka.out.consumer.security.protocol=SASL_PLAINTEXT #login password to set -spring.kafka.out.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${OUT_KAFKA_USERNAME}" password="${OUT_KAFKA_PASSWORD}"; +spring.kafka.out.consumer.properties.sasl.jaas.config=org.apache.kafka.common.security.scram.ScramLoginModule required username="${ERVU_KAFKA_USERNAME}" password="${ERVU_KAFKA_PASSWORD}"; spring.kafka.out.consumer.properties.sasl.mechanism=SCRAM-SHA-256 # spring.kafka.out.consumer.enable.auto.commit=false @@ -50,10 +50,10 @@ spring.kafka.out.consumer.group.id=response-consumers spring.kafka.out.listener.ack.mode=MANUAL_IMMEDIATE # # -kafka.in.topic.name=${IN_KAFKA_TOPIC_NAME} -kafka.out.error.topic.name=${OUT_KAFKA_ERROR_TOPIC_NAME} -kafka.out.success.topic.name=${OUT_KAFKA_SUCCESS_TOPIC_NAME} -kafka.out.response.topic.name=${OUT_KAFKA_RESPONSE_TOPIC_NAME} +kafka.in.topic.name=${AV_KAFKA_TOPIC_NAME} +kafka.out.error.topic.name=${ERVU_KAFKA_ERROR_TOPIC_NAME} +kafka.out.success.topic.name=${ERVU_KAFKA_SUCCESS_TOPIC_NAME} +kafka.out.response.topic.name=${ERVU_KAFKA_RESPONSE_TOPIC_NAME} # av.rest.address=${AV_REST_ADDRESS} av.first.timeout.milliseconds=${AV_FIRST_TIMEOUT_MILLISECONDS} diff --git a/test.env b/test.env index 01c5d43..8d3216d 100644 --- a/test.env +++ b/test.env @@ -1,15 +1,13 @@ -MINIO_ROOT_USER=changeIt123 -MINIO_ROOT_PASSWORD=changeIt123 -IN_KAFKA_SERVERS=10.10.31.11:32609 -IN_KAFKA_USERNAME=user1 -IN_KAFKA_PASSWORD=Blfi9d2OFG -IN_KAFKA_TOPIC_NAME=file-to-upload -OUT_KAFKA_SERVERS=10.10.31.11:32609 -OUT_KAFKA_USERNAME=user1 -OUT_KAFKA_PASSWORD=Blfi9d2OFG -OUT_KAFKA_ERROR_TOPIC_NAME=ervu.lkrp.download.request -OUT_KAFKA_SUCCESS_TOPIC_NAME=ervu.lkrp.download.request -OUT_KAFKA_RESPONSE_TOPIC_NAME=ervu.lkrp.download.response +AV_KAFKA_SERVERS=10.10.31.11:32609 +AV_KAFKA_USERNAME=user1 +AV_KAFKA_PASSWORD=Blfi9d2OFG +AV_KAFKA_TOPIC_NAME=file-to-upload +ERVU_KAFKA_SERVERS=10.10.31.11:32609 +ERVU_KAFKA_USERNAME=user1 +ERVU_KAFKA_PASSWORD=Blfi9d2OFG +ERVU_KAFKA_ERROR_TOPIC_NAME=ervu.lkrp.download.request +ERVU_KAFKA_SUCCESS_TOPIC_NAME=ervu.lkrp.download.request +ERVU_KAFKA_RESPONSE_TOPIC_NAME=ervu.lkrp.download.response AV_REST_ADDRESS=http://10.10.31.118:8085/scans AV_FIRST_TIMEOUT_MILLISECONDS=1000 AV_RETRY_MAX_ATTEMPTS_COUNT=10