superset-showtime 0.5.18__py3-none-any.whl → 0.6.4__py3-none-any.whl

showtime/__init__.py

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

showtime/cli.py

@@ -584,36 +584,6 @@ def sync(
         raise typer.Exit(1) from e
 
 
-@app.command()
-def handle_sync(pr_number: int) -> None:
-    """🎪 Handle new commit sync (called by GitHub Actions on PR synchronize)"""
-    try:
-        pr = PullRequest.from_id(pr_number)
-
-        # Only sync if there's an active environment
-        if not pr.current_show:
-            p(f"🎪 No active environment for PR #{pr_number} - skipping sync")
-            return
-
-        # Get latest commit SHA
-        from .core.pull_request import get_github
-
-        latest_sha = get_github().get_latest_commit_sha(pr_number)
-
-        # Check if update is needed
-        if not pr.current_show.needs_update(latest_sha):
-            p(f"🎪 Environment already up to date for PR #{pr_number}")
-            return
-
-        p(f"🎪 Syncing PR #{pr_number} to commit {latest_sha[:7]}")
-
-        # TODO: Implement rolling update logic
-        p("🎪 [bold yellow]Sync logic not yet implemented[/bold yellow]")
-
-    except Exception as e:
-        p(f"🎪 [bold red]Error handling sync:[/bold red] {e}")
-
-
 @app.command()
 def setup_labels(
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what labels would be created"),
@@ -662,107 +632,10 @@ def setup_labels(
         p(f"🎪 [bold red]Error setting up labels:[/bold red] {e}")
 
 
-@app.command()
-def aws_cleanup(
-    dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be cleaned"),
-    force: bool = typer.Option(False, "--force", help="Delete all showtime AWS resources"),
-) -> None:
-    """🧹 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"
-                )
-
-                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:
-            p(f"🗑️ Deleting {service}...")
-            try:
-                # Extract PR number for delete_environment call
-                pr_match = service.replace("pr-", "").replace("-service", "")
-                parts = pr_match.split("-")
-                if len(parts) >= 2:
-                    pr_number = int(parts[0])
-                    success = aws.delete_environment(service, pr_number)
-                    if success:
-                        p(f"✅ Deleted {service}")
-                        deleted_count += 1
-                    else:
-                        p(f"❌ Failed to delete {service}")
-                else:
-                    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}")
-
-
 @app.command()
 def cleanup(
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be cleaned"),
+    force: bool = typer.Option(False, "--force", help="Skip interactive prompts"),
     older_than: str = typer.Option(
         "48h", "--older-than", help="Clean environments older than this (ignored if --respect-ttl)"
     ),
@@ -777,6 +650,11 @@ def cleanup(
         "--cleanup-labels/--no-cleanup-labels",
         help="Also cleanup SHA-based label definitions from repository",
     ),
+    cleanup_aws_orphans: bool = typer.Option(
+        True,
+        "--cleanup-aws-orphans/--no-cleanup-aws-orphans",
+        help="Also cleanup orphaned AWS resources",
+    ),
 ) -> None:
     """🎪 Clean up orphaned or expired environments and labels"""
     try:
@@ -811,6 +689,106 @@ def cleanup(
         else:
             p("🎪 No expired environments found")
 
+        # Phase 2: AWS orphan cleanup
+        aws_cleaned_count = 0
+        if cleanup_aws_orphans:
+            from .core.aws import AWSInterface
+
+            p("\n☁️ [bold blue]Scanning for orphaned AWS resources...[/bold blue]")
+            aws = AWSInterface()
+
+            try:
+                # Get expected services from GitHub
+                github_services = set()
+                for pr_number in pr_numbers:
+                    pr = PullRequest.from_id(pr_number)
+                    for show in pr.shows:
+                        github_services.add(show.ecs_service_name)
+
+                # Find AWS orphans
+                aws_services = aws.list_circus_environments()
+                aws_orphans = [
+                    svc for svc in aws_services if svc.get("service_name") not in github_services
+                ]
+
+                if aws_orphans:
+                    p(f"☁️ Found {len(aws_orphans)} orphaned AWS resources:")
+                    for orphan in aws_orphans[:3]:
+                        p(f"  • {orphan['service_name']}")
+                    if len(aws_orphans) > 3:
+                        p(f"  ... and {len(aws_orphans) - 3} more")
+
+                    if not force and not dry_run:
+                        if typer.confirm(f"Delete {len(aws_orphans)} orphaned AWS resources?"):
+                            # Clean up AWS orphans
+                            for orphan in aws_orphans:
+                                if not dry_run:
+                                    aws.delete_service(orphan["service_name"])
+                                aws_cleaned_count += 1
+                        else:
+                            p("❌ Skipping AWS orphan cleanup")
+                    elif force or dry_run:
+                        aws_cleaned_count = len(aws_orphans)
+                        if not dry_run:
+                            for orphan in aws_orphans:
+                                aws.delete_service(orphan["service_name"])
+
+                if aws_cleaned_count > 0:
+                    p(f"☁️ ✅ Cleaned up {aws_cleaned_count} orphaned AWS resources")
+                else:
+                    p("☁️ No orphaned AWS resources found")
+
+            except Exception as e:
+                p(f"⚠️ AWS orphan scan failed: {e}")
+
+        # Phase 3: Repository label cleanup
+        label_cleaned_count = 0
+        if cleanup_labels:
+            from .core.pull_request import get_github
+
+            p("\n🏷️ [bold blue]Scanning for orphaned repository labels...[/bold blue]")
+            github = get_github()
+
+            try:
+                orphaned_labels = github.find_orphaned_labels(dry_run=True)  # Preview
+
+                if orphaned_labels:
+                    p(f"🏷️ Found {len(orphaned_labels)} orphaned repository labels:")
+                    for label in orphaned_labels[:3]:
+                        p(f"  • {label}")
+                    if len(orphaned_labels) > 3:
+                        p(f"  ... and {len(orphaned_labels) - 3} more")
+
+                    if not force and not dry_run:
+                        if typer.confirm(
+                            f"Delete {len(orphaned_labels)} orphaned labels from repository?"
+                        ):
+                            deleted_labels = github.find_orphaned_labels(dry_run=False)
+                            label_cleaned_count = len(deleted_labels)
+                        else:
+                            p("❌ Skipping repository label cleanup")
+                    elif force or dry_run:
+                        label_cleaned_count = len(orphaned_labels)
+                        if not dry_run:
+                            github.find_orphaned_labels(dry_run=False)
+
+                if label_cleaned_count > 0:
+                    p(f"🏷️ ✅ Cleaned up {label_cleaned_count} orphaned repository labels")
+                else:
+                    p("🏷️ No orphaned repository labels found")
+
+            except Exception as e:
+                p(f"⚠️ Repository label scan failed: {e}")
+
+        # Final summary
+        total_cleaned = cleaned_count + aws_cleaned_count + label_cleaned_count
+        if total_cleaned > 0:
+            p(
+                f"\n🎉 [bold green]Total cleanup: {cleaned_count} environments + {aws_cleaned_count} AWS orphans + {label_cleaned_count} labels[/bold green]"
+            )
+        else:
+            p("\n✨ [bold green]No cleanup needed - everything is clean![/bold green]")
+
     except Exception as e:
         p(f"❌ Cleanup failed: {e}")
 

showtime/core/github.py

@@ -143,9 +143,9 @@ class GitHubInterface:
         url = f"{self.base_url}/search/issues"
         # Search for PRs with any circus tent labels
         params = {
-            "q": f"repo:{self.org}/{self.repo} is:pr 🎪",
+            "q": f"repo:{self.org}/{self.repo} is:pr is:open 🎪",
             "per_page": "100",
-        }  # Include closed PRs
+        }  # Only open PRs - closed PRs should have cleaned up labels
 
         with httpx.Client() as client:
             response = client.get(url, headers=self.headers, params=params)
@@ -209,8 +209,8 @@ class GitHubInterface:
         all_labels = self.get_repository_labels()
         sha_labels = []
 
-        # Find labels with SHA patterns (7+ hex chars after 🎪)
-        sha_pattern = re.compile(r"^🎪 .* [a-f0-9]{7,}( .*)?$")
+        # Find labels with SHA patterns (7+ hex chars anywhere in label)
+        sha_pattern = re.compile(r"^🎪 .*[a-f0-9]{7,}.*$")
 
         for label in all_labels:
             if sha_pattern.match(label):
@@ -225,6 +225,69 @@ class GitHubInterface:
 
         return sha_labels
 
+    def find_orphaned_labels(self, dry_run: bool = False) -> List[str]:
+        """Find labels that exist in repository but aren't used on any PR"""
+        import re
+
+        print("🔍 Scanning repository labels...")
+
+        # 1. Get all repository labels with SHA patterns
+        all_repo_labels = self.get_repository_labels()
+        sha_pattern = re.compile(r"^🎪 .*[a-f0-9]{7,}.*$")
+        sha_repo_labels = {label for label in all_repo_labels if sha_pattern.match(label)}
+
+        print(f"📋 Found {len(sha_repo_labels)} SHA-containing labels in repository")
+
+        # 2. Get all labels actually used on PRs with circus labels
+        print("🔍 Scanning PRs with circus labels...")
+
+        # Import here to avoid circular import
+        import importlib
+
+        pull_request_module = importlib.import_module("showtime.core.pull_request")
+        PullRequest = pull_request_module.PullRequest
+
+        try:
+            pr_numbers = PullRequest.find_all_with_environments()
+            print(f"📋 Found {len(pr_numbers)} PRs with circus labels")
+
+            used_labels = set()
+            for pr_number in pr_numbers:
+                pr_labels = self.get_labels(pr_number)
+                circus_labels = {label for label in pr_labels if label.startswith("🎪 ")}
+                used_labels.update(circus_labels)
+
+            print(f"📋 Found {len(used_labels)} circus labels actually used on PRs")
+
+            # 3. Set difference to find orphaned labels
+            orphaned_labels = sha_repo_labels - used_labels
+
+            print(f"🗑️ Found {len(orphaned_labels)} truly orphaned labels")
+
+            # Debug: Show some examples if in dry run
+            if dry_run and orphaned_labels:
+                print("🔍 Examples of orphaned labels:")
+                for label in list(orphaned_labels)[:5]:
+                    print(f"  • {label}")
+            if dry_run and used_labels:
+                print("🔍 Examples of used labels:")
+                for label in list(used_labels)[:5]:
+                    print(f"  • {label}")
+
+            if not dry_run and orphaned_labels:
+                deleted_labels = []
+                for label in orphaned_labels:
+                    if self.delete_repository_label(label):
+                        deleted_labels.append(label)
+                return deleted_labels
+
+            return list(orphaned_labels)
+
+        except Exception as e:
+            print(f"⚠️ Error during orphan detection: {e}")
+            # Fallback to old pattern-based method
+            return self.cleanup_sha_labels(dry_run)
+
     def create_or_update_label(self, name: str, color: str, description: str) -> bool:
         """Create or update a label with color and description"""
         import urllib.parse

showtime/core/pull_request.py

@@ -325,7 +325,12 @@ class PullRequest:
             )
 
         # 3. Atomic claim for environment changes (PR-level lock)
-        if action_needed in ["create_environment", "rolling_update", "auto_sync"]:
+        if action_needed in [
+            "create_environment",
+            "rolling_update",
+            "auto_sync",
+            "destroy_environment",
+        ]:
             print(f"🔒 Claiming environment for {action_needed}...")
             if not self._atomic_claim(target_sha, action_needed, dry_run_github):
                 print("❌ Claim failed - another job is active")
@@ -406,16 +411,20 @@ class PullRequest:
                 return SyncResult(success=True, action_taken=action_needed, show=new_show)
 
             elif action_needed == "destroy_environment":
+                # Stop the current environment if it exists
                 if self.current_show:
                     print(f"🗑️ Destroying environment {self.current_show.sha}...")
                     self.current_show.stop(dry_run_github=dry_run_github, dry_run_aws=dry_run_aws)
                     print("☁️ AWS resources deleted")
                     self._post_cleanup_comment(self.current_show, dry_run_github)
-                    # Remove all circus labels after successful stop
-                    if not dry_run_github:
-                        self.remove_showtime_labels()
-                        print("🏷️ GitHub labels cleaned up")
-                    print("✅ Environment destroyed")
+                else:
+                    print("🗑️ No current environment to destroy")
+
+                # ALWAYS remove all circus labels for stop trigger, regardless of current_show
+                if not dry_run_github:
+                    self.remove_showtime_labels()
+                    print("🏷️ GitHub labels cleaned up")
+                print("✅ Environment destroyed")
                 return SyncResult(success=True, action_taken="destroy_environment")
 
             else:
@@ -436,16 +445,18 @@ class PullRequest:
 
     def stop_environment(self, **kwargs: Any) -> SyncResult:
         """Stop current environment (CLI stop command logic)"""
-        if not self.current_show:
-            return SyncResult(
-                success=True, action_taken="no_environment", error="No environment to stop"
-            )
-
         try:
-            self.current_show.stop(**kwargs)
-            # Remove all circus labels after successful stop
+            # Stop the current environment if it exists
+            if self.current_show:
+                self.current_show.stop(**kwargs)
+                print("☁️ AWS resources deleted")
+            else:
+                print("🗑️ No current environment to destroy")
+
+            # ALWAYS remove all circus labels for stop command, regardless of current_show
             if not kwargs.get("dry_run_github", False):
                 self.remove_showtime_labels()
+                print("🏷️ GitHub labels cleaned up")
             return SyncResult(success=True, action_taken="stopped")
         except Exception as e:
             return SyncResult(success=False, action_taken="stop_failed", error=str(e))
@@ -543,10 +554,14 @@ class PullRequest:
                 elif "showtime-trigger-stop" in trigger:
                     return "destroy_environment"
 
-        # No explicit triggers - check target SHA state
+        # No explicit triggers - only auto-create if there's ANY previous environment
         if not target_show:
-            # Target SHA doesn't exist - create it
-            return "create_environment"
+            # Target SHA doesn't exist - only create if there's any previous environment
+            if self.shows:  # Any previous environment exists
+                return "create_environment"
+            else:
+                # No previous environments - don't auto-create without explicit trigger
+                return "no_action"
         elif target_show.status == "failed":
             # Target SHA failed - rebuild it
             return "create_environment"

{superset_showtime-0.5.18.dist-info → superset_showtime-0.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superset-showtime
-Version: 0.5.18
+Version: 0.6.4
 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.18.dist-info → superset_showtime-0.6.4.dist-info}/RECORD

@@ -1,17 +1,17 @@
-showtime/__init__.py,sha256=apR60gqUgO9WuV06_c-B1cXzwzdQRcEaY-uYSPrrX0A,449
+showtime/__init__.py,sha256=O8PG7VEz2VYlezufbPc7zRxajuNxLRaW7XTXnOYSki0,448
 showtime/__main__.py,sha256=EVaDaTX69yIhCzChg99vqvFSCN4ELstEt7Mpb9FMZX8,109
-showtime/cli.py,sha256=8vIJT5TiqXuHDGxRBg6jV3oNv5nKrmDOs5OgltycPeI,31664
+showtime/cli.py,sha256=TLv9NaqPyewKJi9uCTZKWBijGelqunmsoSo7cyKajV4,31640
 showtime/core/__init__.py,sha256=54hbdFNGrzuNMBdraezfjT8Zi6g221pKlJ9mREnKwCw,34
 showtime/core/aws.py,sha256=uTjJAvEBQMyTccS93WZeNPhfeKQhJgOQQ0BJdnQjvCU,35007
 showtime/core/emojis.py,sha256=arK0N5Q5FLkvOkci-lacb3WS56LTvY8NjYRqt_lhP9s,2188
 showtime/core/git_validation.py,sha256=3dmSGpMDplDAmKWHUyoUEPgt3__8oTuBZxbfuhocT00,6831
-showtime/core/github.py,sha256=gMPJ5TOT6DdZk4y0XqW-C69I7O8A4eI40TgT4IFPqhQ,9623
+showtime/core/github.py,sha256=mSOqRLy2KMDhWUS37V2gJ-CQdeBpEqunBRKL10v5hxU,12268
 showtime/core/github_messages.py,sha256=MfgwCukrEsWWesMsuL8saciDgP4nS-gijzu8DXr-Alg,7450
 showtime/core/label_colors.py,sha256=gSe7EIMl4YjWkIgKHUvuaRSwgEB_B-NYQBxFFlF8Z3s,4065
-showtime/core/pull_request.py,sha256=r-4tCjEjsZOcTk4cjw57yyhNzq1sLPt4SYa1S7RcDlQ,31998
+showtime/core/pull_request.py,sha256=DCrTYz3Fu2Oh9FRgYTwncvzX7zy4Wa0BZsBwYa3nTpg,32669
 showtime/core/show.py,sha256=sOgZvGXwdcNDsidF1F_XwPXlSeTb8-Zeqhqb8w1pqAM,9973
 showtime/data/ecs-task-definition.json,sha256=d-NLkIhvr4C6AnwDfDIwUTx-6KFMH9wRkt6pVCbqZY4,2365
-superset_showtime-0.5.18.dist-info/METADATA,sha256=aTfADzrQ7S-eVsJJDlOvIOaDeSJ4WHqdfW0MtKsqFpg,12053
-superset_showtime-0.5.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-superset_showtime-0.5.18.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
-superset_showtime-0.5.18.dist-info/RECORD,,
+superset_showtime-0.6.4.dist-info/METADATA,sha256=SqFxH-mmg3jpLnOp2Gkl2AHJjewmga-nNtSe4HHk8bw,12052
+superset_showtime-0.6.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+superset_showtime-0.6.4.dist-info/entry_points.txt,sha256=rDW7oZ57mqyBUS4N_3_R7bZNGVHB-104jwmY-hHC_ck,85
+superset_showtime-0.6.4.dist-info/RECORD,,