From 6dde78151d99bf54ce918e239595ca25df130931 Mon Sep 17 00:00:00 2001
From: Raja Kolli <rajadilipkolli@gmail.com>
Date: Fri, 8 Dec 2023 08:44:33 +0000
Subject: [PATCH] fix script to run with additional tools

---
 docker-compose-tools.yml | 14 ++++++++------
 test-em-all.sh           |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docker-compose-tools.yml b/docker-compose-tools.yml
index 5083c920..22e6eef8 100644
--- a/docker-compose-tools.yml
+++ b/docker-compose-tools.yml
@@ -120,6 +120,8 @@ services:
       - microservice-network
     environment:
       SPRING_PROFILES_ACTIVE: native
+      SPRING_SECURITY_USER_NAME: dockerUser
+      SPRING_SECURITY_USER_PASSWORD: dockerSecret
     labels:
       logging: "promtail"
       logging_jobname: "containerlogs"
@@ -140,7 +142,7 @@ services:
       config-server:
         condition: service_started
     environment:
-      - SPRING_CONFIG_IMPORT=configserver:http://config-server:8888/
+      - SPRING_CONFIG_IMPORT=configserver:http://dockerUser:dockerSecret@config-server:8888/
       - MANAGEMENT_ZIPKIN_TRACING_ENDPOINT=http://tempo:9411
     restart: unless-stopped
     labels:
@@ -174,7 +176,7 @@ services:
       # - mongodb
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - SPRING_CONFIG_IMPORT=configserver:http://config-server:8888/
+      - SPRING_CONFIG_IMPORT=configserver:http://dockerUser:dockerSecret@config-server:8888/
       - SPRING_DATA_REDIS_HOST=redis
       - MANAGEMENT_ZIPKIN_TRACING_ENDPOINT=http://tempo:9411/
     restart: unless-stopped
@@ -207,7 +209,7 @@ services:
         condition: service_started
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - SPRING_CONFIG_IMPORT=configserver:http://config-server:8888/
+      - SPRING_CONFIG_IMPORT=configserver:http://dockerUser:dockerSecret@config-server:8888/
       - MANAGEMENT_ZIPKIN_TRACING_ENDPOINT=http://tempo:9411
     restart: unless-stopped
     labels:
@@ -235,7 +237,7 @@ services:
         condition: service_started
     environment:
       - SPRING_PROFILES_ACTIVE= docker
-      - SPRING_CONFIG_IMPORT=configserver:http://config-server:8888/
+      - SPRING_CONFIG_IMPORT=configserver:http://dockerUser:dockerSecret@config-server:8888/
       - MANAGEMENT_ZIPKIN_TRACING_ENDPOINT=http://tempo:9411
     restart: unless-stopped
     labels:
@@ -263,7 +265,7 @@ services:
         condition: service_started
     environment:
       - SPRING_PROFILES_ACTIVE= docker
-      - SPRING_CONFIG_IMPORT=configserver:http://config-server:8888/
+      - SPRING_CONFIG_IMPORT=configserver:http://dockerUser:dockerSecret@config-server:8888/
       - MANAGEMENT_ZIPKIN_TRACING_ENDPOINT=http://tempo:9411
     restart: unless-stopped
     labels:
@@ -291,7 +293,7 @@ services:
         condition: service_started
     environment:
       SPRING_PROFILES_ACTIVE: docker
-      SPRING_CONFIG_IMPORT: configserver:http://config-server:8888/
+      SPRING_CONFIG_IMPORT: configserver:http://dockerUser:dockerSecret@config-server:8888/
       MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: http://tempo:9411
     labels:
       logging: "promtail"
diff --git a/test-em-all.sh b/test-em-all.sh
index ada30a5d..ca04e613 100755
--- a/test-em-all.sh
+++ b/test-em-all.sh
@@ -377,7 +377,7 @@ then
     docker compose -f docker-compose.yml up -d
 fi
 
-if [[ $@ == "start_all" ]]
+if [[ $@ == *"setup"* ]]
 then
     echo "Restarting the test environment..."
     echo "$ docker compose -f docker-compose-tools.yml down --remove-orphans -v"
@@ -414,7 +414,7 @@ then
 fi
 
 
-if [[ $@ == *"stop_all"* ]]
+if [[ $@ == *"teardown"* ]]
 then
     echo "We are done, stopping the test environment..."
     echo "$ docker compose -f docker-compose-tools.yml down --remove-orphans -v"