Git repo and branch with PR comments

Author: priyansh-sumo

EventHubs/requirements.txt

@@ -6,5 +6,5 @@ azure-mgmt-resource==23.0.1
 azure-mgmt-eventhub==11.0.0
 azure-eventhub==5.11.5
 azure-mgmt-storage==21.1.0
-zure-mgmt-loganalytics==12.0.0
+azure-mgmt-loganalytics==12.0.0
 sumologic-sdk==0.1.15

EventHubs/tests/baseeventhubtest.py

@@ -2,6 +2,7 @@
 import sys
 import json
 from datetime import timedelta
+from sumologic import SumoLogic
 from azure.mgmt.resource import ResourceManagementClient
 from azure.mgmt.eventhub import EventHubManagementClient
 from azure.eventhub import EventHubProducerClient
@@ -20,6 +21,7 @@ def setUp(self):
         self.resource_client = ResourceManagementClient(self.azure_credential, 
                                                         self.subscription_id)
         self.repo_name, self.branch_name = self.get_git_info()
+        self.sumologic_cli = SumoLogic(os.environ["SUMO_ACCESS_ID"], os.environ["SUMO_ACCESS_KEY"], self.api_endpoint(os.environ["SUMO_DEPLOYMENT"]))
         self.collector_id = self.create_collector(self.collector_name)
         self.sumo_source_id, self.sumo_endpoint_url = self.create_source(self.collector_id, self.source_name)
 
@@ -28,6 +30,7 @@ def tearDown(self):
             self.delete_resource_group()
         self.delete_source(self.collector_id, self.sumo_source_id)
         self.delete_collector(self.collector_id)
+        self.sumologic_cli.session.close()
 
     def get_resource_name(self, resprefix, restype):
         for item in self.resource_client.resources.list_by_resource_group(self.RESOURCE_GROUP_NAME):

test_utils/basetest.py

@@ -3,7 +3,6 @@
 import json
 import datetime
 import subprocess
-from sumologic import SumoLogic
 from azure.identity import DefaultAzureCredential
 from azure.mgmt.resource.resources.models import Deployment, DeploymentMode
 
@@ -60,23 +59,23 @@ def deploy_template(self):
 
     def get_git_info(self):
         repo_slug = "SumoLogic/sumologic-azure-function"
-        if os.environ.get("TRAVIS_EVENT_TYPE") == "pull_request":
-            branch_name = os.environ["TRAVIS_PULL_REQUEST_BRANCH"]
-            repo_slug = os.environ["TRAVIS_PULL_REQUEST_SLUG"]
-        elif os.environ.get("TRAVIS_EVENT_TYPE") == "push":
-            branch_name = os.environ["TRAVIS_BRANCH"]
-            repo_slug = os.environ["TRAVIS_REPO_SLUG"]
-        else:
-            git_cmd = "git rev-parse --abbrev-ref HEAD" # will not work in detached state
-            branch_name = subprocess.Popen(git_cmd, shell=True, stdout=subprocess.PIPE).stdout.read().strip()
+        try:
+            branch_name = subprocess.check_output("git branch --show-current", stderr=subprocess.STDOUT, shell=True)
+            if not branch_name:
+                # in detached head state
+                branch_name = os.environ["SOURCE_BRANCH"]
+            else:
+                branch_name = self.branch_name.decode("utf-8").strip()
+        
+        except Exception as e:
+            raise Exception(f"Error getting branch name: {e}")
 
-        repo_name = "https://github.com/%s" % (repo_slug)
-        if not branch_name or branch_name == "undefined" or not repo_name:
-            raise Exception("No branch Found")
-        print("Testing for repo %s in branch %s" % (repo_name, branch_name))
+        if not branch_name or branch_name == "undefined" or not repo_slug:
+            raise Exception("No branch found")
 
-        if isinstance(branch_name, bytes):
-            branch_name = branch_name.decode()
+        repo_name = f"https://github.com/{repo_slug}"
+        
+        print(f"Testing for repo {repo_name} in branch {branch_name}")
 
         return repo_name, branch_name
 
@@ -91,7 +90,6 @@ def api_endpoint(self, sumo_deployment):
     def create_collector(self, collector_name):
         print("create_collector start")
         collector_id = None
-        self.sumologic_cli = SumoLogic(os.environ["SUMO_ACCESS_ID"], os.environ["SUMO_ACCESS_KEY"], self.api_endpoint(os.environ["SUMO_DEPLOYMENT"]))
         collector = {
                     'collector': {
                         'collectorType': 'Hosted',