Skip to content

Commit f87a676

Browse files
committed
#V2 - migrate action logic to shared github_actions.common package
1 parent 74e4e05 commit f87a676

File tree

13 files changed

+18
-626
lines changed

13 files changed

+18
-626
lines changed

main.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22

33
import sys
44

5+
from github_actions.common import AllowEnvironments
6+
from github_actions.common import Credentials
7+
from github_actions.common import ExtendedEnvironmentSelector
8+
from github_actions.common import GitHubContext
9+
from github_actions.common import ProjectInitializer, GETTenant
10+
from github_actions.common import RMKInstaller
11+
512
from src.actions.actions import RMKCLIExecutor
6-
from src.actions.init_project import ProjectInitializer, GETTenant
7-
from src.credentials.cluster_provider_credentials import Credentials
8-
from src.input_output.input import ArgumentParser
9-
from src.select_environment.allowed_environments import AllowEnvironments
10-
from src.select_environment.select_environment import ExtendedEnvironmentSelector
11-
from src.utils.github_environment_variables import GitHubContext
12-
from src.utils.install_rmk import RMKInstaller
13+
from src.input_output.input import GitLabflowCDArgumentParser
1314

1415
if __name__ == "__main__":
1516
try:
1617
"""Parse command-line arguments"""
17-
args = ArgumentParser().parse_args()
18+
args = GitLabflowCDArgumentParser().parse_args()
1819

1920
"""Retrieve GitHub Action environment variables"""
2021
github_context = GitHubContext.from_env(
@@ -40,7 +41,7 @@
4041
tenant = GETTenant(environment).execute()
4142

4243
"""Execute the RMK command"""
43-
RMKCLIExecutor(github_context, args, environment, tenant).execute()
44+
# RMKCLIExecutor(github_context, args, environment, tenant).execute()
4445
except Exception as err:
4546
print(f"Error: {err}", file=sys.stderr)
4647
sys.exit(1)

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ GitPython~=3.1.44
33
PyGithub~=2.5.0
44
slack_sdk~=3.34.0
55
packaging~=24.2
6+
7+
git+https://github.com/edenlabllc/github_actions.common.git@v1#egg=github_actions.common

src/actions/actions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
from collections import defaultdict
55
from git import Repo
66

7-
from ..input_output.output import GitHubOutput
8-
from ..utils.cmd import BaseCommand, CMDInterface
9-
from ..utils.github_environment_variables import GitHubContext
7+
from github_actions.common import GitHubOutput
8+
from github_actions.common import BaseCommand, CMDInterface
9+
from github_actions.common import GitHubContext
1010

1111

1212
class DestroyCommand(BaseCommand):
@@ -162,7 +162,7 @@ def _normalize_error_block(block: list) -> str:
162162

163163
@staticmethod
164164
def _capi_controller_name_prefix(provider: str) -> str | None:
165-
return {"aws":"capa", "azure":"capz", "gcp":"capg"}.get(provider)
165+
return {"aws": "capa", "azure": "capz", "gcp": "capg"}.get(provider)
166166

167167
def _get_capi_resources_info(self) -> str | None:
168168
print("Fetching all Cluster API (CAPI) resources...")

src/actions/init_project.py

Lines changed: 0 additions & 78 deletions
This file was deleted.

src/credentials/cluster_provider_credentials.py

Lines changed: 0 additions & 139 deletions
This file was deleted.

src/input_output/input.py

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,7 @@
1-
import os
2-
import argparse
1+
from github_actions.common.input_output.input import ArgumentParser
32

43

5-
class ArgumentParser:
6-
class EnvDefault(argparse.Action):
7-
def __init__(self, envvar, required=True, default=None, **kwargs):
8-
if envvar:
9-
if envvar in os.environ:
10-
default = os.environ.get(envvar, default)
11-
if required and default:
12-
required = False
13-
super(ArgumentParser.EnvDefault, self).__init__(default=default, required=required, metavar=envvar, **kwargs)
14-
15-
def __call__(self, parser, namespace, values, option_string=None):
16-
setattr(namespace, self.dest, values)
17-
18-
def __init__(self):
19-
self.parser = argparse.ArgumentParser()
20-
self.setup_arguments()
21-
4+
class GitLabflowCDArgumentParser(ArgumentParser):
225
def setup_arguments(self):
236
self.parser.add_argument("--allowed-environments",
247
action=self.EnvDefault, envvar="INPUT_ALLOWED_ENVIRONMENTS",
@@ -95,6 +78,3 @@ def setup_arguments(self):
9578
self.parser.add_argument("--rmk-version",
9679
action=self.EnvDefault, envvar="INPUT_RMK_VERSION",
9780
type=str, default='latest')
98-
99-
def parse_args(self):
100-
return self.parser.parse_args()

src/input_output/output.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)