feat: refactor GithubPolicyRepo cleanup method and improve webhook setup structure

Author: ariWeinberg

tests/conftest.py

@@ -468,7 +468,7 @@ def setup(opal_clients, policy_repo, session_matrix):
         logger.info(f"{key}: {val}")
 
     yield
-    policy_repo.cleanup(delete_ssh_key=False)
+    policy_repo.cleanup()
     if session_matrix["is_final"]:
         logger.info("Finalizing test session...")
         utils.remove_env("OPAL_TESTS_DEBUG")

tests/policy_repos/github_policy_repo.py

@@ -17,6 +17,11 @@
 
 
 class GithubPolicyRepo(PolicyRepoBase):
+    def setup_webhook(self, host, port):
+        pass
+
+    def create_webhook(self):
+        pass
     def __init__(
         self,
         settings: GithubPolicyRepoSettings,
@@ -32,9 +37,10 @@ def build_repo_url(self, owner, repo) -> str:
         if owner is None:
             raise Exception("Owner not set")
 
-        if self.settings.protocol in ("http", "https"):
-            if self.settings.github_pat:
-                return f"{self.settings.protocol}://{self.settings.owner}:{self.settings.github_pat}@{self.settings.host}/{owner}/{repo}.git"
+        protocol = "https"
+        pat = self.settings.github_pat
+        if pat:
+            return f"{protocol}://{pat}@{self.settings.host}/{owner}/{repo}.git"
 
         raise Exception("No valid authentication method set")
 
@@ -88,11 +94,6 @@ def cleanup(self, delete_repo=True):
             except Exception as e:
                 self.logger.error(f"Failed to delete remote repo: {e}")
 
-        self.delete_test_branches()
-
-        if delete_repo:
-            self.delete_repo()
-
     def delete_test_branches(self):
         try:
             self.logger.info(f"Deleting test branches from {self.settings.repo}...")
@@ -162,8 +163,8 @@ def delete_repo(self):
             self.logger.error(f"Error deleting repository: {e}")
 
     def setup(self):
-        self.clone_initial_repo()
         self.create_target_repo()
+        self.clone_initial_repo()
         self.generate_test_branch()
         self.create_test_branch()