Sync expiry dates from YAML and delete expired servers in same run

Author: jimmygchen

scripts/provision.py

@@ -102,19 +102,34 @@ def main():
         try:
             expiry_date = datetime.strptime(until, '%Y-%m-%d').date()
             today_utc = datetime.now(timezone.utc).date()
-            if expiry_date < today_utc:
-                print(f"\n=== {name} (user: {key}) ===")
-                print(f"Expired on {until}, skipping")
-                continue
+            is_expired = expiry_date < today_utc
         except ValueError:
             print(f"ERROR: Invalid date '{until}'")
             continue
 
         print(f"\n=== {name} (user: {key}) ===")
 
-        ret, stdout, _ = run_cmd(f"hcloud server list -o noheader -o columns=name | grep -x '{name}' || true", dry_run=False)
+        # Check if server already exists
+        ret, stdout, _ = run_cmd(f"hcloud server describe '{name}' -o json 2>/dev/null || true", dry_run=False)
         if stdout:
-            print(f"Already exists, skipping")
+            server_info = json.loads(stdout)
+            current_expiry = server_info.get('labels', {}).get('expires')
+            if current_expiry != until:
+                print(f"Expiry changed: {current_expiry} -> {until}")
+                if args.dry_run:
+                    print(f"  [DRY-RUN] Would update expiry label")
+                else:
+                    ret, _, stderr = run_cmd(f"hcloud server add-label '{name}' expires={until} --overwrite")
+                    if ret != 0:
+                        print(f"ERROR: Failed to update label: {stderr}")
+                    else:
+                        print(f"Updated expiry label")
+            else:
+                print(f"Already exists with correct expiry")
+            continue
+
+        if is_expired:
+            print(f"Expired on {until}, skipping creation")
             continue
 
         print(f"Fetching SSH keys from github.com/{key}.keys")

scripts/teardown.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
-"""Delete managed servers not in dev_boxes.yml"""
+"""Delete managed servers not in dev_boxes.yml or expired"""
 import yaml
 import subprocess
 import sys
 import json
+from datetime import datetime, timezone
 
 
 def run_cmd(cmd):
@@ -15,13 +16,20 @@ def main():
     # Get current dev_boxes.yml
     try:
         with open('dev_boxes.yml', 'r') as f:
-            data = yaml.safe_load(f)
-            current_names = {box.get('name') for box in (data or []) if box.get('name')}
+            data = yaml.safe_load(f) or []
+            boxes_by_name = {}
+            for box in data:
+                name = box.get('name')
+                if name:
+                    until = box.get('until')
+                    if until and not isinstance(until, str):
+                        until = str(until)
+                    boxes_by_name[name] = until
     except Exception as e:
         print(f"ERROR: Could not read dev_boxes.yml: {e}")
         sys.exit(1)
 
-    print(f"Current dev_boxes.yml has {len(current_names)} server(s)")
+    print(f"Current dev_boxes.yml has {len(boxes_by_name)} server(s)")
 
     # Get all managed servers from Hetzner
     ret, stdout, _ = run_cmd("hcloud server list -o json -l managed-by=dev-box-provisioner")
@@ -34,19 +42,31 @@ def main():
 
     print(f"Found {len(managed_names)} managed server(s) in Hetzner")
 
-    # Find servers to delete (in Hetzner but not in YAML)
-    to_delete = managed_names - current_names
+    today_utc = datetime.now(timezone.utc).date()
+    to_delete = []
+
+    for name in managed_names:
+        if name not in boxes_by_name:
+            to_delete.append((name, "not in YAML"))
+        else:
+            until = boxes_by_name[name]
+            if until:
+                try:
+                    expiry_date = datetime.strptime(until, '%Y-%m-%d').date()
+                    if expiry_date < today_utc:
+                        to_delete.append((name, f"expired on {until}"))
+                except ValueError:
+                    pass
 
     if not to_delete:
         print("No servers to delete")
         return
 
-    print(f"Deleting {len(to_delete)} server(s) not in dev_boxes.yml")
+    print(f"Deleting {len(to_delete)} server(s)")
 
-    for name in to_delete:
-        print(f"\n=== Deleting: {name} ===")
+    for name, reason in to_delete:
+        print(f"\n=== Deleting: {name} ({reason}) ===")
 
-        # Delete the server
         ret, _, stderr = run_cmd(f"hcloud server delete '{name}'")
         if ret != 0:
             print(f"ERROR: Failed to delete server: {stderr}")