ec2launcher 1.3.12 → 1.4.0

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 1.4.0
+
+* When terminating an instance, delete all EBS snapshots for volumes attached to that instance.
+
 ## 1.3.12
 
-* Use run_with_backoff when searching for AMI.
+* Use run_with_backoff when searching for AMI and existing hosts.
 * Fixed bug introduced by BlockDeviceBuilder refactoring.
 
 ## 1.3.11

data/bin/ec2launcher

@@ -28,7 +28,7 @@ if opt_parser.command == "init"
     puts "Successfully created #{opt_parser.location}"
 elsif opt_parser.command =~ /^term/
     terminator = EC2Launcher::Terminator.new(opt_parser.options.directory, opt_parser.options.environ)
-    terminator.terminate(opt_parser.hostname, opt_parser.options.access_key, opt_parser.options.secret_key)
+    terminator.terminate(opt_parser.hostname, opt_parser.options.access_key, opt_parser.options.secret_key, opt_parser.snapshot_removal)
 elsif opt_parser.command == "launch"
     launcher = EC2Launcher::Launcher.new
     launcher.launch(opt_parser.options)

data/lib/ec2launcher/init_options.rb

@@ -73,6 +73,13 @@ module EC2Launcher
           @options.skip_setup = true
         end
 
+        opts.separator ""
+        opts.separator "Termination options:"
+
+        opts.on("--[no-]snapshot-removal", "Remove EBS snapshots. Defaults to TRUE.") do |removal|
+          @options.snapshot_removal = removal
+        end
+
         opts.separator ""
         opts.separator "Overrides:"
 
@@ -162,6 +169,8 @@ module EC2Launcher
       @options.instance_type = nil
       @options.volume_size = nil
 
+      @options.snapshot_removal = true
+
       @options.verbosity = :normal
 
       @options.directory = "./"

data/lib/ec2launcher/terminator.rb

@@ -43,7 +43,8 @@ module EC2Launcher
     # @param[String] server_name Name of the server instance
     # @param[String] access_key Amazon IAM access key
     # @param[String] secret Amazon IAM secret key
-    def terminate(server_name, access_key, secret)
+    # @param[Boolean] snapshot_removal Remove EBS snapshots for EBS volumes attached to the instance.
+    def terminate(server_name, access_key, secret, snapshot_removal = true)
       ##############################
       # Initialize AWS and create EC2 connection
       ##############################
@@ -71,6 +72,11 @@ module EC2Launcher
       end # memoize
 
       if instance
+        # Remove EBS snapshots
+        AWS.memoize do
+          remove_snapshots(ec2, instance) if snapshot_removal
+        end
+
         private_ip_address = instance.private_ip_address
         
         run_with_backoff(30, 1, "terminating instance: #{server_name} [#{instance.instance_id}]") do
@@ -91,5 +97,21 @@ module EC2Launcher
         @log.error("Unable to find instance: #{server_name}")
       end
     end
+
+    def remove_snapshots(ec2, instance)
+      # Find EBS volumes for instance
+      volumes = instance.block_device_mappings.values
+
+      # Iterate over over volumes to find snapshots
+      @log.info("  Searching for snapshots...")
+      snapshots = []
+      volumes.each do |vol|
+        volume_snaps = ec2.snapshots.filter("volume-id", vol.id)
+        snapshots += volume_snaps
+      end
+
+      @log.info("  Deleting #{snapshots.size} snapshots...")
+      snapshots.each {|snap| snap.delete }
+    end
   end
 end

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.3.12"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -147,4 +147,3 @@ summary: Tool to launch EC2 instances.
 test_files:
 - test/ec2launcher/dsl/config_parser_test.rb
 - test/test_helper.rb
-has_rdoc: