superset-showtime 0.5.7__py3-none-any.whl → 0.5.8__py3-none-any.whl

showtime/__init__.py

@@ -4,7 +4,7 @@
 Circus tent emoji state tracking for Apache Superset ephemeral environments.
 """
 
-__version__ = "0.5.7"
+__version__ = "0.5.8"
 __author__ = "Maxime Beauchemin"
 __email__ = "maximebeauchemin@gmail.com"
 

showtime/cli.py

@@ -124,7 +124,7 @@ def start(
             p(f"Current: {pr.current_show.sha}{ip_info} ({pr.current_show.status})")
             p("Use 'showtime sync' to update or 'showtime stop' to clean up first")
             return
-        
+
         # Handle failed environment replacement
         if pr.current_show and pr.current_show.status == "failed":
             p(f"🎪 [bold orange]Replacing failed environment for PR #{pr_number}[/bold orange]")
@@ -332,21 +332,27 @@ def list(
 
         # Sort by PR number, then by show type (active first, then building, then orphaned)
         type_priority = {"active": 1, "building": 2, "orphaned": 3}
-        sorted_envs = sorted(filtered_envs, key=lambda e: (e["pr_number"], type_priority.get(e["show"].get("show_type", "orphaned"), 3)))
-        
+        sorted_envs = sorted(
+            filtered_envs,
+            key=lambda e: (
+                e["pr_number"],
+                type_priority.get(e["show"].get("show_type", "orphaned"), 3),
+            ),
+        )
+
         for env in sorted_envs:
             show_data = env["show"]
             pr_number = env["pr_number"]
-            
+
             # Show type with appropriate styling (using single-width chars for alignment)
             show_type = show_data.get("show_type", "orphaned")
             if show_type == "active":
                 type_display = "* active"
-            elif show_type == "building": 
+            elif show_type == "building":
                 type_display = "# building"
             else:
                 type_display = "! orphaned"
-            
+
             # Make Superset URL clickable and show full URL
             if show_data["ip"]:
                 full_url = f"http://{show_data['ip']}:8080"
@@ -371,7 +377,7 @@ def list(
                 try:
                     parts = created_display.replace("T", " ").replace("-", ":")
                     created_display = parts[-8:]  # Show just HH:MM:SS
-                except:
+                except Exception:
                     pass  # Keep original if parsing fails
 
             table.add_row(
@@ -497,6 +503,19 @@ def sync(
 ) -> None:
     """🎪 Intelligently sync PR to desired state (called by GitHub Actions)"""
     try:
+        # Validate required Git SHA unless using --check-only
+        if not check_only:
+            from .core.git_validation import (
+                get_validation_error_message,
+                should_skip_validation,
+                validate_required_sha,
+            )
+
+            if not should_skip_validation():
+                is_valid, error_msg = validate_required_sha()
+                if not is_valid:
+                    p(get_validation_error_message())
+                    raise typer.Exit(1)
         # Use singletons - no interface creation needed
         pr = PullRequest.from_id(pr_number)
 
@@ -651,67 +670,69 @@ def aws_cleanup(
     """🧹 Clean up orphaned AWS resources without GitHub labels"""
     try:
         from .core.aws import AWSInterface
-        
+
         aws = AWSInterface()
-        
+
         p("🔍 [bold blue]Scanning for orphaned AWS resources...[/bold blue]")
-        
+
         # 1. Get all GitHub PRs with circus labels
         github_services = set()
         try:
             all_pr_numbers = PullRequest.find_all_with_environments()
             p(f"📋 Found {len(all_pr_numbers)} PRs with circus labels:")
-            
+
             for pr_number in all_pr_numbers:
                 pr = PullRequest.from_id(pr_number)
-                p(f"  🎪 PR #{pr_number}: {len(pr.shows)} shows, {len(pr.circus_labels)} circus labels")
-                
+                p(
+                    f"  🎪 PR #{pr_number}: {len(pr.shows)} shows, {len(pr.circus_labels)} circus labels"
+                )
+
                 for show in pr.shows:
                     service_name = show.ecs_service_name
                     github_services.add(service_name)
                     p(f"    📝 Expected service: {service_name}")
-                    
+
                 # Show labels for debugging
                 if not pr.shows:
                     p(f"    ⚠️ No shows found, labels: {pr.circus_labels[:3]}...")  # First 3 labels
-                    
+
         except Exception as e:
             p(f"⚠️ GitHub scan failed: {e}")
             github_services = set()
-        
+
         # 2. Get all AWS ECS services matching showtime pattern
         p("\n☁️ [bold blue]Scanning AWS ECS services...[/bold blue]")
         try:
             aws_services = aws.find_showtime_services()
             p(f"🔍 Found {len(aws_services)} AWS services with pr-* pattern")
-            
+
             for service in aws_services:
                 p(f"  ☁️ AWS: {service}")
         except Exception as e:
             p(f"❌ AWS scan failed: {e}")
             return
-            
+
         # 3. Find orphaned services
         orphaned = [service for service in aws_services if service not in github_services]
-        
+
         if not orphaned:
             p("\n✅ [bold green]No orphaned AWS resources found![/bold green]")
             return
-            
+
         p(f"\n🚨 [bold red]Found {len(orphaned)} orphaned AWS resources:[/bold red]")
         for service in orphaned:
             p(f"  💰 {service} (consuming resources)")
-            
+
         if dry_run:
             p(f"\n🎪 [bold yellow]DRY RUN[/bold yellow] - Would delete {len(orphaned)} services")
             return
-            
+
         if not force:
             confirm = typer.confirm(f"Delete {len(orphaned)} orphaned AWS services?")
             if not confirm:
                 p("🎪 Cancelled")
                 return
-                
+
         # 4. Delete orphaned resources
         deleted_count = 0
         for service in orphaned:
@@ -732,9 +753,9 @@ def aws_cleanup(
                     p(f"❌ Invalid service name format: {service}")
             except Exception as e:
                 p(f"❌ Error deleting {service}: {e}")
-                
+
         p(f"\n🎪 ✅ Cleanup complete: deleted {deleted_count}/{len(orphaned)} services")
-        
+
     except Exception as e:
         p(f"❌ AWS cleanup failed: {e}")
 

showtime/core/git_validation.py

@@ -0,0 +1,137 @@
+"""
+🎪 Git SHA Validation for Superset Showtime
+
+Validates that the current Git repository contains required commit SHA to prevent
+usage with outdated releases.
+"""
+
+from typing import Optional, Tuple
+
+try:
+    from git import InvalidGitRepositoryError, Repo
+except ImportError:
+    # Fallback if GitPython is not available
+    Repo = None
+    InvalidGitRepositoryError = Exception
+
+
+# Hard-coded required SHA - update this when needed
+REQUIRED_SHA = "277f03c2075a74fbafb55531054fb5083debe5cc"  # Placeholder SHA for testing
+
+
+class GitValidationError(Exception):
+    """Raised when Git validation fails"""
+
+    pass
+
+
+def is_git_repository(path: str = ".") -> bool:
+    """
+    Check if the current directory (or specified path) is a Git repository.
+
+    Args:
+        path: Path to check (default: current directory)
+
+    Returns:
+        True if it's a Git repository, False otherwise
+    """
+    if Repo is None:
+        # GitPython not available, assume not a git repo
+        return False
+
+    try:
+        Repo(path)
+        return True
+    except (InvalidGitRepositoryError, Exception):
+        return False
+
+
+def validate_required_sha(required_sha: Optional[str] = None) -> Tuple[bool, Optional[str]]:
+    """
+    Validate that the required SHA exists in the current Git repository.
+
+    Args:
+        required_sha: SHA to validate (default: REQUIRED_SHA constant)
+
+    Returns:
+        Tuple of (is_valid, error_message)
+        - (True, None) if validation passes
+        - (False, error_message) if validation fails
+    """
+    if Repo is None:
+        return False, "GitPython not available for SHA validation"
+
+    sha_to_check = required_sha or REQUIRED_SHA
+    if not sha_to_check:
+        return True, None  # No requirement set
+
+    try:
+        repo = Repo(".")
+
+        # Check if SHA exists in repository
+        try:
+            commit = repo.commit(sha_to_check)
+
+            # Check if SHA is reachable from current HEAD
+            # This ensures the required commit is in our branch history
+            try:
+                repo.merge_base(commit, repo.head.commit)
+                return True, None
+            except Exception:
+                # SHA exists but not in current branch history
+                return False, (
+                    f"Required commit {sha_to_check} exists but is not reachable from current HEAD. "
+                    f"Please ensure your branch includes the required commit."
+                )
+
+        except Exception:
+            # SHA doesn't exist in repository
+            return False, (
+                f"Required commit {sha_to_check} not found in repository. "
+                f"Please update to a branch that includes this commit."
+            )
+
+    except InvalidGitRepositoryError:
+        return False, "Current directory is not a Git repository"
+    except Exception as e:
+        return False, f"Git validation error: {e}"
+
+
+def get_validation_error_message(required_sha: Optional[str] = None) -> str:
+    """
+    Get a user-friendly error message for SHA validation failure.
+
+    Args:
+        required_sha: SHA that was required (default: REQUIRED_SHA)
+
+    Returns:
+        Formatted error message with resolution steps
+    """
+    sha_to_check = required_sha or REQUIRED_SHA
+
+    return f"""
+🎪 [bold red]Git SHA Validation Failed[/bold red]
+
+This branch requires commit {sha_to_check} to be present in your Git history.
+
+[bold yellow]To resolve this:[/bold yellow]
+1. Ensure you're on the correct branch (usually main)
+2. Pull the latest changes: [cyan]git pull origin main[/cyan]
+3. Verify the commit exists: [cyan]git log --oneline | grep {sha_to_check[:7]}[/cyan]
+4. If needed, switch to main branch: [cyan]git checkout main[/cyan]
+
+[dim]This check prevents Showtime from running on outdated releases.[/dim]
+""".strip()
+
+
+def should_skip_validation() -> bool:
+    """
+    Determine if Git validation should be skipped.
+
+    Currently skips validation when not in a Git repository,
+    allowing --check-only to work in non-Git environments.
+
+    Returns:
+        True if validation should be skipped
+    """
+    return not is_git_repository()

showtime/data/ecs-task-definition.json

@@ -43,6 +43,14 @@
                 {
                     "name": "PYTHONUNBUFFERED",
                     "value": "1"
+                },
+                {
+                    "name": "SERVER_WORKER_AMOUNT",
+                    "value": "4"
+                },
+                {
+                    "name": "SERVER_THREADS_AMOUNT",
+                    "value": "1"
                 }
             ],
             "mountPoints": [],

{superset_showtime-0.5.7.dist-info → superset_showtime-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superset-showtime
-Version: 0.5.7
+Version: 0.5.8
 Summary: 🎪 Apache Superset ephemeral environment management with circus tent emoji state tracking
 Project-URL: Homepage, https://github.com/apache/superset-showtime
 Project-URL: Documentation, https://superset-showtime.readthedocs.io/

{superset_showtime-0.5.7.dist-info → superset_showtime-0.5.8.dist-info}/RECORD

@@ -1,16 +1,17 @@
-showtime/__init__.py,sha256=lAvOPT8KUJ8XkRdEWPjaQO-B9Koo-Mx_42ac173FZv0,448
+showtime/__init__.py,sha256=BG1XZS3HxkBt1uX9xaRqgw4rRho6Q6Yy3aTxcQxcPeA,448
 showtime/__main__.py,sha256=EVaDaTX69yIhCzChg99vqvFSCN4ELstEt7Mpb9FMZX8,109
-showtime/cli.py,sha256=cQB5kH-XWFX3MhsxRaChVdjVe_I_7kBVyFY4fQrHPWA,30542
+showtime/cli.py,sha256=eWu6MBPo0ERc_3rYRGwg_95ZZN8uqlqORBiRAbvbCpg,30933
 showtime/core/__init__.py,sha256=54hbdFNGrzuNMBdraezfjT8Zi6g221pKlJ9mREnKwCw,34
 showtime/core/aws.py,sha256=uTjJAvEBQMyTccS93WZeNPhfeKQhJgOQQ0BJdnQjvCU,35007
 showtime/core/emojis.py,sha256=MHEDuPIdfNiop4zbNLuviz3eY05QiftYSHHCVbkfKhw,2129
+showtime/core/git_validation.py,sha256=h4MZPIaJB1KN6aO5sXf5j4IKOu5__nmZZSDRjWRoEpA,4127
 showtime/core/github.py,sha256=uETvKDO2Yhpqg3fxLtrKaCuZR3b-1LVmgnf5aLcqrAQ,9988
 showtime/core/github_messages.py,sha256=MfgwCukrEsWWesMsuL8saciDgP4nS-gijzu8DXr-Alg,7450
 showtime/core/label_colors.py,sha256=efhbFnz_3nqEnEqmgyF6_hZbxtCu_fmb68BIIUpSsnk,3895
 showtime/core/pull_request.py,sha256=vKlPPlIeSNT_WmlZkOekLH_tGYm4pyJUZFHQC9dVCKY,27756
 showtime/core/show.py,sha256=FpxDm52LASCJvf8UF998AtNiVzfdYIwNEsPAsOAAwL0,9701
-showtime/data/ecs-task-definition.json,sha256=P7NQljXZTOPW1fWdehGrwJGAh5vdFK9-LzGT59q1PU0,2098
-superset_showtime-0.5.7.dist-info/METADATA,sha256=yu5OIoXzL0OZIJf8-9Qrd94zCDXLLI0Om8kNBZWZYoY,12052
-superset_showtime-0.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-superset_showtime-0.5.7.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
-superset_showtime-0.5.7.dist-info/RECORD,,
+showtime/data/ecs-task-definition.json,sha256=Y8ZbAAXdIDMnM-8zzfdUTlwp5RpWSyhe1gtfygKkqW8,2343
+superset_showtime-0.5.8.dist-info/METADATA,sha256=pQD1Wr9BmGSgYwSyr17GwYpsh7QGUyFNKDmioltw08M,12052
+superset_showtime-0.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+superset_showtime-0.5.8.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
+superset_showtime-0.5.8.dist-info/RECORD,,