Merge 64f9fc7 into b35b3be

canonical · Jan 10, 2025 · e0e94ec · e0e94ec
2 parents b35b3be + 64f9fc7
commit e0e94ec
Show file tree

Hide file tree

Showing 70 changed files with 76 additions and 74 deletions.
diff --git a/actions.yaml b/actions.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 check-runners:

diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 type: charm

diff --git a/config.yaml b/config.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 options:

diff --git a/generate-src-docs.sh b/generate-src-docs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 lazydocs --no-watermark --output-path src-docs src/*.py

diff --git a/metadata.yaml b/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 name: github-runner

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 [tool.bandit]

diff --git a/requirements.txt b/requirements.txt
@@ -12,5 +12,4 @@ cosl ==0.0.47
 # juju 3.1.2.0 depends on pyyaml<=6.0 and >=5.1.2
 PyYAML ==6.0.*
 pyOpenSSL==24.3.0
-allure-pytest>=2.8.18
 ./github-runner-manager
diff --git a/scripts/build-lxd-image.sh b/scripts/build-lxd-image.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 set -e

diff --git a/scripts/build-openstack-image.sh b/scripts/build-openstack-image.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 set -euo pipefail

diff --git a/scripts/pre-integration-test.sh b/scripts/pre-integration-test.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Enable kernel module br_netfilter

diff --git a/scripts/repo_policy_compliance_service.py b/scripts/repo_policy_compliance_service.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Flask application for repo policy compliance.

diff --git a/scripts/setup-lxd.sh b/scripts/setup-lxd.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 # Script to setup LXD for testing

diff --git a/src/charm.py b/src/charm.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # TODO: 2024-03-12 The module contains too many lines which are scheduled for refactoring.

diff --git a/src/charm_state.py b/src/charm_state.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 # TODO: 2024-06-26 The charm contains a lot of states and configuration. The upcoming refactor will

diff --git a/src/errors.py b/src/errors.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Errors used by the charm."""

diff --git a/src/event_timer.py b/src/event_timer.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """EventTimer for scheduling dispatch of juju event on regular intervals."""

diff --git a/src/firewall.py b/src/firewall.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """The runner firewall manager."""

diff --git a/src/github_client.py b/src/github_client.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """GitHub API client.

diff --git a/src/logrotate.py b/src/logrotate.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Logrotate setup and configuration."""

diff --git a/src/lxd.py b/src/lxd.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Low-level LXD client interface.

diff --git a/src/lxd_type.py b/src/lxd_type.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Types used by Lxd class.

diff --git a/src/runner.py b/src/runner.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Manage the lifecycle of runners.

diff --git a/src/runner_manager.py b/src/runner_manager.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Runner Manager manages the runners on LXD and GitHub."""

diff --git a/src/runner_manager_type.py b/src/runner_manager_type.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Types used by RunnerManager class."""

diff --git a/src/runner_type.py b/src/runner_type.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Types used by Runner class."""

diff --git a/src/shared_fs.py b/src/shared_fs.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Classes and functions to operate on the shared filesystem between the charm and the runners."""

diff --git a/src/utilities.py b/src/utilities.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Utilities used by the charm."""

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,2 +1,2 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Fixtures for github runner charm."""

diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -1,2 +1,2 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Fixtures for github runner charm integration tests."""
@@ -570,11 +570,13 @@ async def tmate_ssh_server_unit_ip_fixture(
     tmate_ssh_server_app: Application,
 ) -> bytes | str:
     """tmate-ssh-server charm unit ip."""
-    status: FullStatus = await model.get_status([tmate_ssh_server_app.name])
+    app_name = tmate_ssh_server_app.name
+    status: FullStatus = await model.get_status([app_name])
+    app_status = status.applications[app_name]
+    assert app_status is not None, f"Application {app_name} not found in status"
     try:
-        unit_status: UnitStatus = next(
-            iter(status.applications[tmate_ssh_server_app.name].units.values())
-        )
+        # mypy does not recognize that app_status is of type ApplicationStatus
+        unit_status: UnitStatus = next(iter(app_status.units.values()))  # type: ignore
         assert unit_status.public_address, "Invalid unit address"
         return unit_status.public_address
     except StopIteration as exc:

diff --git a/tests/integration/data/clouds.yaml.tmpl b/tests/integration/data/clouds.yaml.tmpl
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 clouds:
   testcloud:

diff --git a/tests/integration/helpers/__init__.py b/tests/integration/helpers/__init__.py
@@ -1,2 +1,2 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
diff --git a/tests/integration/helpers/charm_metrics.py b/tests/integration/helpers/charm_metrics.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Utilities for charm metrics integration tests."""

diff --git a/tests/integration/helpers/common.py b/tests/integration/helpers/common.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Utilities for integration test."""

diff --git a/tests/integration/helpers/lxd.py b/tests/integration/helpers/lxd.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 import json
 import logging

diff --git a/tests/integration/helpers/openstack.py b/tests/integration/helpers/openstack.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 import logging
 import secrets

diff --git a/tests/integration/test_charm_base_image.py b/tests/integration/test_charm_base_image.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm containing one runner."""

diff --git a/tests/integration/test_charm_fork_repo.py b/tests/integration/test_charm_fork_repo.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm with a fork repo.

diff --git a/tests/integration/test_charm_lxd_runner.py b/tests/integration/test_charm_lxd_runner.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm containing one runner."""

diff --git a/tests/integration/test_charm_metrics_failure.py b/tests/integration/test_charm_metrics_failure.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Integration tests for metrics/logs assuming Github workflow failures or a runner crash."""

diff --git a/tests/integration/test_charm_metrics_success.py b/tests/integration/test_charm_metrics_success.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Integration tests for metrics/logs assuming no Github workflow failures."""

diff --git a/tests/integration/test_charm_no_runner.py b/tests/integration/test_charm_no_runner.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm with no runner."""

diff --git a/tests/integration/test_charm_runner.py b/tests/integration/test_charm_runner.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm containing one runner."""

diff --git a/tests/integration/test_charm_scheduled_events.py b/tests/integration/test_charm_scheduled_events.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm with scheduled events.

diff --git a/tests/integration/test_charm_upgrade.py b/tests/integration/test_charm_upgrade.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Integration tests for charm upgrades."""

diff --git a/tests/integration/test_charm_with_juju_storage.py b/tests/integration/test_charm_with_juju_storage.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm with juju-storage as disk."""

diff --git a/tests/integration/test_charm_with_proxy.py b/tests/integration/test_charm_with_proxy.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Test the usage of a proxy server."""

diff --git a/tests/integration/test_debug_ssh.py b/tests/integration/test_debug_ssh.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for github-runner charm with ssh-debug integration."""

diff --git a/tests/integration/test_e2e.py b/tests/integration/test_e2e.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 from typing import AsyncIterator
 

diff --git a/tests/integration/test_reactive.py b/tests/integration/test_reactive.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Testing reactive mode. This is only supported for the OpenStack cloud."""

diff --git a/tests/integration/test_runner_manager_openstack.py b/tests/integration/test_runner_manager_openstack.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 
 """Testing the RunnerManager class with OpenStackRunnerManager as CloudManager.

diff --git a/tests/integration/test_self_hosted_runner.py b/tests/integration/test_self_hosted_runner.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Integration tests for self-hosted runner managed by the github-runner charm."""

diff --git a/tests/status_name.py b/tests/status_name.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 from ops.model import ActiveStatus, BlockedStatus

diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
@@ -1,2 +1,2 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 import copy

diff --git a/tests/unit/factories.py b/tests/unit/factories.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Factories for generating test data."""

diff --git a/tests/unit/mock.py b/tests/unit/mock.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Mock for testing."""

diff --git a/tests/unit/mock_runner_managers.py b/tests/unit/mock_runner_managers.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 import random

diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Test cases for GithubRunnerCharm."""

diff --git a/tests/unit/test_charm_state.py b/tests/unit/test_charm_state.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 import json
 import logging

diff --git a/tests/unit/test_event_timer.py b/tests/unit/test_event_timer.py
@@ -1,4 +1,4 @@
-#  Copyright 2024 Canonical Ltd.
+#  Copyright 2025 Canonical Ltd.
 #  See LICENSE file for licensing details.
 import secrets
 

diff --git a/tests/unit/test_firewall.py b/tests/unit/test_firewall.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Test cases for firewall module."""