Review update

Author: lordgamez

docker/test/integration/resources/reverse-proxy/Dockerfile

@@ -24,13 +24,13 @@ def wait_for(action, timeout_seconds, *args, **kwargs) -> bool:
         result = action(*args, **kwargs)
         if result:
             return result
-        time.sleep(1)
         if timeout_seconds < (time.perf_counter() - start_time):
             break
+        time.sleep(1)
     return False
 
 
-def veify_log_lines_on_grafana_loki(host: str, lines: list[str], ssl: bool, tenant_id: str) -> bool:
+def verify_log_lines_on_grafana_loki(host: str, lines: list[str], ssl: bool, tenant_id: str) -> bool:
     labels = '{job="minifi"}'
     prefix = "http://"
     if ssl:
@@ -61,7 +61,7 @@ def veify_log_lines_on_grafana_loki(host: str, lines: list[str], ssl: bool, tena
 
 
 def wait_for_lines_on_grafana_loki(host: str, lines: list[str], timeout_seconds: int, ssl: bool, tenant_id: str) -> bool:
-    return wait_for(lambda: veify_log_lines_on_grafana_loki(host, lines, ssl, tenant_id), timeout_seconds)
+    return wait_for(lambda: verify_log_lines_on_grafana_loki(host, lines, ssl, tenant_id), timeout_seconds)
 
 
 if __name__ == "__main__":

docker/test/integration/resources/reverse-proxy/nginx-basic-auth.conf

@@ -1,11 +1,8 @@
-# Source: https://gist.github.com/laurentbel/c4c7696890fc71c8061172a932eb52e4
-FROM nginx:1.25.3
+FROM nginx:1.29.4
 
-RUN apt-get update -y && apt-get install -y apache2-utils && rm -rf /var/lib/apt/lists/*
+COPY nginx.conf.template /nginx.conf.template
+COPY run.sh /run.sh
 
-WORKDIR /
-COPY nginx-basic-auth.conf nginx-basic-auth.conf
+RUN apt update -y && apt install -y apache2-utils && rm /etc/nginx/conf.d/default.conf && chmod 0755 /run.sh
 
-COPY run.sh ./
-RUN chmod 0755 ./run.sh
-CMD [ "./run.sh" ]
+ENTRYPOINT [ "/run.sh" ]

docker/test/integration/resources/reverse-proxy/run.sh

@@ -0,0 +1,10 @@
+server {
+  listen 3030;
+  server_name default_server;
+
+  location / {
+    proxy_pass http://${FORWARD_HOST}:${FORWARD_PORT};
+    auth_basic "Administrator’s Area";
+    auth_basic_user_file /etc/nginx/.htpasswd;
+  }
+}

extensions/grafana-loki/tests/features/resources/check_log_lines_on_grafana.py

@@ -1,5 +1,7 @@
-#!/bin/sh
-# Source: https://gist.github.com/laurentbel/c4c7696890fc71c8061172a932eb52e4
-envsubst < nginx-basic-auth.conf > /etc/nginx/conf.d/default.conf
-htpasswd -c -b /etc/nginx/.htpasswd "${BASIC_USERNAME}" "${BASIC_PASSWORD}"
-exec nginx -g "daemon off;"
+#!/bin/bash
+
+htpasswd -bc /etc/nginx/.htpasswd "${BASIC_USERNAME}" "${BASIC_PASSWORD}"
+
+envsubst '${FORWARD_HOST} ${FORWARD_PORT}' < /nginx.conf.template > /etc/nginx/conf.d/default.conf
+
+nginx -g "daemon off;"

extensions/grafana-loki/tests/features/resources/reverse-proxy/Dockerfile

@@ -21,6 +21,7 @@
 from minifi_test_framework.containers.file import File
 from minifi_test_framework.core.minifi_test_context import MinifiTestContext
 from minifi_test_framework.core.ssl_utils import make_server_cert
+from docker.errors import ContainerError
 
 
 class GrafanaLokiOptions:
@@ -140,6 +141,11 @@ def are_lines_present(self, lines: str, timeout: int, ssl: bool, tenant_id: str
             self.client.containers.run("minifi-grafana-loki-helper:latest", ["python", "/scripts/check_log_lines_on_grafana.py", self.container_name, lines, str(timeout), str(ssl), tenant_id],
                                        remove=True, stdout=True, stderr=True, network=self.network.name)
             return True
+        except ContainerError as e:
+            stdout = e.stdout.decode("utf-8", errors="replace") if e.stdout else ""
+            stderr = e.stderr.decode("utf-8", errors="replace") if e.stderr else ""
+            logging.error(f"Failed to run python command in grafana loki helper docker with error: '{e}', stdout: '{stdout}', stderr: '{stderr}'")
+            return False
         except Exception as e:
-            logging.error(f"Failed to run python command in grafana loki helper docker: {e}")
+            logging.error(f"Unexpected error while running python command in grafana loki helper docker: '{e}'")
             return False

extensions/grafana-loki/tests/features/resources/reverse-proxy/nginx-basic-auth.conf

@@ -42,22 +42,22 @@ def step_impl(context: MinifiTestContext):
 @then("\"{lines}\" lines are published to the Grafana Loki server in less than {timeout_seconds:d} seconds")
 @then("\"{lines}\" line is published to the Grafana Loki server in less than {timeout_seconds:d} seconds")
 def step_impl(context, lines: str, timeout_seconds: int):
-    assert context.containers["grafana-loki-server"].are_lines_present(lines, timeout_seconds, False) or log_due_to_failure(context)
+    assert context.containers["grafana-loki-server"].are_lines_present(lines, timeout_seconds, ssl=False) or log_due_to_failure(context)
 
 
 @then("\"{lines}\" lines are published to the \"{tenant_id}\" tenant on the Grafana Loki server in less than {timeout_seconds:d} seconds")
 @then("\"{lines}\" line is published to the \"{tenant_id}\" tenant on the Grafana Loki server in less than {timeout_seconds:d} seconds")
 def step_impl(context, lines: str, timeout_seconds: int, tenant_id: str):
-    assert context.containers["grafana-loki-server"].are_lines_present(lines, timeout_seconds, False, tenant_id) or log_due_to_failure(context)
+    assert context.containers["grafana-loki-server"].are_lines_present(lines, timeout_seconds, ssl=False, tenant_id=tenant_id) or log_due_to_failure(context)
 
 
 @then("\"{lines}\" lines are published using SSL to the Grafana Loki server in less than {timeout_seconds:d} seconds")
 @then("\"{lines}\" line is published using SSL to the Grafana Loki server in less than {timeout_seconds:d} seconds")
 def step_impl(context, lines: str, timeout_seconds: int):
-    assert context.containers["grafana-loki-server"].are_lines_present(lines, timeout_seconds, True) or log_due_to_failure(context)
+    assert context.containers["grafana-loki-server"].are_lines_present(lines, timeout_seconds, ssl=True) or log_due_to_failure(context)
 
 
 # Nginx reverse proxy
-@step(u'a reverse proxy is set up to forward requests to the Grafana Loki server')
+@step('a reverse proxy is set up to forward requests to the Grafana Loki server')
 def step_impl(context):
     context.containers["reverse-proxy"] = ReverseProxyContainer(context)