Adding azdoPrRepoName as metadata in FluxCD alert

src/gitops_connector.py

@@ -26,6 +26,11 @@ def __init__(self):
 
     def process_gitops_phase(self, phase_data, req_time):
         if self._gitops_operator.is_supported_message(phase_data):
+            repo_n = self._gitops_operator.get_repo_name(phase_data)
+            logging.debug(f'azdoPrRepoName: {repo_n}')
+            if repo_n != '':
+                self._gitops_operator.callback_url = self._git_repository.set_git_repository(repo_n)
+                self._cicd_orchestrator.set_git_repository(repo_n)
             commit_id = self._gitops_operator.get_commit_id(phase_data)
             if not self._git_repository.is_commit_finished(commit_id):
                 self._queue_commit_statuses(phase_data, req_time)

src/operators/argo_gitops_operator.py

@@ -50,6 +50,9 @@ def is_finished(self, phase_data):
 
         return is_finished, is_successful
 
+    def get_repo_name(self, phase_data) -> str:
+        return ""
+
     def get_commit_id(self, phase_data) -> str:
         return phase_data['commitid']
 

src/operators/flux_gitops_operator.py

@@ -112,6 +112,12 @@ def is_finished(self, phase_data):
 
         return is_finished, is_successful
 
+    def get_repo_name(self, phase_data) -> str:
+        repo_name = ''
+        if 'azdoPrRepoName' in phase_data['metadata']:
+            repo_name = phase_data['metadata']['azdoPrRepoName']
+        return repo_name
+
     def get_commit_id(self, phase_data) -> str:
         revision = ''
         if self._get_message_kind(phase_data) == "Kustomization":

src/operators/gitops_operator.py

@@ -25,3 +25,8 @@ def get_commit_id(self, phase_data) -> str:
     @abstractmethod
     def is_supported_message(self, phase_data) -> bool:
         pass
+
+    @abstractmethod
+    def get_repo_name(self, phase_data) -> str:
+        pass
+

src/orchestrators/azdo_cicd_orchestrator.py

@@ -120,3 +120,9 @@ def _update_abandoned_pr(self, pr_num, pr_data):
             # update_pr_task returns True if the task was updated.
             return not self._update_pr_task(False, str(pr_num), is_alive=False)
         return True
+
+    def set_git_repository(self, repo_name):
+        self.gitops_repo_name = repo_name
+        self.github_client = AzdoClient()
+        self.headers = self.azdo_client.get_rest_api_headers()
+        return None

src/orchestrators/cicd_orchestrator.py

@@ -17,3 +17,7 @@ def notify_on_deployment_completion(self, commit_id, is_successful):
     @abstractmethod
     def notify_abandoned_pr_tasks(self):
         pass
+
+    @abstractmethod
+    def set_git_repository(self, repo_name):
+        pass

src/orchestrators/github_cicd_orchestrator.py

@@ -43,3 +43,10 @@ def _send_repo_dispatch_event(self, commmit_id, run_id, commit_message):
         response = requests.post(url=url, headers=self.headers, json=data)
         # Throw appropriate exception if request failed
         response.raise_for_status()
+
+    def set_git_repository(self, repo_name):
+        self.gitops_repo_name = repo_name
+        self.github_client = GitHubClient()
+        self.headers = self.github_client.get_rest_api_headers()
+        self.rest_api_url = self.github_client.get_rest_api_url()
+        return None

src/repositories/azdo_git_repository.py

@@ -132,3 +132,13 @@ def get_pr_num(self, commit_id) -> str:
 
     def is_commit_finished(self, commit_id):
         return False
+
+    def set_git_repository(self, repo_name) -> str:
+        self.gitops_repo_name = repo_name
+        self.pr_repo_name = repo_name
+        self.azdo_client = AzdoClient()
+        self.headers = self.azdo_client.get_rest_api_headers()
+        self.repository_api = f'{self.azdo_client.get_rest_api_url()}/_apis/git/repositories/{self.gitops_repo_name}'
+        self.pr_repository_api = f'{self.azdo_client.get_rest_api_url()}/_apis/git/repositories/{self.pr_repo_name}'
+        app_url = f'{self.azdo_client.get_rest_api_url()}/{self.pr_repo_name}'
+        return app_url

src/repositories/git_repository.py

@@ -29,3 +29,7 @@ def get_commit_message(self, commit_id):
     @abstractmethod
     def is_commit_finished(self, commit_id):
         pass
+
+    @abstractmethod
+    def set_git_repository(self, repo_name) -> str:
+        pass

src/repositories/github_git_repository.py

@@ -101,3 +101,11 @@ def get_pr_metadata(self, commit_id):
 
     def get_prs(self, pr_status):
         pass
+
+    def set_git_repository(self, repo_name) -> str:
+        self.gitops_repo_name = repo_name
+        self.github_client = GitHubClient()
+        self.headers = self.github_client.get_rest_api_headers()
+        self.rest_api_url = self.github_client.get_rest_api_url()
+        app_url = f'{self.github_client.get_rest_api_url()}/{self.pr_repo_name}'
+        return app_url

src/repositories/raw_subscriber.py

@@ -1,72 +1,72 @@
-
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT License.
-
-import dataclasses
-import json
-import logging
-import os
-import os.path
-from urllib.parse import urlparse
-import requests
-
-SUBSCRIBERS_DIR = '/subscribers'
-
-
-# An endpoint that handles unprocessed JSON forwarded from notifications.
-class RawSubscriber:
-    def __init__(self, url_endpoint):
-        self._url_endpoint = url_endpoint
-
-    def post_commit_status(self, commit_status):
-        json_data = dataclasses.asdict(commit_status)
-        logging.debug("Sending raw json to subscriber: " + json.dumps(json_data))
-        response = requests.post(url=self._url_endpoint, json=json_data)
-        response.raise_for_status()
-
-
-class RawSubscriberFactory:
-    @staticmethod
-    def new_raw_subscribers() -> list[RawSubscriber]:
-        logging.debug("Adding configured subscribers...")
-        subscribers = RawSubscriberFactory._read_subscribers()
-        logging.debug(f'{len(subscribers)} subscribers added.')
-
-        return subscribers
-
-    @staticmethod
-    def _read_subscribers():
-        subscribers = []
-
-        try:
-            subscriber_files = os.listdir(SUBSCRIBERS_DIR)
-        except FileNotFoundError:
-            logging.error("Subscriber config not found. Defaulting to no subscribers.")
-            return subscribers
-        if not subscriber_files:
-            return subscribers
-
-        for subscriber_file in subscriber_files:
-            subscriber_file = os.path.join(SUBSCRIBERS_DIR, subscriber_file)
-            if not os.path.isfile(subscriber_file):
-                continue
-
-            try:
-                with open(subscriber_file, 'r') as subscriber_fh:
-                    url = subscriber_fh.readline()
-
-                    try:
-                        urlparse(url)
-                    except ValueError:
-                        logging.error(f"URL is invalid, subscriber has not been added: {url}")
-                        continue
-
-                    subscriber = RawSubscriber(url)
-
-                    subscribers.append(subscriber)
-                    logging.info(f"Added subscriber {subscriber_file} with endpoint {url}")
-            except OSError:
-                logging.error(f"Error opening subscriber config at {subscriber_file}")
-                continue
-
-        return subscribers
+
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+import dataclasses
+import json
+import logging
+import os
+import os.path
+from urllib.parse import urlparse
+import requests
+
+SUBSCRIBERS_DIR = '/subscribers'
+
+
+# An endpoint that handles unprocessed JSON forwarded from notifications.
+class RawSubscriber:
+    def __init__(self, url_endpoint):
+        self._url_endpoint = url_endpoint
+
+    def post_commit_status(self, commit_status):
+        json_data = dataclasses.asdict(commit_status)
+        logging.debug("Sending raw json to subscriber: " + json.dumps(json_data))
+        response = requests.post(url=self._url_endpoint, json=json_data)
+        response.raise_for_status()
+
+
+class RawSubscriberFactory:
+    @staticmethod
+    def new_raw_subscribers() -> list[RawSubscriber]:
+        logging.debug("Adding configured subscribers...")
+        subscribers = RawSubscriberFactory._read_subscribers()
+        logging.debug(f'{len(subscribers)} subscribers added.')
+
+        return subscribers
+
+    @staticmethod
+    def _read_subscribers():
+        subscribers = []
+
+        try:
+            subscriber_files = os.listdir(SUBSCRIBERS_DIR)
+        except FileNotFoundError:
+            logging.error("Subscriber config not found. Defaulting to no subscribers.")
+            return subscribers
+        if not subscriber_files:
+            return subscribers
+
+        for subscriber_file in subscriber_files:
+            subscriber_file = os.path.join(SUBSCRIBERS_DIR, subscriber_file)
+            if not os.path.isfile(subscriber_file):
+                continue
+
+            try:
+                with open(subscriber_file, 'r') as subscriber_fh:
+                    url = subscriber_fh.readline()
+
+                    try:
+                        urlparse(url)
+                    except ValueError:
+                        logging.error(f"URL is invalid, subscriber has not been added: {url}")
+                        continue
+
+                    subscriber = RawSubscriber(url)
+
+                    subscribers.append(subscriber)
+                    logging.info(f"Added subscriber {subscriber_file} with endpoint {url}")
+            except OSError:
+                logging.error(f"Error opening subscriber config at {subscriber_file}")
+                continue
+
+        return subscribers

src/requirements.txt

@@ -1,5 +1,5 @@
-Flask==2.3
-gunicorn==20.0.4
-requests
-timeloop
+Flask==2.3
+gunicorn==20.0.4
+requests
+timeloop
 python-dateutil