working on aws still but deployment works

This commit is contained in:
n0mad1k
2025-05-03 00:36:37 -04:00
parent 3bb2ec107d
commit 358b82a1a5
6 changed files with 308 additions and 257 deletions
+129 -97
View File
@@ -9,8 +9,10 @@
- vars.yaml
vars:
delete_results: {}
vpc_cleanup_list: []
tasks:
# Confirmation prompts
- name: Confirm cleanup
pause:
prompt: "This will delete all AWS resources for deployment ID {{ deployment_id }}. Continue? (yes/no)"
@@ -23,7 +25,32 @@
fail_msg: "Cleanup cancelled by user"
when: confirm_cleanup | default(true) | bool
# C2 server cleanup
# Check for and load shared infrastructure file
- name: Check for shared infrastructure state
stat:
path: "infrastructure_state.json"
register: infra_state_file
- name: Load shared infrastructure state
include_vars:
file: "infrastructure_state.json"
name: shared_infra
when: infra_state_file.stat.exists | default(false)
# Initialize cleaned resources tracking
- name: Initialize cleaned resources tracking
set_fact:
cleaned_resources:
instances: []
key_pairs: []
security_groups: []
network_interfaces: []
route_tables: []
subnets: []
internet_gateways: []
vpcs: []
# EC2 Instance cleanup
- name: Terminate C2 instances
amazon.aws.ec2_instance:
state: absent
@@ -33,7 +60,11 @@
register: c2_instances_result
when: cleanup_c2 | default(true) | bool
# Redirector cleanup
- name: Update cleaned instances list for C2
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'instances': cleaned_resources.instances + c2_instances_result.instance_ids}, recursive=true) }}"
when: cleanup_c2 | default(true) | bool and c2_instances_result.instance_ids is defined
- name: Terminate redirector instances
amazon.aws.ec2_instance:
state: absent
@@ -42,8 +73,12 @@
"tag:Name": "{{ redirector_name }}"
register: redirector_instances_result
when: cleanup_redirector | default(true) | bool
- name: Update cleaned instances list for redirector
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'instances': cleaned_resources.instances + redirector_instances_result.instance_ids}, recursive=true) }}"
when: cleanup_redirector | default(true) | bool and redirector_instances_result.instance_ids is defined
# Tracker cleanup
- name: Terminate tracker instances
amazon.aws.ec2_instance:
state: absent
@@ -52,14 +87,21 @@
"tag:Name": "{{ tracker_name | default('t-' + deployment_id) }}"
register: tracker_instances_result
when: cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool
- name: Update cleaned instances list for tracker
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'instances': cleaned_resources.instances + tracker_instances_result.instance_ids}, recursive=true) }}"
when: cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool and tracker_instances_result.instance_ids is defined
# We need to wait a bit for instances to terminate before we can clean up security groups
# Wait for all instances to terminate before attempting to clean up dependent resources
- name: Wait for instances to terminate
pause:
seconds: 30
when: cleanup_c2 | default(true) | bool or cleanup_redirector | default(true) | bool or (cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool)
when: (cleanup_c2 | default(true) | bool and c2_instances_result.changed | default(false)) or
(cleanup_redirector | default(true) | bool and redirector_instances_result.changed | default(false)) or
(cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool and tracker_instances_result.changed | default(false))
# Delete key pairs
# Key pair cleanup
- name: Delete C2 EC2 key pair
amazon.aws.ec2_key:
name: "{{ c2_name }}"
@@ -68,6 +110,11 @@
register: c2_key_result
when: cleanup_c2 | default(true) | bool
- name: Update cleaned key pairs list for C2
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'key_pairs': cleaned_resources.key_pairs + [c2_name]}, recursive=true) }}"
when: cleanup_c2 | default(true) | bool and c2_key_result.changed | default(false)
- name: Delete redirector EC2 key pair
amazon.aws.ec2_key:
name: "{{ redirector_name }}"
@@ -76,6 +123,11 @@
register: redirector_key_result
when: cleanup_redirector | default(true) | bool
- name: Update cleaned key pairs list for redirector
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'key_pairs': cleaned_resources.key_pairs + [redirector_name]}, recursive=true) }}"
when: cleanup_redirector | default(true) | bool and redirector_key_result.changed | default(false)
- name: Delete tracker EC2 key pair
amazon.aws.ec2_key:
name: "{{ tracker_name | default('t-' + deployment_id) }}"
@@ -84,7 +136,12 @@
register: tracker_key_result
when: cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool
# Security Groups
- name: Update cleaned key pairs list for tracker
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'key_pairs': cleaned_resources.key_pairs + [tracker_name | default('t-' + deployment_id)]}, recursive=true) }}"
when: cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool and tracker_key_result.changed | default(false)
# Security group cleanup
- name: Delete C2 security group
amazon.aws.ec2_security_group:
name: "{{ c2_name }}-sg"
@@ -94,6 +151,11 @@
ignore_errors: yes
when: cleanup_c2 | default(true) | bool
- name: Update cleaned security groups list for C2
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'security_groups': cleaned_resources.security_groups + [c2_sg_result.group_id | default('')]}, recursive=true) }}"
when: cleanup_c2 | default(true) | bool and c2_sg_result.changed | default(false) and c2_sg_result.group_id is defined
- name: Delete redirector security group
amazon.aws.ec2_security_group:
name: "{{ redirector_name }}-sg"
@@ -103,6 +165,11 @@
ignore_errors: yes
when: cleanup_redirector | default(true) | bool
- name: Update cleaned security groups list for redirector
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'security_groups': cleaned_resources.security_groups + [redirector_sg_result.group_id | default('')]}, recursive=true) }}"
when: cleanup_redirector | default(true) | bool and redirector_sg_result.changed | default(false) and redirector_sg_result.group_id is defined
- name: Delete tracker security group
amazon.aws.ec2_security_group:
name: "{{ tracker_name | default('t-' + deployment_id) }}-sg"
@@ -112,97 +179,62 @@
ignore_errors: yes
when: cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool
# VPC Resources
- name: Get VPCs
- name: Update cleaned security groups list for tracker
set_fact:
cleaned_resources: "{{ cleaned_resources | combine({'security_groups': cleaned_resources.security_groups + [tracker_sg_result.group_id | default('')]}, recursive=true) }}"
when: cleanup_tracker | default(true) | bool and track_deployment | default(false) | bool and tracker_sg_result.changed | default(false) and tracker_sg_result.group_id is defined
# Identify VPCs to clean up
- name: Get VPCs by deployment tag
amazon.aws.ec2_vpc_net_info:
region: "{{ aws_region }}"
filters:
"tag:deployment_id": "{{ deployment_id }}"
register: vpc_info
- name: Get subnets
amazon.aws.ec2_vpc_subnet_info:
region: "{{ aws_region }}"
filters:
"tag:deployment_id": "{{ deployment_id }}"
register: subnet_info
- name: Get route tables
amazon.aws.ec2_vpc_route_table_info:
region: "{{ aws_region }}"
filters:
"tag:deployment_id": "{{ deployment_id }}"
register: route_table_info
- name: Get internet gateways
amazon.aws.ec2_vpc_igw_info:
region: "{{ aws_region }}"
filters:
"tag:deployment_id": "{{ deployment_id }}"
register: igw_info
register: tagged_vpcs
# Get and delete any remaining network interfaces in these VPCs
- name: Get network interfaces in VPCs
amazon.aws.ec2_eni_info:
region: "{{ aws_region }}"
filters:
vpc-id: "{{ item.vpc_id }}"
loop: "{{ vpc_info.vpcs }}"
register: eni_info
- name: Delete network interfaces
amazon.aws.ec2_eni:
region: "{{ aws_region }}"
eni_id: "{{ item.1.network_interface_id }}"
- name: Add tagged VPCs to cleanup list
set_fact:
vpc_cleanup_list: "{{ vpc_cleanup_list + [item.vpc_id] }}"
with_items: "{{ tagged_vpcs.vpcs }}"
when: tagged_vpcs.vpcs | length > 0
- name: Add shared VPC to cleanup if both C2 and redirector being cleaned
set_fact:
vpc_cleanup_list: "{{ vpc_cleanup_list + [shared_infra.vpc_id] }}"
when: >
infra_state_file.stat.exists | default(false) and
shared_infra.vpc_id is defined and
cleanup_c2 | default(true) | bool and
cleanup_redirector | default(true) | bool
# Make the VPC cleanup list unique
- name: Deduplicate VPC cleanup list
set_fact:
vpc_cleanup_list: "{{ vpc_cleanup_list | unique }}"
when: vpc_cleanup_list | length > 0
# Process each VPC - direct inline implementation instead of temporary files
- name: Process VPCs for cleanup
block:
- name: Process each VPC
include_tasks: "../tasks/process_vpc.yml"
vars:
vpc_id: "{{ item }}"
with_items: "{{ vpc_cleanup_list | unique }}"
when: vpc_cleanup_list | length > 0
# Clean up infrastructure state file if both C2 and redirector are being cleaned
- name: Remove infrastructure state file if cleaning up shared infrastructure
file:
path: "infrastructure_state.json"
state: absent
force_detach: true
loop: "{{ eni_info.results | subelements('network_interfaces', skip_missing=true) }}"
register: eni_deleted
ignore_errors: yes
# Delete VPC resources
- name: Delete route tables
amazon.aws.ec2_vpc_route_table:
region: "{{ aws_region }}"
vpc_id: "{{ item.vpc_id }}"
route_table_id: "{{ item.id }}"
state: absent
loop: "{{ route_table_info.route_tables }}"
register: route_tables_deleted
ignore_errors: yes
- name: Delete internet gateways
amazon.aws.ec2_vpc_igw:
region: "{{ aws_region }}"
vpc_id: "{{ item.attachments[0].vpc_id }}"
state: absent
loop: "{{ igw_info.internet_gateways }}"
register: igws_deleted
ignore_errors: yes
- name: Delete subnets
amazon.aws.ec2_vpc_subnet:
region: "{{ aws_region }}"
vpc_id: "{{ item.vpc_id }}"
cidr: "{{ item.cidr_block }}"
state: absent
loop: "{{ subnet_info.subnets }}"
register: subnets_deleted
ignore_errors: yes
# Wait before trying to delete VPCs to allow AWS to catch up on dependency deletions
- name: Wait for AWS to process subnet and gateway deletions
pause:
seconds: 15
- name: Delete VPCs
amazon.aws.ec2_vpc_net:
region: "{{ aws_region }}"
vpc_id: "{{ item.id }}"
state: absent
loop: "{{ vpc_info.vpcs }}"
register: vpcs_deleted
ignore_errors: yes
when: >
infra_state_file.stat.exists | default(false) and
((cleanup_c2 | default(true) | bool and cleanup_redirector | default(true) | bool) or
(cleanup_c2 | default(true) | bool and not cleanup_redirector | default(true) | bool and
c2_region | default(aws_region) == shared_infra.region) or
(cleanup_redirector | default(true) | bool and not cleanup_c2 | default(true) | bool and
redirector_region | default(aws_region) == shared_infra.region))
# Create summary of deleted resources
- name: Collect all deleted resources
@@ -221,11 +253,11 @@
redirector: "{{ redirector_sg_result.group_id | default('') | ternary([redirector_sg_result.group_id], []) }}"
tracker: "{{ tracker_sg_result.group_id | default('') | ternary([tracker_sg_result.group_id], []) }}"
vpc_resources:
route_tables: "{{ route_tables_deleted.results | default([]) | map(attribute='item.id', default='') | select() | list }}"
internet_gateways: "{{ igws_deleted.results | default([]) | map(attribute='gateway_id', default='') | select() | list }}"
subnets: "{{ subnets_deleted.results | default([]) | map(attribute='subnet.id', default='') | select() | list }}"
network_interfaces: "{{ eni_deleted.results | default([]) | map(attribute='interface.id', default='') | select() | list }}"
vpcs: "{{ vpcs_deleted.results | default([]) | map(attribute='vpc.id', default='') | select() | list }}"
route_tables: "{{ cleaned_resources.route_tables | default([]) }}"
internet_gateways: "{{ cleaned_resources.internet_gateways | default([]) }}"
subnets: "{{ cleaned_resources.subnets | default([]) }}"
network_interfaces: "{{ cleaned_resources.network_interfaces | default([]) }}"
vpcs: "{{ cleaned_resources.vpcs | default([]) }}"
when: not disable_summary | default(false)
# Display summary of deleted resources