From 8abe0a591132e6919c36672788ec10b566445267 Mon Sep 17 00:00:00 2001 From: gchqdev227 <62302861+gchqdev227@users.noreply.github.com> Date: Wed, 1 Oct 2025 11:32:17 +0100 Subject: [PATCH 1/2] Replaced base image with newer version --- .github/workflows/unit-tests.yaml | 3 ++- tests/test_resource.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 9e55f20..26b0ed8 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -17,7 +17,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Pull docker image run: | - docker pull concourse/mock-resource:0.13.0 + IMAGE=$(python -c "import tests.test_resource; print(tests.test_resource.CONCOURSE_MOCK_RESOURCE_IMAGE)") + docker pull $IMAGE - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/tests/test_resource.py b/tests/test_resource.py index 1d8b2fc..72dbb01 100644 --- a/tests/test_resource.py +++ b/tests/test_resource.py @@ -15,6 +15,8 @@ run_command) from tests.resource import ConcourseMockResource, ConcourseMockVersion, TestResource, TestVersion +CONCOURSE_MOCK_RESOURCE_IMAGE = "concourse/mock-resource:0.14.1-20250809" + class SimpleWrapperTests(TestCase): @@ -742,7 +744,6 @@ def _build_test_resource_docker_image() -> str: class ExternalDockerWrapperTests(TestCase): - image = "concourse/mock-resource:0.13.0" @classmethod def setUpClass(cls) -> None: @@ -756,7 +757,7 @@ def setUp(self) -> None: "log": "Debug message", "metadata": [{"name": "key", "value": "value"}], } - self.wrapper = DockerTestResourceWrapper(config, self.image) + self.wrapper = DockerTestResourceWrapper(config, CONCOURSE_MOCK_RESOURCE_IMAGE) def test_check_step_with_version_no_debugging(self) -> None: version_config = {"version": "1", "privileged": "true"} @@ -929,7 +930,6 @@ def _format_debugging_message(message: str) -> str: class ExternalDockerConversionWrapperTests(TestCase): - image = "concourse/mock-resource:0.13.0" @classmethod def setUpClass(cls) -> None: @@ -943,7 +943,7 @@ def setUp(self) -> None: "log": "Debug message", "metadata": [{"name": "key", "value": "value"}], } - self.wrapper = DockerConversionTestResourceWrapper(ConcourseMockResource, config, self.image) + self.wrapper = DockerConversionTestResourceWrapper(ConcourseMockResource, config, CONCOURSE_MOCK_RESOURCE_IMAGE) def test_check_step_with_version_no_debugging(self) -> None: version = ConcourseMockVersion(version=1, privileged=True) From 1005194b1473fdbcf98698c44b2ede98ec076aa9 Mon Sep 17 00:00:00 2001 From: gchqdev227 <62302861+gchqdev227@users.noreply.github.com> Date: Wed, 1 Oct 2025 11:35:13 +0100 Subject: [PATCH 2/2] Fixed expected environment variables for external mock resource image --- tests/test_resource.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_resource.py b/tests/test_resource.py index 72dbb01..483b421 100644 --- a/tests/test_resource.py +++ b/tests/test_resource.py @@ -913,7 +913,8 @@ def test_out_step_print_env_vars(self) -> None: ]) expected_env_lines = { - self._format_debugging_message("env: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin "), + self._format_debugging_message("env: PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin "), + self._format_debugging_message("env: SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt "), self._format_debugging_message("env: HOSTNAME=resource"), self._format_debugging_message("env: HOME=/root"), }