superset-showtime 0.5.0__tar.gz → 0.5.3__tar.gz

{superset_showtime-0.5.0 → superset_showtime-0.5.3}/PKG-INFO

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

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

{superset_showtime-0.5.0 → superset_showtime-0.5.3}/showtime/cli.py

@@ -722,7 +722,7 @@ def aws_cleanup(
                 parts = pr_match.split("-")
                 if len(parts) >= 2:
                     pr_number = int(parts[0])
-                    success = aws.delete_environment(service.replace("-service", ""), pr_number)
+                    success = aws.delete_environment(service, pr_number)
                     if success:
                         p(f"✅ Deleted {service}")
                         deleted_count += 1

{superset_showtime-0.5.0 → superset_showtime-0.5.3}/showtime/core/aws.py

@@ -175,36 +175,62 @@ class AWSInterface:
 
     def delete_environment(self, service_name: str, pr_number: int) -> bool:
         """
-        Delete ephemeral environment - replicates cleanup GHA logic
+        Delete ephemeral environment with proper verification
 
         Steps:
-        1. Check if ECS service exists and is active
-        2. Delete ECS service with --force
+        1. Check if ECS service exists 
+        2. Delete ECS service with force and wait for completion
         3. Delete ECR image tag
+        4. Verify deletion completed
         """
         try:
-            # Step 1: Check if service exists and is active
-            if not self._service_exists(service_name):
-                return True  # Already deleted
+            ecs_service_name = f"{service_name}-service" if not service_name.endswith("-service") else service_name
+            print(f"🗑️ Deleting ECS service: {ecs_service_name}")
+            
+            # Step 1: Check if service exists
+            if not self._service_exists(ecs_service_name):
+                print(f"✅ Service {ecs_service_name} already deleted")
+                return True
+
+            # Step 2: Delete ECS service (force delete) and wait
+            print(f"☁️ Initiating ECS service deletion...")
+            delete_response = self.ecs_client.delete_service(
+                cluster=self.cluster, 
+                service=ecs_service_name, 
+                force=True
+            )
+            print(f"🔄 Delete initiated: {delete_response.get('service', {}).get('status', 'unknown')}")
 
-            # Step 2: Delete ECS service (force delete)
-            self.ecs_client.delete_service(cluster=self.cluster, service=service_name, force=True)
+            # Step 3: Wait for deletion to complete (crucial!)
+            print(f"⏳ Waiting for service deletion to complete...")
+            deletion_success = self._wait_for_service_deletion(ecs_service_name, timeout_minutes=10)
+            
+            if not deletion_success:
+                print(f"⚠️ Service deletion timeout - service may still exist")
+                return False
 
-            # Step 3: Delete ECR image tag
-            # Extract SHA from service name: pr-1234-abc123f → abc123f
-            sha = service_name.split("-")[-1]
-            image_tag = f"pr-{pr_number}-{sha}"
+            # Step 4: Delete ECR image tag
+            print(f"🐳 Cleaning up Docker image...")
+            # Fix SHA extraction: pr-34831-ac533ec-service → ac533ec
+            # Remove "pr-" prefix and "-service" suffix, then get SHA (last part)
+            base_name = service_name.replace("pr-", "").replace("-service", "")
+            parts = base_name.split("-")
+            sha = parts[-1] if len(parts) > 1 else base_name  # Last part is SHA
+            image_tag = f"pr-{pr_number}-{sha}-ci"
 
             try:
                 self.ecr_client.batch_delete_image(
                     repositoryName=self.repository, imageIds=[{"imageTag": image_tag}]
                 )
+                print(f"✅ Deleted ECR image: {image_tag}")
             except self.ecr_client.exceptions.ImageNotFoundException:
-                pass  # Image already deleted
+                print(f"ℹ️ ECR image {image_tag} already deleted")
 
+            print(f"✅ Environment {service_name} fully deleted")
             return True
 
         except Exception as e:
+            print(f"❌ AWS deletion failed: {e}")
             raise AWSError(
                 message=str(e), operation="delete_environment", resource=service_name
             ) from e

{superset_showtime-0.5.0 → superset_showtime-0.5.3}/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)
 
@@ -450,17 +456,31 @@ class PullRequest:
 
         # 2. Remove trigger labels (atomic operation)
         trigger_labels = [label for label in self.labels if "showtime-trigger-" in label]
-        for trigger_label in trigger_labels:
-            get_github().remove_label(self.pr_number, trigger_label)
+        if trigger_labels:
+            print(f"🏷️ Removing trigger labels: {trigger_labels}")
+            for trigger_label in trigger_labels:
+                get_github().remove_label(self.pr_number, trigger_label)
+        else:
+            print("🏷️ No trigger labels to remove")
 
         # 3. Set building state immediately (claim the PR)
         if action in ["create_environment", "rolling_update", "auto_sync"]:
             building_show = self._create_new_show(target_sha)
             building_show.status = "building"
+            
             # Update labels to reflect building state
+            print(f"🏷️ Removing existing circus labels...")
             get_github().remove_circus_labels(self.pr_number)
-            for label in building_show.to_circus_labels():
-                get_github().add_label(self.pr_number, label)
+            
+            new_labels = building_show.to_circus_labels()
+            print(f"🏷️ Creating new labels: {new_labels}")
+            for label in new_labels:
+                try:
+                    get_github().add_label(self.pr_number, label)
+                    print(f"  ✅ Added: {label}")
+                except Exception as e:
+                    print(f"  ❌ Failed to add {label}: {e}")
+                    raise
 
         return True
 
@@ -566,6 +586,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 
@@ -602,3 +633,48 @@ 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
+        """
+        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.0 → superset_showtime-0.5.3}/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")
@@ -202,16 +202,14 @@ class Show:
             ])
             print("🐳 Local environment: Using cache-from only (no export)")
 
-        # Add --load only when building for native architecture or explicitly requested
-        # Intel Mac/Linux can load linux/amd64, Apple Silicon cannot
-        native_x86 = platform.machine() in ("x86_64", "AMD64")
+        # Add --load only when explicitly requested for local testing
         force_load = os.getenv("DOCKER_LOAD", "false").lower() == "true"
-        
-        if native_x86 or force_load:
+
+        if force_load:
             cmd.append("--load")
-            print("🐳 Will load image to local Docker daemon (native x86_64 platform)")
+            print("🐳 Will load image to local Docker daemon (DOCKER_LOAD=true)")
         else:
-            print("🐳 Cross-platform build - pushing to registry only (no local load)")
+            print("🐳 Push-only build (no local load) - faster for CI/deployment")
 
         # Add build context path last
         cmd.append(".")