From 9a329423a48ca042729acc72ebdd3983a40596d0 Mon Sep 17 00:00:00 2001
From: Ryan King <rking@chanzuckerberg.com>
Date: Wed, 24 Jun 2020 14:43:58 -0700
Subject: [PATCH 1/3] nuke more resources

Add more resources to be used with aws-nuke.
---
 aws-nuke.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/aws-nuke.yml b/aws-nuke.yml
index 832b8b2e..7c5d2380 100644
--- a/aws-nuke.yml
+++ b/aws-nuke.yml
@@ -1,4 +1,7 @@
 regions:
+  - us-east-1
+  - us-east-2
+  - us-west-1
   - us-west-2
 
 account-blacklist:
@@ -13,18 +16,27 @@ accounts:
       EC2SecurityGroup:
         - type: glob
           value: "shared-infra-cztack-ci-bastion-*"
+      EC2Instance:
+        - type: glob
+          value: "shared-infra-cztack-ci-bastion-*"
 
 
 
 resource-types:
   # we can add to this over time
   targets:
-    - RDSDBCluster
-    - RDSSnapshot
-    - RDSInstance
-    - RDSDBClusterParameterGroup
-    - RDSDBParameterGroup
     - EC2Image
-    - EC2Snapshot
+    - EC2Instance
     - EC2KeyPair
     - EC2SecurityGroup
+    - EC2Snapshot
+    - EFSFileSystem
+    - EFSMountTarget
+    - ElasticacheCacheCluster
+    - IAMRole
+    - RDSDBCluster
+    - RDSDBClusterParameterGroup
+    - RDSDBParameterGroup
+    - RDSInstance
+    - RDSSnapshot
+    - S3Bucket

From c9f5f7ad37c9ad86c6fbec6077bffdfef2f1eac9 Mon Sep 17 00:00:00 2001
From: Ryan King <rking@chanzuckerberg.com>
Date: Thu, 25 Jun 2020 10:09:47 -0700
Subject: [PATCH 2/3] filter resources tagged cztack-ci

---
 aws-nuke.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/aws-nuke.yml b/aws-nuke.yml
index 7c5d2380..5454c7a8 100644
--- a/aws-nuke.yml
+++ b/aws-nuke.yml
@@ -14,13 +14,11 @@ accounts:
         - cztack-ci
         - edu
       EC2SecurityGroup:
-        - type: glob
-          value: "shared-infra-cztack-ci-bastion-*"
+        - property: "tag:env"
+          value: "cztack-ci"
       EC2Instance:
-        - type: glob
-          value: "shared-infra-cztack-ci-bastion-*"
-
-
+        - property: "tag:env"
+          value: "cztack-ci"
 
 resource-types:
   # we can add to this over time

From 4cc7778c338804790f5bdcb9f7189235957b0897 Mon Sep 17 00:00:00 2001
From: Ryan King <rking@chanzuckerberg.com>
Date: Thu, 25 Jun 2020 10:18:37 -0700
Subject: [PATCH 3/3] fix filter for bastion sgs

---
 aws-nuke.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aws-nuke.yml b/aws-nuke.yml
index 5454c7a8..8297cafc 100644
--- a/aws-nuke.yml
+++ b/aws-nuke.yml
@@ -14,8 +14,9 @@ accounts:
         - cztack-ci
         - edu
       EC2SecurityGroup:
-        - property: "tag:env"
-          value: "cztack-ci"
+        - property: Name
+          type: contains
+          value: bastion
       EC2Instance:
         - property: "tag:env"
           value: "cztack-ci"