From cec20ac64ae57ae16941121273255767d3520e4b Mon Sep 17 00:00:00 2001
From: Ben Hartshorne <ben@parse.com>
Date: Thu, 27 Dec 2012 13:14:14 -0800
Subject: [PATCH 1/2] extending server-delete to also delete route53 entries
 and EBS volumes, if present.

---
 exec/server-delete.rb | 57 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/exec/server-delete.rb b/exec/server-delete.rb
index 6765594..ddf6d6d 100644
--- a/exec/server-delete.rb
+++ b/exec/server-delete.rb
@@ -1,6 +1,44 @@
 require 'fog'
 def remove(name)
 
+  # get some values from the node for future use
+  mynode = nodes.show(name)
+  instance_id = mynode[:ec2][:instance_id]
+  zone_id = mynode[:route53][:zone_id]
+  int_domain = mynode[:route53][:int_domain]
+  aws_creds = Chef::EncryptedDataBagItem.load("passwords", "aws")
+
+  puts "iid #{instance_id} zid #{zone_id} intd #{int_domain}"
+  ## Delete the Route53 DNS record
+  r53 = Fog::DNS::new( :provider => "aws",
+                       :aws_access_key_id => aws_creds["aws_access_key_id"],
+                       :aws_secret_access_key => aws_creds["aws_secret_access_key"])
+  zone = r53.zones.get(zone_id)
+  puts "looking for #{name}.#{int_domain}."
+  record = zone.records.get("#{name}.#{int_domain}.")
+  puts "found #{record}"
+  if record.nil?
+    puts "No DNS records found; skipping DNS deletion."
+  else
+    print "Deleting #{record.name} from DNS... "
+    record.destroy
+    puts "done."
+  end
+
+  # search for attached EBS volumes to delete after the node if they exist
+  aws = Fog::Compute::new( :provider => "aws",
+                           :aws_access_key_id => aws_creds["aws_access_key_id"],
+                           :aws_secret_access_key => aws_creds["aws_secret_access_key"])
+  # get all volumes that are attached to this node
+  volumes = aws.volumes.select {|vol| vol.server_id == instance_id}
+  if volumes.length.zero?
+    puts "no volumes found."
+  else
+    puts "EBS Volumes are #{volumes.map {|vol| vol.id}}"
+  end
+  # volumes now contains an array of volume objects or []
+  # these are stored for the end when, after the server's deleted, the then-unattached volumes can be deleted.
+
   ## Delete the Server
   delete_ec2 = Chef::Knife::Ec2ServerDelete.new()
   delete_ec2.name_args = [nodes.show(name)['ec2']['instance_id']]
@@ -16,6 +54,25 @@ def remove(name)
   delete_client.name_args = [name]
   delete_client.run
 
+  volumes.each do |volume|
+    # wait for the volume to detach from the instance we just killed
+    print "Waiting for up to 5 minutes for the volume #{volume.id} to detach: "
+    300.times do |n|
+      if volume.ready?
+        puts "destroying volume"
+        volume.destroy
+        break
+      end
+      print "."
+      sleep 1
+      volume.reload
+    end
+  end #volumes.each
+  volumes = aws.volumes.select {|vol| vol.server_id == instance_id}
+  unless volumes.length.zero?
+    puts "Failed to destroy volumes: volumes still contain #{volumes.map {|vol| vol.id}}."
+  end
+
 end
 
 

From 9af47dd058d1e84338297f9c86fa7f66be8d7192 Mon Sep 17 00:00:00 2001
From: Ben Hartshorne <ben@parse.com>
Date: Thu, 27 Dec 2012 13:16:42 -0800
Subject: [PATCH 2/2] removing some debugging print statements.

---
 exec/server-delete.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exec/server-delete.rb b/exec/server-delete.rb
index ddf6d6d..0e6ebeb 100644
--- a/exec/server-delete.rb
+++ b/exec/server-delete.rb
@@ -8,15 +8,15 @@ def remove(name)
   int_domain = mynode[:route53][:int_domain]
   aws_creds = Chef::EncryptedDataBagItem.load("passwords", "aws")
 
-  puts "iid #{instance_id} zid #{zone_id} intd #{int_domain}"
+  #puts "iid #{instance_id} zid #{zone_id} intd #{int_domain}"
   ## Delete the Route53 DNS record
   r53 = Fog::DNS::new( :provider => "aws",
                        :aws_access_key_id => aws_creds["aws_access_key_id"],
                        :aws_secret_access_key => aws_creds["aws_secret_access_key"])
   zone = r53.zones.get(zone_id)
-  puts "looking for #{name}.#{int_domain}."
+  #puts "looking for #{name}.#{int_domain}."
   record = zone.records.get("#{name}.#{int_domain}.")
-  puts "found #{record}"
+  #puts "found #{record}"
   if record.nil?
     puts "No DNS records found; skipping DNS deletion."
   else