misc: QA and PR review fixes

Author: rboni-dk

.gitignore

@@ -9,7 +9,7 @@ dk-*-credentials.txt
 
 # Docker
 docker-compose.yml
-docker-compose.yaml
+obs-docker-compose.yml
 
 # Logs
 testgen_demo.log

README.md

@@ -49,10 +49,10 @@ And it allows you to <b>make fast, safe development changes</b>.
 
 #### Requirements for TestGen & Observability
 
-| Software                | Tested Versions               | Command to check version                |
-|-------------------------|-------------------------|-------------------------------|
-| [Python](https://www.python.org/downloads/) <br/>- Most Linux and macOS systems have Python pre-installed. <br/>- On Windows machines, you will need to download and install it.        | 3.9, 3.10, 3.11, 3.12                | `python3 --version`                |
-| [Docker](https://docs.docker.com/get-docker/) <br/>[Docker Compose](https://docs.docker.com/compose/install/)         | 26.1, 27.5, 28.1 <br/> 2.34, 2.35, 2.36        | `docker -v` <br/> `docker compose version`         |
+| Software                | Tested Versions                         | Command to check version                |
+|-------------------------|-----------------------------------------|-------------------------------|
+| [Python](https://www.python.org/downloads/) <br/>- Most Linux and macOS systems have Python pre-installed. <br/>- On Windows machines, you will need to download and install it.        | 3.9, 3.10, 3.11, 3.12, 3.13             | `python3 --version`                |
+| [Docker](https://docs.docker.com/get-docker/) <br/>[Docker Compose](https://docs.docker.com/compose/install/)         | 26.1, 27.5, 28.5 <br/> 2.38, 2.39, 2.40 | `docker -v` <br/> `docker compose version`         |
 
 
 ### Download the installer

demo/demo/main.py

@@ -1,67 +1,45 @@
+import signal
+
 from demo_helper import Config
-from observability_demo import run_obs_demo, delete_obs_demo 
+from observability_demo import run_obs_demo, delete_obs_demo
 from heartbeat_demo import run_heartbeat_demo
-from testgen_demo import run_tg_demo, delete_tg_demo 
+from testgen_demo import run_tg_demo, delete_tg_demo
 from argparse import ArgumentParser
 
 
-def init_args() -> ArgumentParser:
-    parser = ArgumentParser(
-        description="""
-            This is a tool to create a demo of DataOps Observability & TestGen.
-            """,
-    )
-    subparsers = parser.add_subparsers(title="subcommands")
+def init_parser() -> ArgumentParser:
+    parser = ArgumentParser(description="This is a tool to create a demo of DataOps Observability & TestGen.")
+    subparsers = parser.add_subparsers(title="subcommands", required=True)
 
-    obs_run_parser = subparsers.add_parser(
-        "obs-run-demo",
-        description="Run the Observability demo",
-    )
-    obs_run_parser.set_defaults(action="obs-run-demo")
-    
-    obs_delete_parser = subparsers.add_parser(
-        "obs-delete-demo",
-        description="Delete data created by the Observability demo",
+    commands = (
+        ("obs-run-demo", "Run the Observability demo", run_obs_demo),
+        ("obs-delete-demo", "Delete data created by the Observability demo", delete_obs_demo),
+        ("obs-heartbeat-demo", "Run the Observability Heartbeat demo", run_heartbeat_demo),
+        ("tg-run-demo", "Run the TestGen demo", run_tg_demo),
+        ("tg-delete-demo", "Delete data created by the TestGen demo", delete_tg_demo),
     )
-    obs_delete_parser.set_defaults(action="obs-delete-demo")
 
-    obs_heartbeat_parser = subparsers.add_parser(
-        "obs-heartbeat-demo",
-        description="Run the Observability Heartbeat demo",
-    )
-    obs_heartbeat_parser.set_defaults(action="obs-heartbeat-demo")
+    for cmd, desc, func in commands:
+        sub_parser = subparsers.add_parser(cmd, description=desc)
+        sub_parser.set_defaults(func=func)
 
-    tg_run_parser = subparsers.add_parser(
-        "tg-run-demo",
-        description="Run the TestGen demo",
-    )
-    tg_run_parser.set_defaults(action="tg-run-demo")
-    
-    tg_delete_parser = subparsers.add_parser(
-        "tg-delete-demo",
-        description="Delete data created by the TestGen demo",
-    )
-    tg_delete_parser.set_defaults(action="tg-delete-demo")
+    return parser
+
+
+def init_signal_handler():
+    def _keyboard_interrupt(_signum, _frame):
+        raise KeyboardInterrupt
+
+    # Docker sends SIGTERM on Ctrl-C, so we raise a KeyboardInterrupt
+    signal.signal(signal.SIGTERM, _keyboard_interrupt)
 
-    return parser.parse_args()
 
 def main():
-    args = init_args()
+    init_signal_handler()
+    args = init_parser().parse_args()
     config = Config()
-
-    if args.action == "obs-run-demo":
-        run_obs_demo(config)
-    elif args.action == "obs-delete-demo":
-        delete_obs_demo(config)
-    elif args.action == "obs-heartbeat-demo":
-        run_heartbeat_demo(config)
-    elif args.action == "tg-run-demo":
-        run_tg_demo(config)
-    elif args.action == "tg-delete-demo":
-        delete_tg_demo(config)
-    else:
-        print(f"Command [{args.action}] not recognized.")
+    args.func(config)
 
 
 if __name__ == "__main__":
-    main()
+    main()

dk-installer.py

@@ -1464,7 +1464,6 @@ def get_compose_file_contents(self, action, args):
               observability_data_init:
                 container_name: data-init
                 image: ${DK_OBSERVABILITY_BE_IMAGE:-}
-                pull_policy: never # XXX
                 restart: on-failure
                 depends_on:
                   database:
@@ -1480,7 +1479,6 @@ def get_compose_file_contents(self, action, args):
               observability_backend:
                 container_name: back-end
                 image: ${DK_OBSERVABILITY_BE_IMAGE:-}
-                pull_policy: never # XXX
                 restart: always
                 depends_on:
                   observability_data_init:
@@ -1499,7 +1497,6 @@ def get_compose_file_contents(self, action, args):
               observability_ui:
                 container_name: user-interface
                 image: ${DK_OBSERVABILITY_UI_IMAGE:-}
-                pull_policy: never # XXX
                 restart: always
                 depends_on:
                   observability_backend: