trying to fix ssh key issue

AWS/cleanup.yml

@@ -389,54 +389,41 @@
           - "VPC resources deleted: {{ vpc_check.vpcs | length == 0 }}"
       when: not disable_summary | default(false)
 
-    # STEP 14: Delete key pairs - more reliable implementation
-    - name: Find key pairs related to deployment
-      amazon.aws.ec2_key_info:
-        region: "{{ aws_region }}"
-      register: all_key_pairs
-
-    - name: Delete deployment related key pairs
-      amazon.aws.ec2_key:
-        name: "{{ item.key_name }}"
-        region: "{{ aws_region }}"
-        state: absent
-      loop: "{{ all_key_pairs.key_pairs | selectattr('key_name', 'search', deployment_id) | list }}"
-      when: all_key_pairs.key_pairs | length > 0
-      
-    # Add this after your existing key pair finding task
-    - name: Find c2deploy key pairs
-      amazon.aws.ec2_key:
-        name: "c2deploy_{{ deployment_id }}"
-        region: "{{ aws_region }}"
-        state: present
-      register: c2deploy_key_check
+    # STEP 14: Delete key pairs - completely revised implementation
+    - name: Check for deployment key in AWS
+      shell: |
+        aws ec2 describe-key-pairs --region {{ aws_region }} --filters "Name=key-name,Values=c2deploy_{{ deployment_id }}" --query "KeyPairs[*].KeyName" --output text
+      environment:
+        AWS_ACCESS_KEY_ID: "{{ aws_access_key }}"
+        AWS_SECRET_ACCESS_KEY: "{{ aws_secret_key }}"
+      register: keypair_check
       ignore_errors: yes
       
-    - name: Delete c2deploy key pairs
+    - name: Delete deployment key pair if it exists
       amazon.aws.ec2_key:
         name: "c2deploy_{{ deployment_id }}"
         region: "{{ aws_region }}"
         state: absent
-      when: not c2deploy_key_check.failed | default(true)
-      register: deleted_c2deploy_key
-
-    # STEP 15: Delete SSH key files
+      when: keypair_check.stdout | trim != ""
+      register: deleted_keypair
+      
     - name: Delete SSH key files
       file:
         path: "{{ item }}"
         state: absent
       with_items:
+        - "~/.ssh/c2deploy_{{ deployment_id }}.pem"
+        - "~/.ssh/c2deploy_{{ deployment_id }}.pub"
         - "~/.ssh/{{ redirector_name }}.pem"
         - "~/.ssh/{{ c2_name }}.pem"
         - "~/.ssh/{{ tracker_name }}.pem"
-        - "~/.ssh/c2deploy_{{ deployment_id }}.pem"  # Fix: add .pem extension
-        - "~/.ssh/c2deploy_{{ deployment_id }}.pub"
       ignore_errors: yes
       register: deleted_ssh_files
       
     - name: Count deleted SSH files
       set_fact:
         cleanup_summary: "{{ cleanup_summary | combine({
+          'keypairs_deleted': (deleted_keypair.changed | default(false)) | ternary(1, 0),
           'ssh_files_deleted': (deleted_ssh_files.results | selectattr('changed', 'defined') | selectattr('changed') | list | length)}) }}"
     
     # Remove infrastructure state file - fix path to include deployment_id
@@ -458,7 +445,7 @@
           - "Security Groups:   {{ cleanup_summary.security_groups_found | default(0) }} found, {{ deleted_sgs.results | default([]) | length }} deleted"
           - "Network Interfaces: {{ cleanup_summary.enis_found | default(0) }} found, {{ deleted_enis.results | default([]) | length }} deleted"
           - "VPCs:              {{ cleanup_summary.vpcs_found | default(0) }} found, {{ cleanup_summary.vpcs_deleted | default(0) }} deleted"
-          - "Key Pairs:         {{ cleanup_summary.keypairs_deleted | default(0) }} deleted" 
+          - "Key Pairs:         {{ deleted_key_pairs.results | default([]) | length }} deleted" 
           - "SSH Key Files:     {{ cleanup_summary.ssh_files_deleted | default(0) }} deleted"
           - "Infrastructure file: {{ 'Removed' if infra_file.changed else 'Not found' }}"
           - "=========================================================="