fix: refactor construct connection string script [run-ui-tests]

Author: omrozowicz-splunk

Dockerfile

@@ -26,7 +26,7 @@ RUN mkdir /.pysnmp && chown 10001:10001 /.pysnmp
 RUN chown 10001:10001 /tmp
 COPY --from=builder /app/.venv /app/.venv
 COPY entrypoint.sh /app/entrypoint.sh
-COPY construct-redis-url.sh /app/construct-redis-url.sh
-RUN chmod +x /app/construct-redis-url.sh /app/entrypoint.sh
+COPY construct-connection-strings.sh /app/construct-connection-strings.sh
+RUN chmod +x /app/construct-connection-strings.sh /app/entrypoint.sh
 USER 10001:10001
 ENTRYPOINT ["/app/entrypoint.sh"]

construct-redis-url.sh construct-connection-strings.shconstruct-redis-url.sh renamed to construct-connection-strings.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env sh
-# Constructs REDIS_URL and CELERY_BROKER_URL from components if not already set
+# Constructs Redis and MongoDB connection strings based on environment variables
+
+############################
+       ### REDIS ###
+############################
 
 # Detect mode
 REDIS_MODE="${REDIS_MODE:-standalone}"
@@ -61,6 +65,10 @@ if [ -z "$REDIS_URL" ] || [ -z "$CELERY_BROKER_URL" ]; then
     REDIS_DEPENDENCIES="${REDIS_URL} ${CELERY_BROKER_URL}"
   fi
 
+############################
+      ### MongoDB ###
+############################
+
   # Build MongoDB URI from environment variables
   if [ -n "$MONGODB_PASSWORD" ]; then
     # With authentication

entrypoint.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 set -e
 . /app/.venv/bin/activate
-. /app/construct-redis-url.sh
+. /app/construct-connection-strings.sh
 LOG_LEVEL=${LOG_LEVEL:=INFO}
 WORKER_CONCURRENCY=${WORKER_CONCURRENCY:=4}
 

splunk_connect_for_snmp/celery_config.py

@@ -64,7 +64,7 @@
         "queue_order_strategy": "priority",
     }
 
-# Should be set by ./construct-redis-url.sh script
+# Should be set by ./construct-connection-strings.sh script
 redbeat_redis_url = os.getenv("REDIS_URL")
 broker_url = os.getenv("CELERY_BROKER_URL")
 

ui_tests/config/ui_values.yaml

@@ -3,12 +3,12 @@ UI:
   frontEnd:
     NodePort: 30001
     repository: ghcr.io/splunk/sc4snmp-ui/frontend/container
-    tag: "1.1.2-beta.1"
+    tag: "1.1.2-beta.2"
     pullPolicy: "Always"
   backEnd:
     NodePort: 30002
     repository: ghcr.io/splunk/sc4snmp-ui/backend/container
-    tag: "1.1.2-beta.1"
+    tag: "1.1.2-beta.2"
     pullPolicy: "Always"
   init:
     image: registry.access.redhat.com/ubi9/ubi