Standardize on 'forge' language

Co-authored-by: Caetano Melone <melone1@llnl.gov>
Co-authored-by: Alec Scott <scott112@llnl.gov>

Author: cmelone

src/hubcast/__main__.py

@@ -66,7 +66,7 @@ def main():
         conf.gl_dest.webhook_secret,
     )
 
-    if conf.src_service == "github":
+    if conf.src_forge == "github":
         src_client_factory = GitHubClientFactory(
             conf.gh_src.app_id, conf.gh_src.privkey, conf.gh_src.requester
         )
@@ -77,7 +77,7 @@ def main():
             dest_client_factory,
         )
 
-    elif conf.src_service == "gitlab":
+    elif conf.src_forge == "gitlab":
         # TODO if bot users are implemented requester is the bot access token is the api-level token that is provided by the user
         src_client_factory = GitLabSrcClientFactory(
             conf.gl_src.instance_url, conf.gl_src.access_token, conf.gl_src.requester
@@ -96,14 +96,9 @@ def main():
         src_client_factory,
     )
 
-    gl_handler = GitLabHandler(
-        conf.gl.webhook_secret,
-        gh_client_factory,
-    )
-
     log.info("Starting HTTP server")
 
-    app.router.add_post(f"/v1/events/src/{conf.src_service}", src_handler.handle)
+    app.router.add_post(f"/v1/events/src/{conf.src_forge}", src_handler.handle)
     app.router.add_post("/v1/events/dest/gitlab", dest_handler.handle)
 
     setup(app)

src/hubcast/account_map/abc.py

@@ -8,8 +8,8 @@ class AccountMap(ABC):
     """
 
     @abstractmethod
-    def __call__(self, src_user: str) -> Union[str, None]:
+    def __call__(self, src_forge_user: str) -> Union[str, None]:
         """
-        Return the corresponding gitlab_user for a given src_user if one exists.
+        Return the corresponding dest_forge_user for a given src_forge_user if one exists.
         """
         pass

src/hubcast/account_map/file.py

@@ -29,7 +29,7 @@ class FileMap(AccountMap):
     def __init__(self, path: str):
         """
         Constructor, path to read from and generate a simple account
-        mapping between services (eg gitlab->gitlab or github->gitlab).
+        mapping between forges (eg gitlab->gitlab or github->gitlab).
         """
         self.path = path
 
@@ -42,8 +42,8 @@ def __init__(self, path: str):
         except yaml.YAMLError:
             raise FileMapError(f"Failed to parse file map. path={path}")
 
-    def __call__(self, src_user: str) -> Union[str, None]:
+    def __call__(self, src_forge_user: str) -> Union[str, None]:
         """
-        Return the gitlab_user for a src_user if one exists.
+        Return the dest_forge_user for a src_forge_user if one exists.
         """
-        return self.users.get(src_user)
+        return self.users.get(src_forge_user)

src/hubcast/config.py

@@ -17,14 +17,14 @@ def __init__(self):
         self.account_map_type = env_get("HC_ACCOUNT_MAP_TYPE")
         self.account_map_path = env_get("HC_ACCOUNT_MAP_PATH")
         self.logging_config_path = env_get("HC_LOGGING_CONFIG_PATH")
-        self.src_service = env_get("HC_SRC_SERVICE", "").lower()
+        self.src_forge = env_get("HC_SRC_FORGE", "").lower()
 
-        if self.src_service == "github":
+        if self.src_forge == "github":
             self.gh_src = GitHubSrcConfig()
-        elif self.src_service == "gitlab":
+        elif self.src_forge == "gitlab":
             self.gl_src = GitLabSrcConfig()
         else:
-            log.error('the source service can only be one of "gitlab" or "github"')
+            log.error('the source forge can only be one of "gitlab" or "github"')
             sys.exit(1)
 
         self.gl_dest = GitLabDestConfig()

src/hubcast/web/github/routes.py

@@ -62,7 +62,7 @@ async def sync_branch(event, gh, gl, gl_user, *args, **kwargs):
         "src_owner": src_owner,
         "src_repo_name": src_repo_name,
         "src_check_name": repo_config.check_name,
-        "src_service": "github",
+        "src_forge": "github",
     }
     await gl.set_webhook(dest_fullname, webhook_data)
 

src/hubcast/web/gitlab/handler.py

@@ -31,27 +31,27 @@ async def handle(self, request):
             )
             log.info("GitLab webhook received", extra={"event_type": event.event})
 
-            src_service = request.rel_url.query["src_service"]
+            src_forge = request.rel_url.query["src_forge"]
             src_check_name = request.rel_url.query["src_check_name"]
 
             # get corresponding GitHub repo owner and name from event request variables
-            # create_client takes different args depending on the service
-            # required webhook data in the query args also depends on the service
-            if src_service == "github":
+            # create_client takes different args depending on the forge
+            # required webhook data in the query args also depends on the forge
+            if src_forge == "github":
                 src_repo_name = request.rel_url.query["src_repo_name"]
                 src_repo_owner = request.rel_url.query["src_owner"]
                 src_client = self.src_client_factory.create_client(
                     src_repo_owner, src_repo_name
                 )
-            elif src_service == "gitlab":
+            elif src_forge == "gitlab":
                 src_repo_id = request.rel_url.query["src_repo_id"]
                 src_client = self.src_client_factory.create_client(src_repo_id)
             else:
-                log.warning(f"invalid src service {src_service}")
+                log.warning(f"invalid src forge {src_forge}")
 
             await spawn(
                 request,
-                router.dispatch(event, src_service, src_client, src_check_name),
+                router.dispatch(event, src_forge, src_client, src_check_name),
             )
 
             # return a "Success"

src/hubcast/web/gitlab/routes.py

@@ -84,7 +84,7 @@ async def sync_branch(event, gl_src, gl_dest, dest_user, *args, **kwargs):
     webhook_data = {
         "src_repo_id": repo_id,
         "src_check_name": repo_config.check_name,
-        "src_service": "gitlab",
+        "src_forge": "gitlab",
     }
     await gl_dest.set_webhook(dest_fullname, webhook_data)
 
@@ -247,7 +247,7 @@ async def remove_mr(event, gl_src, gl_dest, dest_user, *args, **kwawrgs):
 @router.register("Pipeline Hook", status="failed")
 @router.register("Pipeline Hook", status="canceled")
 async def status_relay(
-    event, src_service: str, src_client, src_check_name, *arg, **kwargs
+    event, src_forge: str, src_client, src_check_name, *arg, **kwargs
 ):
     """Relay status of a GitLab pipeline back to GitHub."""
     # get ref from event
@@ -257,10 +257,10 @@ async def status_relay(
     ci_status = event.data["object_attributes"]["status"]
     pipeline_url = event.data["object_attributes"]["url"]
 
-    if src_service == "gitlab":
+    if src_forge == "gitlab":
         # doesn't need to be mapped
         status = ci_status
-    elif src_service == "github":
+    elif src_forge == "github":
         # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-checks#about-check-suites
         # https://docs.gitlab.com/api/pipelines/#list-project-pipelines -> status description