chore: remove stray char that I had put in to force failure for testing

Author: samrose

ansible/tasks/setup-system.yml

@@ -12,7 +12,7 @@
       ansible.builtin.apt:
         cache_valid_time: 3600
         pkg:
-          - acll
+          - acl
           - bwm-ng
           - fail2ban
           - htop

nix/packages/pg-ami-builder/cmd/build.go

@@ -118,54 +118,67 @@ func runBuildPhase1(cmd *cobra.Command, args []string) error {
 	if packerErr != nil {
 		fmt.Printf("\n✗ Packer build failed: %v\n", packerErr)
 
-		// Try to find the packer instance by tag
-		ec2Client, err := aws.NewEC2Client(ctx, region)
-		if err != nil {
-			fmt.Printf("⚠ Could not create EC2 client to find instance: %v\n", err)
-			return fmt.Errorf("packer build failed: %w", packerErr)
+		// Get state file path first
+		stateFilePath := stateFile
+		if stateFilePath == "" {
+			var err error
+			stateFilePath, err = state.GetDefaultStateFile()
+			if err != nil {
+				fmt.Printf("⚠ Could not get state file path: %v\n", err)
+				return fmt.Errorf("packer build failed: %w", packerErr)
+			}
 		}
 
-		fmt.Println("\n✓ Looking for packer instance...")
-		instanceID, err := ec2Client.FindInstanceByTag(ctx, "packerExecutionId", executionID)
+		// Load existing state or create new
+		buildState, err := state.LoadState(stateFilePath)
 		if err != nil {
-			fmt.Printf("⚠ Could not find packer instance: %v\n", err)
-			fmt.Println("\nPacker may have cleaned up the instance already.")
-			return fmt.Errorf("packer build failed: %w", packerErr)
+			// Create new state if none exists
+			buildState = &state.State{
+				Region:          region,
+				PostgresVersion: postgresVersion,
+				GitSHA:          sha,
+			}
 		}
 
-		fmt.Printf("✓ Found packer instance: %s\n", instanceID)
-
-		// Save state for debugging
-		stateFilePath := stateFile
-		if stateFilePath == "" {
-			stateFilePath, err = state.GetDefaultStateFile()
+		// Try to find the packer instance by tag
+		var instanceID string
+		ec2Client, err := aws.NewEC2Client(ctx, region)
+		if err != nil {
+			fmt.Printf("⚠ Could not create EC2 client to find instance: %v\n", err)
+		} else {
+			fmt.Println("\n✓ Looking for packer instance...")
+			instanceID, err = ec2Client.FindInstanceByTag(ctx, "packerExecutionId", executionID)
 			if err != nil {
-				return fmt.Errorf("failed to get default state file: %w", err)
+				fmt.Printf("⚠ Could not find packer instance: %v\n", err)
+				fmt.Println("  Packer may have cleaned up the instance already.")
+			} else {
+				fmt.Printf("✓ Found packer instance: %s\n", instanceID)
 			}
 		}
 
-		buildState := &state.State{
-			Region:          region,
-			PostgresVersion: postgresVersion,
-			GitSHA:          sha,
-		}
+		// Save state with execution ID (and instance ID if found)
 		buildState.SetPhaseState("phase1", &state.PhaseState{
-			InstanceID:  instanceID,
+			InstanceID:  instanceID, // Will be empty string if not found
 			ExecutionID: executionID,
 			Timestamp:   time.Now().Format(time.RFC3339),
 		})
 
 		if err := state.SaveState(stateFilePath, buildState); err != nil {
-			return fmt.Errorf("failed to save state: %w", err)
+			fmt.Printf("⚠ Could not save state: %v\n", err)
+		} else {
+			fmt.Printf("\n✓ State saved to: %s\n", stateFilePath)
+			fmt.Printf("  Execution ID: %s\n", executionID)
+			if instanceID != "" {
+				fmt.Printf("  Instance ID: %s\n", instanceID)
+				fmt.Printf("\nNext steps:\n")
+				fmt.Printf("  - SSH into instance: pg-ami-builder ssh\n")
+				fmt.Printf("  - Re-run ansible: pg-ami-builder ansible-rerun phase1 --sync-files\n")
+				fmt.Printf("  - Cleanup: pg-ami-builder cleanup\n")
+			} else {
+				fmt.Printf("\nNo instance available for debugging (already cleaned up by packer)\n")
+			}
 		}
 
-		fmt.Printf("\nInstance kept running for debugging:\n")
-		fmt.Printf("  Instance ID: %s\n", instanceID)
-		fmt.Printf("  State saved to: %s\n", stateFilePath)
-		fmt.Printf("\nNext steps:\n")
-		fmt.Printf("  - SSH into instance: pg-ami-builder ssh\n")
-		fmt.Printf("  - Re-run ansible: pg-ami-builder ansible-rerun phase1 --sync-files\n")
-		fmt.Printf("  - Cleanup: pg-ami-builder cleanup\n")
 		return fmt.Errorf("packer build failed: %w", packerErr)
 	}
 
@@ -319,54 +332,67 @@ func runBuildPhase2(cmd *cobra.Command, args []string) error {
 	if packerErr != nil {
 		fmt.Printf("\n✗ Packer build failed: %v\n", packerErr)
 
-		// Try to find the packer instance by tag
-		ec2Client, err := aws.NewEC2Client(ctx, region)
-		if err != nil {
-			fmt.Printf("⚠ Could not create EC2 client to find instance: %v\n", err)
-			return fmt.Errorf("packer build failed: %w", packerErr)
+		// Get state file path first
+		stateFilePath := stateFile
+		if stateFilePath == "" {
+			var err error
+			stateFilePath, err = state.GetDefaultStateFile()
+			if err != nil {
+				fmt.Printf("⚠ Could not get state file path: %v\n", err)
+				return fmt.Errorf("packer build failed: %w", packerErr)
+			}
 		}
 
-		fmt.Println("\n✓ Looking for packer instance...")
-		instanceID, err := ec2Client.FindInstanceByTag(ctx, "packerExecutionId", executionID)
+		// Load existing state or create new
+		buildState, err := state.LoadState(stateFilePath)
 		if err != nil {
-			fmt.Printf("⚠ Could not find packer instance: %v\n", err)
-			fmt.Println("\nPacker may have cleaned up the instance already.")
-			return fmt.Errorf("packer build failed: %w", packerErr)
+			// Create new state if none exists
+			buildState = &state.State{
+				Region:          region,
+				PostgresVersion: postgresVersion,
+				GitSHA:          sha,
+			}
 		}
 
-		fmt.Printf("✓ Found packer instance: %s\n", instanceID)
-
-		// Save state for debugging
-		stateFilePath := stateFile
-		if stateFilePath == "" {
-			stateFilePath, err = state.GetDefaultStateFile()
+		// Try to find the packer instance by tag
+		var instanceID string
+		ec2Client, err := aws.NewEC2Client(ctx, region)
+		if err != nil {
+			fmt.Printf("⚠ Could not create EC2 client to find instance: %v\n", err)
+		} else {
+			fmt.Println("\n✓ Looking for packer instance...")
+			instanceID, err = ec2Client.FindInstanceByTag(ctx, "packerExecutionId", executionID)
 			if err != nil {
-				return fmt.Errorf("failed to get default state file: %w", err)
+				fmt.Printf("⚠ Could not find packer instance: %v\n", err)
+				fmt.Println("  Packer may have cleaned up the instance already.")
+			} else {
+				fmt.Printf("✓ Found packer instance: %s\n", instanceID)
 			}
 		}
 
-		buildState := &state.State{
-			Region:          region,
-			PostgresVersion: postgresVersion,
-			GitSHA:          sha,
-		}
+		// Save state with execution ID (and instance ID if found)
 		buildState.SetPhaseState("phase2", &state.PhaseState{
-			InstanceID:  instanceID,
+			InstanceID:  instanceID, // Will be empty string if not found
 			ExecutionID: executionID,
 			Timestamp:   time.Now().Format(time.RFC3339),
 		})
 
 		if err := state.SaveState(stateFilePath, buildState); err != nil {
-			return fmt.Errorf("failed to save state: %w", err)
+			fmt.Printf("⚠ Could not save state: %v\n", err)
+		} else {
+			fmt.Printf("\n✓ State saved to: %s\n", stateFilePath)
+			fmt.Printf("  Execution ID: %s\n", executionID)
+			if instanceID != "" {
+				fmt.Printf("  Instance ID: %s\n", instanceID)
+				fmt.Printf("\nNext steps:\n")
+				fmt.Printf("  - SSH into instance: pg-ami-builder ssh\n")
+				fmt.Printf("  - Re-run ansible: pg-ami-builder ansible-rerun phase2 --sync-files\n")
+				fmt.Printf("  - Cleanup: pg-ami-builder cleanup\n")
+			} else {
+				fmt.Printf("\nNo instance available for debugging (already cleaned up by packer)\n")
+			}
 		}
 
-		fmt.Printf("\nInstance kept running for debugging:\n")
-		fmt.Printf("  Instance ID: %s\n", instanceID)
-		fmt.Printf("  State saved to: %s\n", stateFilePath)
-		fmt.Printf("\nNext steps:\n")
-		fmt.Printf("  - SSH into instance: pg-ami-builder ssh\n")
-		fmt.Printf("  - Re-run ansible: pg-ami-builder ansible-rerun phase2 --sync-files\n")
-		fmt.Printf("  - Cleanup: pg-ami-builder cleanup\n")
 		return fmt.Errorf("packer build failed: %w", packerErr)
 	}