Fix states in get_runners methods

canonical · Aug 27, 2024 · a473b68 · a473b68
1 parent 7c5a78e
commit a473b68
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src-docs/openstack_cloud.openstack_runner_manager.md b/src-docs/openstack_cloud.openstack_runner_manager.md
@@ -131,7 +131,7 @@ The prefix of runner names.
 
 ---
 
-<a href="../src/openstack_cloud/openstack_runner_manager.py#L303"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../src/openstack_cloud/openstack_runner_manager.py#L305"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ### <kbd>method</kbd> `cleanup`
 
@@ -184,7 +184,7 @@ Create a self-hosted runner.
 
 ---
 
-<a href="../src/openstack_cloud/openstack_runner_manager.py#L252"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../src/openstack_cloud/openstack_runner_manager.py#L254"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ### <kbd>method</kbd> `delete_runner`
 
@@ -208,7 +208,7 @@ Delete self-hosted runners.
 
 ---
 
-<a href="../src/openstack_cloud/openstack_runner_manager.py#L278"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../src/openstack_cloud/openstack_runner_manager.py#L280"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ### <kbd>method</kbd> `flush_runners`
 

diff --git a/src/manager/github_runner_manager.py b/src/manager/github_runner_manager.py
@@ -72,12 +72,16 @@ def get_runners(
             Information on the runners.
         """
         runner_list = self.github.get_runner_github_info(self._path)
+        runner_list = [runner for runner in runner_list if runner.name.startswith(self._prefix)]
+
+        if states is None:
+            return tuple(runner_list)
+
         state_set = set(states)
         return tuple(
             runner
             for runner in runner_list
-            if runner.name.startswith(self._prefix)
-            and GitHubRunnerManager._is_runner_in_state(runner, state_set)
+            if GitHubRunnerManager._is_runner_in_state(runner, state_set)
         )
 
     def delete_runners(self, states: Iterable[GitHubRunnerState] | None = None) -> None:

diff --git a/src/openstack_cloud/openstack_runner_manager.py b/src/openstack_cloud/openstack_runner_manager.py
@@ -247,7 +247,9 @@ def get_runners(
         ]
         if states is None:
             return tuple(instance_list)
-        return tuple(instance for instance in instance_list if instance.state in states)
+
+        state_set = set(states)
+        return tuple(instance for instance in instance_list if instance.state in state_set)
 
     def delete_runner(
         self, instance_id: InstanceId, remove_token: str