superset-showtime 0.5.1__tar.gz → 0.5.4__tar.gz

{superset_showtime-0.5.1 → superset_showtime-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superset-showtime
-Version: 0.5.1
+Version: 0.5.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.1 → superset_showtime-0.5.4}/showtime/__init__.py

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

{superset_showtime-0.5.1 → superset_showtime-0.5.4}/showtime/core/pull_request.py

@@ -246,6 +246,9 @@ class PullRequest:
                 print(f"✅ Deployment completed - environment running at {show.ip}:8080")
                 self._update_show_labels(show, dry_run_github)
                 
+                # Blue-green cleanup: stop all other environments for this PR
+                cleaned_count = self.stop_previous_environments(show.sha, dry_run_github, dry_run_aws)
+                
                 # Show AWS console URLs for monitoring
                 self._show_service_urls(show)
 
@@ -278,6 +281,9 @@ class PullRequest:
                 print(f"✅ Rolling update completed - new environment at {new_show.ip}:8080")
                 self._update_show_labels(new_show, dry_run_github)
                 
+                # Blue-green cleanup: stop all other environments for this PR
+                cleaned_count = self.stop_previous_environments(new_show.sha, dry_run_github, dry_run_aws)
+                
                 # Show AWS console URLs for monitoring
                 self._show_service_urls(new_show)
 
@@ -389,6 +395,9 @@ class PullRequest:
 
     def _determine_action(self, target_sha: str) -> str:
         """Determine what sync action is needed based on target SHA state"""
+        # CRITICAL: Get fresh labels before any decisions
+        self.refresh_labels()
+        
         target_sha_short = target_sha[:7]  # Ensure we're working with short SHA
         
         # Get the specific show for the target SHA
@@ -429,20 +438,20 @@ class PullRequest:
 
     def _atomic_claim(self, target_sha: str, action: str, dry_run: bool = False) -> bool:
         """Atomically claim this PR for the current job based on target SHA state"""
+        # CRITICAL: Get fresh labels before any decisions
+        self.refresh_labels()
+        
         target_sha_short = target_sha[:7]
         target_show = self.get_show_by_sha(target_sha_short)
         
-        # 1. Validate current state allows this action for target SHA
+        # 1. Validate current state allows this action for target SHA  
         if action in ["create_environment", "rolling_update", "auto_sync"]:
             if target_show and target_show.status in [
                 "building",
                 "built", 
-                "deploying",
+                "deploying", 
             ]:
-                return False  # Target SHA already in progress
-            
-            # Allow actions on failed, running, or non-existent target SHAs
-            return True
+                return False  # Target SHA already in progress - ONLY conflict case returns
 
         if dry_run:
             print(f"🎪 [DRY-RUN] Would atomically claim PR for {action}")
@@ -580,6 +589,17 @@ class PullRequest:
         for old_status_label in sha_status_labels:
             get_github().remove_label(self.pr_number, old_status_label)
 
+        # For running environments, ensure only ONE active pointer exists
+        if show.status == "running":
+            # Remove ALL existing active pointers (there should only be one)
+            existing_active_pointers = [
+                label for label in self.labels 
+                if label.startswith("🎪 🎯 ")
+            ]
+            for old_pointer in existing_active_pointers:
+                print(f"🎯 Removing old active pointer: {old_pointer}")
+                get_github().remove_label(self.pr_number, old_pointer)
+
         # Now do normal differential updates - only for this SHA
         current_sha_labels = {
             label for label in self.labels 
@@ -616,3 +636,51 @@ class PullRequest:
         print(f"📝 Logs: {urls['logs']}")
         print(f"📊 Service: {urls['service']}")
         print("")
+
+    def stop_previous_environments(self, keep_sha: str, dry_run_github: bool = False, dry_run_aws: bool = False) -> int:
+        """Stop all environments except the specified SHA (blue-green cleanup)
+        
+        Args:
+            keep_sha: SHA of environment to keep running
+            dry_run_github: Skip GitHub label operations  
+            dry_run_aws: Skip AWS operations
+            
+        Returns:
+            Number of environments stopped
+        """
+        # CRITICAL: Refresh to get current shows including newly created one
+        self.refresh_labels()
+        
+        stopped_count = 0
+        
+        for show in self.shows:
+            if show.sha != keep_sha:
+                print(f"🧹 Cleaning up old environment: {show.sha} ({show.status})")
+                try:
+                    show.stop(dry_run_github=dry_run_github, dry_run_aws=dry_run_aws)
+                    
+                    # Remove labels for this old environment
+                    if not dry_run_github:
+                        old_labels = show.to_circus_labels()
+                        print(f"🏷️ Removing labels for {show.sha}: {len(old_labels)} labels")
+                        for label in old_labels:
+                            try:
+                                get_github().remove_label(self.pr_number, label)
+                            except Exception as e:
+                                print(f"⚠️ Failed to remove label {label}: {e}")
+                    
+                    stopped_count += 1
+                    print(f"✅ Stopped environment {show.sha}")
+                    
+                except Exception as e:
+                    print(f"❌ Failed to stop environment {show.sha}: {e}")
+                    
+        if stopped_count > 0:
+            print(f"🧹 Blue-green cleanup: stopped {stopped_count} old environments")
+            # Refresh labels after cleanup
+            if not dry_run_github:
+                self.refresh_labels()
+        else:
+            print("ℹ️ No old environments to clean up")
+            
+        return stopped_count

{superset_showtime-0.5.1 → superset_showtime-0.5.4}/showtime/core/show.py

@@ -165,17 +165,17 @@ class Show:
 
         # Detect if running in CI environment
         is_ci = bool(os.getenv("GITHUB_ACTIONS") or os.getenv("CI"))
-        
+
         # Build command without final path
         cmd = [
             "docker",
-            "buildx", 
+            "buildx",
             "build",
             "--push",
             "--platform",
             "linux/amd64",
             "--target",
-            "dev",
+            "showtime",
             "--build-arg",
             "INCLUDE_CHROMIUM=false",
             "--build-arg",
@@ -190,7 +190,7 @@ class Show:
             cmd.extend([
                 "--cache-from",
                 "type=registry,ref=apache/superset-cache:showtime",
-                "--cache-to", 
+                "--cache-to",
                 "type=registry,mode=max,ref=apache/superset-cache:showtime",
             ])
             print("🐳 CI environment: Using full registry caching")
@@ -204,7 +204,7 @@ class Show:
 
         # Add --load only when explicitly requested for local testing
         force_load = os.getenv("DOCKER_LOAD", "false").lower() == "true"
-        
+
         if force_load:
             cmd.append("--load")
             print("🐳 Will load image to local Docker daemon (DOCKER_LOAD=true)")

{superset_showtime-0.5.1 → superset_showtime-0.5.4}/tests/unit/test_label_transitions.py

@@ -281,4 +281,37 @@ def test_status_label_identification_edge_cases():
     
     # Should not match other SHAs or malformed labels
     assert "🎪 def456a 🚦 running" not in sha_status_labels
-    assert "🎪 abc123f🚦building" not in sha_status_labels
+    assert "🎪 abc123f🚦building" not in sha_status_labels
+
+
+@patch('showtime.core.pull_request.get_github')
+def test_atomic_claim_actually_creates_labels(mock_get_github):
+    """Test that atomic claim ACTUALLY creates labels, not just claims success"""
+    mock_github = Mock()
+    mock_github.get_labels.return_value = ["🎪 ⚡ showtime-trigger-start", "bug"]
+    mock_get_github.return_value = mock_github
+    
+    pr = PullRequest(1234, ["🎪 ⚡ showtime-trigger-start", "bug"])
+    
+    # Mock show creation
+    with patch.object(pr, '_create_new_show') as mock_create:
+        mock_show = Show(pr_number=1234, sha="abc123f", status="building")
+        mock_create.return_value = mock_show
+        
+        result = pr._atomic_claim("abc123f", "create_environment", dry_run=False)
+        
+        assert result is True
+        
+        # The CRITICAL assertions - verify actual label operations happened
+        mock_github.remove_label.assert_called()  # Should remove triggers
+        mock_github.add_label.assert_called()     # Should add building labels
+        
+        # Verify trigger was removed
+        trigger_removes = [call for call in mock_github.remove_label.call_args_list 
+                          if "showtime-trigger-start" in str(call)]
+        assert len(trigger_removes) > 0, "Trigger label should be removed"
+        
+        # Verify building labels were added
+        building_adds = [call for call in mock_github.add_label.call_args_list 
+                        if "🚦 building" in str(call)]
+        assert len(building_adds) > 0, "Building status label should be added"

{superset_showtime-0.5.1 → superset_showtime-0.5.4}/tests/unit/test_pull_request.py

@@ -106,17 +106,17 @@ def test_pullrequest_determine_action():
     pr_start = PullRequest(1234, ["🎪 ⚡ showtime-trigger-start"])
     assert pr_start._determine_action("abc123f") == "create_environment"
 
-    # Start trigger, same SHA - no action
+    # Start trigger, same SHA - force rebuild with trigger
     pr_same = PullRequest(
         1234, ["🎪 ⚡ showtime-trigger-start", "🎪 abc123f 🚦 running", "🎪 🎯 abc123f"]
     )
-    assert pr_same._determine_action("abc123f") == "no_action"
+    assert pr_same._determine_action("abc123f") == "create_environment"
 
-    # Start trigger, different SHA - rolling update
+    # Start trigger, different SHA - create new environment (SHA-specific logic)
     pr_update = PullRequest(
         1234, ["🎪 ⚡ showtime-trigger-start", "🎪 abc123f 🚦 running", "🎪 🎯 abc123f"]
     )
-    assert pr_update._determine_action("def456a") == "rolling_update"
+    assert pr_update._determine_action("def456a") == "create_environment"
 
     # Stop trigger - destroy
     pr_stop = PullRequest(
@@ -124,9 +124,9 @@ def test_pullrequest_determine_action():
     )
     assert pr_stop._determine_action("def456a") == "destroy_environment"
 
-    # No triggers, but environment needs update - auto sync
+    # No triggers, but different SHA - create new environment (SHA-specific)
     pr_auto = PullRequest(1234, ["🎪 abc123f 🚦 running", "🎪 🎯 abc123f"])
-    assert pr_auto._determine_action("def456a") == "auto_sync"
+    assert pr_auto._determine_action("def456a") == "create_environment"
     
     # Failed environment, no triggers - create new (retry logic)
     pr_failed = PullRequest(1234, ["🎪 abc123f 🚦 failed", "🎪 🎯 abc123f"])