salla-gitpuller 1.0.1__tar.gz → 1.0.3__tar.gz

{salla_gitpuller-1.0.1 → salla_gitpuller-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salla_gitpuller
-Version: 1.0.1
+Version: 1.0.3
 Summary: A lightweight utility to git pull a repository using SSH deploy keys stored in environment variables
 Author-email: Muhammad Zahid <zahidmuhammad127@gmail.com>
 License: MIT

{salla_gitpuller-1.0.1 → salla_gitpuller-1.0.3}/gitpuller/gitpull.py

@@ -12,7 +12,7 @@ class GitPullExecutor:
         use_mage_ai: bool = False,
         state_manager: Optional[Any] = None
     ):
-        self.slack_notifier = SlackNotifier(webhook_url=slack_webhook_url)
+        self.slack_notifier = SlackNotifier(webhook_url=slack_webhook_url) if slack_webhook_url else None
         self.alert_manager = AlertManager(state_manager=state_manager, use_mage_ai=use_mage_ai)
     
     def normalize_ssh_key(self, key_material: str) -> str:
@@ -63,14 +63,9 @@ class GitPullExecutor:
         if not os.path.exists(repo_path):
             raise ValueError(f"Repo path does not exist: {repo_path}")
         
-        # Get SSH key
-        if not ssh_key and workspace_name:
-            key_env_name = f"{workspace_name}_SSHKEY"
-            ssh_key = os.environ.get(key_env_name)
-            if not ssh_key:
-                raise ValueError(f"Missing env var {key_env_name} with the PRIVATE deploy key")
-        elif not ssh_key:
-            raise ValueError("SSH key is required. Provide it directly or set workspace_name.")
+        # Validate SSH key
+        if not ssh_key:
+            raise ValueError("SSH key is required. Provide it directly as a parameter.")
         
         # Normalize key
         ssh_key = self.normalize_ssh_key(ssh_key)
@@ -93,7 +88,6 @@ class GitPullExecutor:
         
         git_output = ""
         git_status = "success"
-        key_env_var_used = f"{workspace_name}_SSHKEY" if workspace_name else "N/A"
         
         original_dir = None
         try:
@@ -129,7 +123,6 @@ class GitPullExecutor:
             "repo_path": repo_path,
             "git_pull_status": git_status,
             "git_pull_output": git_output.strip(),
-            "key_env_var_used": key_env_var_used,
         }
     
     def execute_with_alerting(
@@ -142,7 +135,8 @@ class GitPullExecutor:
         pipeline_uuid: str = "auto_git_pull",
         suppression_hours: int = 1,
         key_filename: Optional[str] = None,
-        ssh_dir: str = "/home/src/.ssh"
+        ssh_dir: str = "/home/src/.ssh",
+        webhook_url: Optional[str] = None
     ) -> Dict[str, Any]:
         repo_name = git_url.split('/')[-1].replace('.git', '')
         
@@ -175,7 +169,17 @@ class GitPullExecutor:
             
             if should_alert:
                 # Send alert
-                self.slack_notifier.send_alert(repo_name, git_output[:1500])
+                # Use provided webhook_url if given, otherwise use the one from __init__
+                if webhook_url:
+                    notifier = SlackNotifier(webhook_url=webhook_url)
+                elif self.slack_notifier:
+                    notifier = self.slack_notifier
+                else:
+                    print("⚠️ No webhook URL provided, skipping Slack alert")
+                    notifier = None
+                
+                if notifier:
+                    notifier.send_alert(repo_name, git_output[:1500])
                 
                 # Save alert state
                 self.alert_manager.save_alert_state(

{salla_gitpuller-1.0.1 → salla_gitpuller-1.0.3}/gitpuller/slack_notifier.py

@@ -1,17 +1,16 @@
-import os
 import requests
 from typing import Optional, Dict, Any
 
 
 class SlackNotifier:
     
-    def __init__(self, webhook_url: Optional[str] = None):
-        self.webhook_url = webhook_url or os.environ.get("CDM_SLACK_WEBHOOK_URL")
-        if not self.webhook_url:
+    def __init__(self, webhook_url: Optional[str] = None, timeout: int = 10):
+        if not webhook_url:
             raise ValueError(
-                "Slack webhook URL is required. "
-                "Provide it as parameter or set CDM_SLACK_WEBHOOK_URL environment variable."
+                "Slack webhook URL is required. Provide it as parameter."
             )
+        self.webhook_url = webhook_url
+        self.timeout = timeout
     
     def create_failure_payload(self, repo_name: str, error_output: str) -> Dict[str, Any]:
         payload = {
@@ -51,7 +50,7 @@ class SlackNotifier:
     def send_alert(self, repo_name: str, error_output: str = "") -> bool:
         try:
             payload = self.create_failure_payload(repo_name, error_output)
-            response = requests.post(self.webhook_url, json=payload, timeout=10)
+            response = requests.post(self.webhook_url, json=payload, timeout=self.timeout)
             response.raise_for_status()
             print("✅ Alert sent to Slack")
             return True

{salla_gitpuller-1.0.1 → salla_gitpuller-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "salla_gitpuller"
-version = "1.0.1"
+version = "1.0.3"
 description = "A lightweight utility to git pull a repository using SSH deploy keys stored in environment variables"
 readme = "README.md"
 authors = [

{salla_gitpuller-1.0.1 → salla_gitpuller-1.0.3}/salla_gitpuller.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salla_gitpuller
-Version: 1.0.1
+Version: 1.0.3
 Summary: A lightweight utility to git pull a repository using SSH deploy keys stored in environment variables
 Author-email: Muhammad Zahid <zahidmuhammad127@gmail.com>
 License: MIT