# - test fix

Author: apanasiuk-el

main.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python3
 
-import os
 import sys
 
-from git import Repo
-
 from src.actions.actions import RMKCLIExecutor
 from src.actions.init_project import ProjectInitializer, GETTenant
 from src.credentials.cluster_provider_credentials import Credentials
@@ -22,17 +19,10 @@
 
         """Retrieve GitHub Action environment variables"""
         github_context = GitHubContext.from_env()
-
-        print(f"TEST: {github_context}")
-
-        repo = Repo(".")
-
-        print(repo.active_branch.name)
-
         print(f"Current branch: {github_context.ref_name}")
 
         """Determine the project environment based on the repository branch"""
-        environment = ExtendedEnvironmentSelector().select_environment(github_context.ref_name)
+        environment = ExtendedEnvironmentSelector().select_environment(github_context)
         print(f"Current environment: {environment}")
 
         """Validate environment-specific constraints"""

src/select_environment/allowed_environments.py

@@ -2,7 +2,7 @@
 
 
 class AllowEnvironments:
-    def __init__(self, args: Namespace, environment: str, ):
+    def __init__(self, args: Namespace, environment: str):
         self.args = args
         self.environment = environment
 

src/select_environment/select_environment.py

@@ -1,12 +1,14 @@
 import re
 
 from abc import ABC, abstractmethod
-from argparse import Namespace
+from git import Repo
+
+from src.utils.github_environment_variables import GitHubContext
 
 
 class EnvironmentSelectorInterface(ABC):
     @abstractmethod
-    def select_environment(self, branch_name: str) -> str:
+    def select_environment(self, github_context: GitHubContext) -> str:
         pass
 
 
@@ -26,25 +28,29 @@ class EnvironmentSelector(EnvironmentSelectorInterface):
     SELECT_ALL_BRANCHES = fr"{SELECT_FEATURE_BRANCHES}|{SELECT_RELEASE_BRANCHES}"
     SELECT_ORIGIN_ALL_BRANCHES = fr"{SELECT_ORIGIN_FEATURE_BRANCHES}|{SELECT_ORIGIN_RELEASE_BRANCHES}"
 
-    def select_environment(self, branch_name: str) -> str:
-        if re.match(r"^(develop|staging|production)$", branch_name, re.IGNORECASE):
-            return branch_name
+    def select_environment(self, github_context: GitHubContext) -> str:
+        if re.match(r"^(develop|staging|production)$", github_context.ref_name, re.IGNORECASE):
+            return github_context.ref_name
 
-        if re.match(EnvironmentSelector.SELECT_FEATURE_BRANCHES, branch_name, re.IGNORECASE):
+        if re.match(EnvironmentSelector.SELECT_FEATURE_BRANCHES, github_context.ref_name, re.IGNORECASE):
             return "develop"
 
-        if re.match(EnvironmentSelector.SELECT_RELEASE_BRANCHES, branch_name, re.IGNORECASE):
-            if re.search(EnvironmentSelector.SEMVER_REGEXP, branch_name, re.IGNORECASE):
-                if "-rc" in branch_name:
+        if re.match(EnvironmentSelector.SELECT_RELEASE_BRANCHES, github_context.ref_name, re.IGNORECASE):
+            if re.search(EnvironmentSelector.SEMVER_REGEXP, github_context.ref_name, re.IGNORECASE):
+                if "-rc" in github_context.ref_name:
                     return "staging"
                 return "production"
             return "staging"
 
-        raise ValueError(f"environment '{branch_name}' not allowed for environment selection")
+        raise ValueError(f"environment '{github_context.ref_name}' not allowed for environment selection")
 
 
 class ExtendedEnvironmentSelector(EnvironmentSelector):
-    def select_environment(self, branch_name: str) -> str:
-        if branch_name.startswith("hotfix/"):
+    def select_environment(self, github_context: GitHubContext) -> str:
+        if github_context.event_name == "pull_request":
+            repo = Repo(".")
+            github_context.ref_name = repo.active_branch.name
+
+        if github_context.ref_name.startswith("hotfix/"):
             return "production"
-        return super().select_environment(branch_name)
+        return super().select_environment(github_context)