dayhoff-tools 1.4.17__tar.gz → 1.4.18__tar.gz

{dayhoff_tools-1.4.17 → dayhoff_tools-1.4.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.4.17
+Version: 1.4.18
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.4.17 → dayhoff_tools-1.4.18}/dayhoff_tools/cli/engine_commands.py

@@ -1269,20 +1269,25 @@ def create_ami(
     ec2 = boto3.client("ec2", region_name="us-east-1")
 
     try:
-        # First, we need to clean up the sentinel file via SSM
-        console.print("Cleaning up bootstrap sentinel file...")
+        # First, we need to clean up the instance before snapshotting
+        console.print("Cleaning up instance for AMI creation...")
         ssm = boto3.client("ssm", region_name="us-east-1")
 
+        # Stop SSM, wipe registration, remove sentinel, and clear logs/history
+        cleanup_commands = [
+            "sudo systemctl stop amazon-ssm-agent",
+            "sudo rm -rf /var/lib/amazon/ssm/* /etc/amazon/ssm/*",
+            "sudo rm -f /opt/dayhoff/first_boot_complete.sentinel",
+            "history -c",
+            "sudo rm -rf /tmp/* /var/log/messages /var/log/cloud-init.log",
+        ]
+
         cleanup_response = ssm.send_command(
             InstanceIds=[engine["instance_id"]],
             DocumentName="AWS-RunShellScript",
             Parameters={
-                "commands": [
-                    "sudo rm -f /opt/dayhoff/first_boot_complete.sentinel",
-                    "history -c",
-                    "sudo rm -rf /tmp/* /var/log/*",
-                ],
-                "executionTimeout": ["60"],
+                "commands": cleanup_commands,
+                "executionTimeout": ["120"],
             },
         )
 

{dayhoff_tools-1.4.17 → dayhoff_tools-1.4.18}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.4.17"
+version = "1.4.18"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}