cert handling

.gitignore

@@ -1,4 +1,3 @@
-cert
 output
 cert/
 token.sh
@@ -9,3 +8,4 @@ example.manifest.json
 .idea
 dist
 foobar.json
+tests/__pycache__/

Makefile

@@ -11,6 +11,9 @@ ifneq (,$(wildcard ./.env))
     export
 endif
 
+gencert:
+	./cert/gencert.sh
+
 serve-oci:
 	zot serve $(ZOT_CONFIG_FILE)
 
@@ -29,7 +32,7 @@ install_deps: ## Install dependencies.
 	$(VENV)/bin/pip install -r requirements.txt
 
 
-example-%:
+example-%: gencert
 	@echo "==== DEMO ===="
 	@echo "=== Inspect oci-index"
 	$(PYTHON) -m gloci.cli image inspect-index --container $(CONTAINER_NAME_$@) --version $(CONTAINER_IMAGE_VERSION)

cert/gencert.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+CERT_NAME="$SCRIPT_DIR/oci-sign"
+
+
+openssl req -x509 -newkey rsa -pkeyopt rsa_keygen_bits:4096  -days 3650 -nodes -keyout $CERT_NAME.key -out $CERT_NAME.crt -subj "/CN=Garden Linux test signing key for oci"
+

tests/conftest.py

@@ -0,0 +1,5 @@
+from .helper import call_command
+
+def pytest_sessionstart(session):
+    call_command("./cert/gencert.sh")
+

tests/helper.py

@@ -0,0 +1,20 @@
+import subprocess
+import shlex
+
+def spawn_background_process(command):
+    process = subprocess.Popen(command)
+    return process
+
+
+def call_command(cmd):
+    try:
+        args = shlex.split(cmd)
+        result = subprocess.run(
+            args, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+        output = result.stdout.decode("utf-8")
+        return output
+
+    except subprocess.CalledProcessError as e:
+        error_message = e.stderr.decode("utf-8")
+        return f"An error occurred: {error_message}"

tests/test_push_image.py

@@ -1,38 +1,19 @@
 import subprocess
 from dotenv import load_dotenv
-import shlex
 import pytest
 from click.testing import CliRunner
 from gloci.cli import cli
-
-
+from .helper import spawn_background_process
 ZOT_CONFIG_FILE = "./zot/config.json"
 CONTAINER_NAME_ZOT_EXAMPLE = "localhost:8081/examplecontainer2"
 
 
-def spawn_background_process(command):
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    return process
-
-
-def call_command(cmd):
-    try:
-        args = shlex.split(cmd)
-        result = subprocess.run(
-            args, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
-        output = result.stdout.decode("utf-8")
-        return output
 
-    except subprocess.CalledProcessError as e:
-        error_message = e.stderr.decode("utf-8")
-        return f"An error occurred: {error_message}"
-
-
-@pytest.fixture
 def setup_test_environment():
+    print("Spawning zot registry")
     zot_process = spawn_background_process(f"zot serve {ZOT_CONFIG_FILE}")
 
+
     yield zot_process
 
     zot_process.terminate()
@@ -73,11 +54,9 @@ def test_push_example(info_yaml_path, version, cname, arch):
         ],
     )
     if result.exit_code != 0:
-        # Print the output and error message for debugging
         print(f"Exit Code: {result.exit_code}")
         print(f"Output: {result.output}")
         print(
             f"Error: {result.stderr}"
-        )  # If stderr was captured (can also be in result.output)
-
+        )
     assert result.exit_code == 0