Skip to content

Commit b2250c7

Browse files
authored
chore: rename cloud-runner-manager to vm-manager (#607)
* chore: rename cloud-runner-manager to vm-manager * chore: rename cloud-runner-manager to vm-manager
1 parent a29fca9 commit b2250c7

File tree

16 files changed

+24
-62
lines changed

16 files changed

+24
-62
lines changed

github-runner-manager/src/github_runner_manager/manager/runner_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
from github_runner_manager import constants
1515
from github_runner_manager.errors import GithubMetricsError, RunnerError
16-
from github_runner_manager.manager.cloud_runner_manager import (
16+
from github_runner_manager.manager.models import InstanceID, RunnerIdentity, RunnerMetadata
17+
from github_runner_manager.manager.vm_manager import (
1718
CloudRunnerInstance,
1819
CloudRunnerManager,
1920
CloudRunnerState,
2021
HealthState,
2122
)
22-
from github_runner_manager.manager.models import InstanceID, RunnerIdentity, RunnerMetadata
2323
from github_runner_manager.metrics import events as metric_events
2424
from github_runner_manager.metrics import github as github_metrics
2525
from github_runner_manager.metrics import runner as runner_metrics

github-runner-manager/src/github_runner_manager/manager/runner_scaler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
MissingServerConfigError,
1717
ReconcileError,
1818
)
19-
from github_runner_manager.manager.cloud_runner_manager import HealthState
2019
from github_runner_manager.manager.runner_manager import (
2120
FlushMode,
2221
IssuedMetricEventsStats,
2322
RunnerInstance,
2423
RunnerManager,
2524
RunnerMetadata,
2625
)
26+
from github_runner_manager.manager.vm_manager import HealthState
2727
from github_runner_manager.metrics import events as metric_events
2828
from github_runner_manager.metrics.reconcile import (
2929
BUSY_RUNNERS_COUNT,

github-runner-manager/src/github_runner_manager/manager/cloud_runner_manager.py renamed to github-runner-manager/src/github_runner_manager/manager/vm_manager.py

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -94,33 +94,6 @@ def from_openstack_server_status( # pragma: no cover
9494
return state
9595

9696

97-
class CloudInitStatus(str, Enum):
98-
"""Represents the state of cloud-init script.
99-
100-
The cloud init script is used to launch ephemeral GitHub runners. If the script is being
101-
initialized, GitHub runner is listening for jobs or GitHub runner is running the job, the
102-
cloud-init script should report "running" status.
103-
104-
Refer to the official documentation on cloud-init status:
105-
https://cloudinit.readthedocs.io/en/latest/howto/status.html.
106-
107-
Attributes:
108-
NOT_STARTED: The cloud-init script has not yet been started.
109-
RUNNING: The cloud-init script is running.
110-
DONE: The cloud-init script has completed successfully.
111-
ERROR: There was an error while running the cloud-init script.
112-
DEGRADED: There was a non-critical issue while running the cloud-inits script.
113-
DISABLED: Cloud init was disabled by other system configurations.
114-
"""
115-
116-
NOT_STARTED = "not started"
117-
RUNNING = "running"
118-
DONE = "done"
119-
ERROR = "error"
120-
DEGRADED = "degraded"
121-
DISABLED = "disabled"
122-
123-
12497
@dataclass
12598
class CloudRunnerInstance:
12699
"""Information on the runner on the cloud.
@@ -261,6 +234,7 @@ def get_runners(self) -> Sequence[CloudRunnerInstance]:
261234
"""Get cloud self-hosted runners."""
262235

263236
@abc.abstractmethod
237+
# Abstract methods do not have a return value, ignore the docstring error DCO031
264238
def delete_vms(self, instance_ids: Sequence[InstanceID]) -> list[InstanceID]:
265239
"""Delete cloud VM instances.
266240
@@ -269,9 +243,10 @@ def delete_vms(self, instance_ids: Sequence[InstanceID]) -> list[InstanceID]:
269243
270244
Returns:
271245
The deleted instance IDs.
272-
"""
246+
""" # noqa: DCO031
273247

274248
@abc.abstractmethod
249+
# Abstract methods do not have a return value, ignore the docstring error DCO031
275250
def extract_metrics(self, instance_ids: Sequence[InstanceID]) -> list[RunnerMetrics]:
276251
"""Extract metrics from cloud VMs.
277252
@@ -280,7 +255,7 @@ def extract_metrics(self, instance_ids: Sequence[InstanceID]) -> list[RunnerMetr
280255
281256
Returns:
282257
The fetched runner metrics.
283-
"""
258+
""" # noqa: DCO031
284259

285260
@abc.abstractmethod
286261
def cleanup(self) -> None:

github-runner-manager/src/github_runner_manager/metrics/events.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from pydantic import BaseModel, NonNegativeFloat
1010

1111
from github_runner_manager.errors import IssueMetricEventError
12-
from github_runner_manager.manager.cloud_runner_manager import CodeInformation
12+
from github_runner_manager.manager.vm_manager import CodeInformation
1313

1414
METRICS_LOG_PATH = Path("/var/log/github-runner-metrics.log")
1515

github-runner-manager/src/github_runner_manager/metrics/runner.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
from pydantic import ValidationError
1818

1919
from github_runner_manager.errors import IssueMetricEventError, RunnerMetricsError, SSHError
20-
from github_runner_manager.manager.cloud_runner_manager import (
21-
PostJobMetrics,
22-
PreJobMetrics,
23-
RunnerMetrics,
24-
)
2520
from github_runner_manager.manager.models import InstanceID
21+
from github_runner_manager.manager.vm_manager import PostJobMetrics, PreJobMetrics, RunnerMetrics
2622
from github_runner_manager.metrics import events as metric_events
2723
from github_runner_manager.metrics.type import GithubJobMetrics
2824
from github_runner_manager.openstack_cloud.constants import (

github-runner-manager/src/github_runner_manager/openstack_cloud/openstack_runner_manager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
OpenStackError,
1717
RunnerCreateError,
1818
)
19-
from github_runner_manager.manager.cloud_runner_manager import (
19+
from github_runner_manager.manager.models import InstanceID, RunnerContext, RunnerIdentity
20+
from github_runner_manager.manager.runner_manager import HealthState
21+
from github_runner_manager.manager.vm_manager import (
2022
CloudRunnerInstance,
2123
CloudRunnerManager,
2224
CloudRunnerState,
2325
RunnerMetrics,
2426
)
25-
from github_runner_manager.manager.models import InstanceID, RunnerContext, RunnerIdentity
26-
from github_runner_manager.manager.runner_manager import HealthState
2727
from github_runner_manager.metrics import runner as runner_metrics
2828
from github_runner_manager.openstack_cloud.constants import (
2929
CREATE_SERVER_TIMEOUT,

github-runner-manager/tests/unit/factories/metrics_factory.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import factory
77

8-
from github_runner_manager.manager.cloud_runner_manager import CodeInformation
8+
from github_runner_manager.manager.vm_manager import CodeInformation
99
from github_runner_manager.metrics.events import Event, RunnerInstalled, RunnerStop
1010

1111

github-runner-manager/tests/unit/factories/runner_instance_factory.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@
88

99
import factory
1010

11-
from github_runner_manager.manager.cloud_runner_manager import (
12-
CloudRunnerInstance,
13-
CloudRunnerState,
14-
)
15-
from github_runner_manager.manager.cloud_runner_manager import HealthState as CloudHelathState
1611
from github_runner_manager.manager.models import InstanceID, RunnerIdentity, RunnerMetadata
1712
from github_runner_manager.manager.runner_manager import RunnerInstance
13+
from github_runner_manager.manager.vm_manager import CloudRunnerInstance, CloudRunnerState
14+
from github_runner_manager.manager.vm_manager import HealthState as CloudHelathState
1815
from github_runner_manager.platform.platform_provider import (
1916
PlatformRunnerHealth,
2017
PlatformRunnerState,

github-runner-manager/tests/unit/fake_runner_managers.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@
66

77
from pydantic import HttpUrl
88

9-
from github_runner_manager.manager.cloud_runner_manager import (
10-
CloudRunnerInstance,
11-
CloudRunnerManager,
12-
)
139
from github_runner_manager.manager.models import (
1410
InstanceID,
1511
RunnerContext,
1612
RunnerIdentity,
1713
RunnerMetadata,
1814
)
15+
from github_runner_manager.manager.vm_manager import CloudRunnerInstance, CloudRunnerManager
1916
from github_runner_manager.metrics.runner import RunnerMetrics
2017
from github_runner_manager.openstack_cloud.openstack_cloud import _MAX_NOVA_COMPUTE_API_VERSION
2118
from github_runner_manager.platform.platform_provider import (

github-runner-manager/tests/unit/manager/test_runner_manager.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77

88
import pytest
99

10-
from github_runner_manager.manager.cloud_runner_manager import (
11-
CloudRunnerInstance,
12-
CloudRunnerManager,
13-
)
1410
from github_runner_manager.manager.models import RunnerMetadata
1511
from github_runner_manager.manager.runner_manager import FlushMode, RunnerInstance, RunnerManager
12+
from github_runner_manager.manager.vm_manager import CloudRunnerInstance, CloudRunnerManager
1613
from github_runner_manager.platform.platform_provider import PlatformProvider
1714
from github_runner_manager.types_.github import SelfHostedRunner
1815
from tests.unit.factories.runner_instance_factory import (

0 commit comments

Comments
 (0)