mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 03:38:23 +00:00
Environment TestandClaude Sonnet 4.6
9ea2ad6ff1
- Move iter_role_images + all helpers + ImageRef from cli/mirror/util.py and
cli/mirror/model.py into utils/docker/image_discovery.py; add source_file field
to ImageRef to distinguish config/main.yml vs vars/main.yml entries
- Delete cli/mirror/util.py; update all callers to import from utils.docker.image_discovery
- Move utils into subpackages: utils/docker/ (image_ref, paths_utils, hadolint) and
utils/roles/ (dependency_resolver, resource_validation); update all imports
- Reorganise tests into subpackages: tests/lint/docker/dockerfile/, tests/integration/docker/,
tests/unit/utils/docker/, tests/unit/utils/roles/; fix parents[N] offsets after relocation
- tests/lint/docker/test_image_versions.py now uses iter_role_images (same SPOT as mirror)
- Add vars/main.yml images.<name>.{image,version} support for non-application roles
(test-e2e-playwright, sys-ctl-hlth-csp); eliminate hardcoded duplicates in defaults/tasks
- Add web-app-matrix matrix-chatgpt-bot and web-app-mini-qr mini-qr entries in config/main.yml;
replace hardcoded image strings in vars/templates with lookup('config', ...) references
- Fix sync/__main__.py log line to use correct registry prefix for non-Docker-Hub images
- Update docs/contributing/code/role/dockerfile.md with image declaration rules and SPOT reference
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
76 lines
2.5 KiB
Python
76 lines
2.5 KiB
Python
from __future__ import annotations
|
|
|
|
import unittest
|
|
|
|
from utils.docker.image_ref import is_valid_image_name, split_registry_and_name
|
|
|
|
|
|
class TestDockerImageRef(unittest.TestCase):
|
|
def test_is_valid_image_name_accepts_supported_references(self) -> None:
|
|
valid_images = (
|
|
"nginx",
|
|
"gitea/gitea",
|
|
"docker.io/library/nginx",
|
|
"ghcr.io/acme/example-app",
|
|
"registry.example:5000/team/service",
|
|
"localhost/dev/app",
|
|
)
|
|
|
|
for image in valid_images:
|
|
with self.subTest(image=image):
|
|
self.assertTrue(is_valid_image_name(image))
|
|
|
|
def test_is_valid_image_name_rejects_invalid_references(self) -> None:
|
|
invalid_images = (
|
|
None,
|
|
"",
|
|
" ",
|
|
"bad name",
|
|
"nginx:latest",
|
|
"repo@sha256:deadbeef",
|
|
"docker.io/library/nginx:latest",
|
|
"registry.example:5000/team/service:1.2",
|
|
"UPPERCASE/app",
|
|
)
|
|
|
|
for image in invalid_images:
|
|
with self.subTest(image=image):
|
|
self.assertFalse(is_valid_image_name(image))
|
|
|
|
def test_split_registry_and_name_for_implicit_docker_hub_images(self) -> None:
|
|
cases = {
|
|
"nginx": (None, "nginx"),
|
|
"gitea/gitea": (None, "gitea/gitea"),
|
|
" library/postgres ": (None, "library/postgres"),
|
|
}
|
|
|
|
for image, expected in cases.items():
|
|
with self.subTest(image=image):
|
|
self.assertEqual(split_registry_and_name(image), expected)
|
|
|
|
def test_split_registry_and_name_for_explicit_registries(self) -> None:
|
|
cases = {
|
|
"docker.io/library/nginx": ("docker.io", "library/nginx"),
|
|
"ghcr.io/acme/example-app": ("ghcr.io", "acme/example-app"),
|
|
"registry.example:5000/team/service": (
|
|
"registry.example:5000",
|
|
"team/service",
|
|
),
|
|
"localhost/dev/app": ("localhost", "dev/app"),
|
|
}
|
|
|
|
for image, expected in cases.items():
|
|
with self.subTest(image=image):
|
|
self.assertEqual(split_registry_and_name(image), expected)
|
|
|
|
def test_split_registry_and_name_returns_none_for_invalid_images(self) -> None:
|
|
invalid_images = ("bad name", "nginx:latest", "repo@sha256:deadbeef")
|
|
|
|
for image in invalid_images:
|
|
with self.subTest(image=image):
|
|
self.assertIsNone(split_registry_and_name(image))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|