aebus 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edc199497096e4bf8425db17d7447df5800f6557
-  data.tar.gz: b9629b4736feed33598522a002cb746369836bbb
+  metadata.gz: d4961058fa793c8cccd9961a3d70f01e0b06436d
+  data.tar.gz: 5f9917ee6161fccaec5e1b74a2a71f1bb4308fb7
 SHA512:
-  metadata.gz: c569782e3f5193a26b5e947d57c538987ba0f2fee8335f186a2f6bf0a6acec69ef3c57310e47b0379e9842c43b8b3586e58ba941060ef8f68708bd70da2fdefe
-  data.tar.gz: d9c6988e1a701c459d80e6f2f102f64ca3c22f2f533a7c160ba3da7ecf8668af7b781b04c0b8e99ad5cf4fa304ca7f8bb9925c3cdf8d6044a999ad05c4ac2906
+  metadata.gz: 0f331ed5ca55071aa1da176411a3894100ed9c70e9138dedcb1870295fb8ee9a3ded016c08711b351a3271e8e978a5d567d419c71123c8568a03c7ab93d48a41
+  data.tar.gz: eca2695285ad5d95c371d11477f0f6a024d43974ff83db64ae6cd8665f2c42b226a98559d2569932c7ee03bb83c4a74b3880bd065bb64157e26f439020b7a532

data/README

@@ -12,9 +12,11 @@ A small gem that allows you to easily automate EC2 backups, included purging of
     backup_time: 00:00:00
     access_key_id: <your_access_key_id>
     secret_access_key: <your_secret_access_key>
-    zone: eu-west1
+    region: eu-west1
     from_address: <your sender address, must be verified with SES>
-    to_address: <a comma separated list of addresses>
+    to_address:
+      - address 1
+      - address 2
     backups:
       daily:
         enabled: true

data/aebus.gemspec

@@ -1,27 +1,26 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "aebus/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'aebus/version'
 
 Gem::Specification.new do |s|
-  s.name        = "aebus"
+  s.name        = 'aebus'
   s.version     = Aebus::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Marco Sandrini"]
-  s.email       = ["nessche@gmail.com"]
-  s.homepage    = "https://github.com/nessche/Aebus"
-  s.summary     = "Automated EC2 BackUp Software"
-  s.description = "A tool to automate snapshot management in EC2"
-
+  s.authors     = ['Marco Sandrini']
+  s.email       = ['nessche@gmail.com']
+  s.homepage    = 'https://github.com/nessche/Aebus'
+  s.summary     = 'Automated EC2 BackUp Software'
+  s.description = 'A tool to automate snapshot management in EC2'
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_dependency("commander", "~> 4.0.6")
-  s.add_dependency("parse-cron", ">= 0.1.1")
-  s.add_dependency("amazon-ec2", "~> 0.9.17")
-  s.add_dependency("aws-ses", "~> 0.5.0")
+  s.add_dependency('commander', '~> 4.4')
+  s.add_dependency('parse-cron', '~> 0.1')
+  s.add_dependency('aws-sdk', '~> 2')
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"

data/bin/aebus

@@ -6,7 +6,7 @@ require 'pathname'
 require_relative '../lib/aebus'
 
 
-DEFAULT_CONFIG_NAME = "./aebus.yaml"
+DEFAULT_CONFIG_NAME = './aebus.yaml'
 
 program :version, Aebus::VERSION
 program :description, 'Automatic EC2 BackUp Software'
@@ -27,12 +27,13 @@ command :status do |c|
   c.example 'Checks the status of vol1 and vol2', 'aebus status vol1 vol2'
 
   c.when_called do |args, options|
-    options.default \
+    options.default(
       :config => DEFAULT_CONFIG_NAME
+    )
     begin
       FileTest.exist?(Pathname.new(options.config).realpath)
-    rescue Errno::ENOENT => e
-      puts ("Configuration file not found")
+    rescue Errno::ENOENT
+      puts ('Configuration file not found')
       exit(2)
     end
     aebus = Aebus::Core.new
@@ -53,12 +54,13 @@ command :backup do |c|
   c.option '--[no-]purge', 'Do not purge expired backups, defaults to --purge'
   c.option '--[no-]mail', 'Mails a report in case something was done, defaults to --mail'
   c.when_called do |args, options|
-    options.default \
+    options.default(
       :config => DEFAULT_CONFIG_NAME,
       :manual => false,
       :purge => true,
       :mail => true
-    raise ("Config file does not exist") unless FileTest.exist?(Pathname.new(options.config).realpath)
+    )
+    raise ('Config file does not exist') unless FileTest.exist?(Pathname.new(options.config).realpath)
     aebus = Aebus::Core.new
     aebus.backup(args,options)
   end

data/lib/aebus.rb

@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'AWS'
-require 'aws/ses'
+require 'aws-sdk'
 require_relative 'config/config'
 require_relative 'aebus/version'
 require_relative 'aebus/logging'
 require_relative 'aebus/volume_status'
-require_relative 'ec2/zones'
 require_relative 'ec2/snapshot'
 
 module Aebus
@@ -16,8 +14,10 @@ module Aebus
 
     include Logging
 
-    AWS_NAME_TAG = "Name"
-    AEBUS_TAG = "Aebus"
+    AWS_NAME_TAG = 'Name'
+    AEBUS_TAG = 'Aebus'
+
+
 
     def status(args, options)
       @current_time_utc = Time.now.utc
@@ -25,15 +25,19 @@ module Aebus
       logger.info("status check started at #{@current_time_utc}")
 
       @config = Config::Config.new(File.join(File.dirname("."), options.config), @current_time_utc)
-      @ec2 = AWS::EC2::Base.new(:access_key_id => @config.defaults["access_key_id"],
-                                :secret_access_key => @config.defaults["secret_access_key"],
-                                :server => EC2::zone_to_url(@config.defaults["zone"]))
+
+      @ec2 = Aws::EC2::Client.new(
+         region: @config.defaults['region'],
+         credentials: {
+           access_key_id: @config.defaults['access_key_id'],
+           secret_access_key: @config.defaults['secret_access_key']
+         })
 
 
 
       target_volumes = target_volumes(args)
 
-      abort("Configuration contains invalid volumes") unless validate_target_volumes(target_volumes)
+      abort('Configuration contains invalid volumes') unless validate_target_volumes(target_volumes)
 
       status = check_status(target_volumes)
 
@@ -100,19 +104,20 @@ module Aebus
       init_logger options
       logger.info("backup started at #{@current_time_utc}")
 
-      @ec2 = AWS::EC2::Base.new(:access_key_id => @config.defaults["access_key_id"],
-                                :secret_access_key => @config.defaults["secret_access_key"],
-                                :server => EC2::zone_to_url(@config.defaults["zone"]))
+      @ec2 = Aws::EC2::Client.new(
+          region: @config.defaults['region'],
+          credentials: Aws::Credentials.new(@config.defaults['access_key_id'], @config.defaults['secret_access_key'])
+      )
 
       target_volumes = target_volumes(args)
 
-      abort("Configuration contains invalid volumes") unless validate_target_volumes(target_volumes)
+      abort('Configuration contains invalid volumes') unless validate_target_volumes(target_volumes)
 
-      if (options.manual) then
+      if options.manual
 
         target_volumes.each do |volume|
           to_backup += 1
-          break unless backup_volume(volume, [EC2::AEBUS_MANUAL_TAG])
+          break unless backup_volume(volume, [EC2::AEBUS_MANUAL_TAG], @config.get_value_for_volume(volume.id, 'custom_tags'))
           backed_up += 1
 
         end
@@ -131,7 +136,7 @@ module Aebus
             tags << EC2::AEBUS_AUTO_TAG
             logger.info("Creating backup for volume #{target} with tags #{tags.join(',')}, max delay #{max_delay}")
             to_backup +=1
-            break unless backup_volume(target, tags)
+            break unless backup_volume(target, tags, @config.get_value_for_volume(volume.id, 'custom_tags'))
             backed_up += 1
           else
             logger.info("Volume #{target} does not need to be backed up")
@@ -140,7 +145,7 @@ module Aebus
         end
 
         snap_map = get_snapshots_map # we reload the map since we may have created more snapshots
-        if options.purge then
+        if options.purge
           target_volumes.each do |target|
             volume = @config.volumes[target]
             purgeable_snapshot_ids = volume.purgeable_snapshot_ids(snap_map[target])
@@ -151,7 +156,7 @@ module Aebus
             end
           end
         else
-          logger.info("Skipping purging phase")
+          logger.info('Skipping purging phase')
         end
 
       end
@@ -159,7 +164,7 @@ module Aebus
       message = "Backup Completed at #{Time.now}. Checked #{target_volumes.count} volume(s), #{to_backup} to be backed up, #{backed_up} actually backed up, max delay detected #{max_delay}s,  #{to_purge} purgeable snapshot(s), #{purged} purged"
       logger.info(message)
       puts(message)
-      if to_backup > 0 or to_purge > 0 then
+      if to_backup > 0 or to_purge > 0
         send_report message
       end
     end
@@ -167,7 +172,7 @@ module Aebus
     def target_volumes(args)
 
       result = @config.volume_ids
-      if args && (args.count > 0) then
+      if args && (args.count > 0)
         result &= args
       end
 
@@ -181,39 +186,56 @@ module Aebus
 
 # backs up a given volume using the given time as part of the name and setting the given tags to the snapshot
 # @param volume_id [String] the id of the volume to be backed up
-# @param tags [Array] an array of String to be used as tags for the snapshot
+# @param aebus_tags [Array] an array of String to be used as tags for the snapshot
+# @param custom_tags [Hash] a Hash containing custom tags to be added to the snapshot
 # @return [boolean] true if the backup was successful, false otherwise
-    def backup_volume(volume_id, tags)
+    def backup_volume(volume_id, aebus_tags, custom_tags = {})
       begin
-        volume_info = @ec2.describe_volumes(:volume_id => volume_id)
+        volume_info = @ec2.describe_volumes(volume_ids: [volume_id])
 
-      rescue AWS::Error => e
+      rescue Aws::EC2::Errors::ServiceError => e
         logger.error("Volume Id #{volume_id} not found. Underlying message #{e.message}")
         return false
       end
 
       begin
-        tag_set = volume_info.volumeSet.item[0].tagSet
-        volume_tags = (tag_set and tag_set.item) ? tag_set.item : []
+
+        volume_tags = volume_info.volumes[0].tags
 
         name_and_desc = Core.name_and_desc(volume_id, volume_tags, @current_time_utc)
-        create_response = @ec2.create_snapshot(:volume_id => volume_id, :description => name_and_desc[1])
+        create_response = @ec2.create_snapshot({volume_id: volume_id, description: name_and_desc[1]})
 
-      rescue AWS::Error => e
+      rescue Aws::EC2::Errors::ServiceError => e
         logger.error("Volume Id #{volume_id} could not be backed up. Underlying message #{e.message}")
         return false
       end
 
       begin
 
-        @ec2.create_tags(:resource_id => create_response.snapshotId,
-                         :tag => [{AWS_NAME_TAG => name_and_desc[0]}, {AEBUS_TAG => tags.join(',')}])
-      rescue AWS::Error => e
-        logger.error("[WARNING] Could not set tags to snapshot #{create_response.snapshotId}. Underlying message #{e.message}")
+        tags = [
+            {
+                key: AWS_NAME_TAG,
+                value: name_and_desc[0]
+            },
+            {
+                key: AEBUS_TAG,
+                value: aebus_tags.join(',')
+            }
+        ]
+
+        if custom_tags
+          custom_tags.each_pair { |k, v| tags << {key: k, value: v} }
+        end
+
+        puts custom_tags
+
+        @ec2.create_tags(resources: [create_response.snapshot_id], tags: tags)
+      rescue Aws::EC2::Errors::ServiceError => e
+        logger.error("[WARNING] Could not set tags to snapshot #{create_response.snapshot_id}. Underlying message #{e.message}")
         return false
       end
 
-      logger.info("Created snapshot #{create_response.snapshotId} for volume #{volume_id}")
+      logger.info("Created snapshot #{create_response.snapshot_id} for volume #{volume_id}")
 
       true
 
@@ -226,16 +248,16 @@ module Aebus
 # @return [Array] an array in the form of [name, description]]
     def self.name_and_desc(volume_id, tags, utc_time)
 
-      name = "backup_#{utc_time.strftime("%Y%m%d")}_#{volume_id}"
+      name = "backup_#{utc_time.strftime('%Y%m%d')}_#{volume_id}"
       volume_name = volume_id
       tags.each do |tag|
-        if tag["key"].eql?(AWS_NAME_TAG)
-          volume_name = tag["value"]
+        if tag['key'].eql?(AWS_NAME_TAG)
+          volume_name = tag['value']
           break
         end
       end
 
-      description = "Backup for volume #{volume_name} taken at #{utc_time.strftime("%Y-%m-%d %H:%M:%S")}"
+      description = "Backup for volume #{volume_name} taken at #{utc_time.strftime('%Y-%m-%d %H:%M:%S')}"
 
       return [name, description]
 
@@ -243,9 +265,9 @@ module Aebus
 
     def get_snapshots_map
 
-      response = @ec2.describe_snapshots(:owner => 'self')
-      return Hash.new unless response.snapshotSet
-      snap_array = response.snapshotSet.item
+      response = @ec2.describe_snapshots(owner_ids: ['self'])
+      return Hash.new unless response.snapshots
+      snap_array = response.snapshots
       result = Hash.new
       snap_array.each do |snap|
         snapshot = EC2::Snapshot.new(snap)
@@ -273,7 +295,7 @@ module Aebus
         else
           false
         end
-      rescue AWS::Error => e
+      rescue Aws::EC2::Errors::ServiceError => e
         logger.warn("Could not purge snapshot #{snapshot_id}; underlying message #{e.message}")
         false
       end
@@ -281,11 +303,12 @@ module Aebus
     end
 
     def validate_target_volumes(target_volumes)
+      logger.info(target_volumes)
       begin
-        @ec2.describe_volumes(:volume_id => target_volumes)
-        logger.info("Target volumes validated")
+        @ec2.describe_volumes({volume_ids: target_volumes})
+        logger.info('Target volumes validated')
         true
-      rescue AWS::Error => e
+      rescue Aws::EC2::Errors::ServiceError => e
         logger.error("Target validation failed with message '#{e.message}' Check your configuration")
         false
       end
@@ -297,21 +320,39 @@ module Aebus
         logger.warn('Tried to send a message, but no message was specified')
         return
       end
-      to_address = @config.defaults["to_address"]
-      from_address = @config.defaults["from_address"]
+      to_address = @config.defaults['to_address']
+      if to_address.instance_of? String
+        to_address = [to_address]
+      end
+      from_address = @config.defaults['from_address']
       if to_address.nil? or from_address.nil?
         logger.warn('Tried to send a message but either to or from address where missing from configuration')
         return
       end
-      ses = AWS::SES::Base.new(
-        :access_key_id     => @config.defaults["access_key_id"],
-        :secret_access_key => @config.defaults["secret_access_key"]
+      ses = Aws::SES::Client.new(
+        region: @config.defaults['region'],
+        credentials: Aws::Credentials.new(@config.defaults['access_key_id'], @config.defaults['secret_access_key'])
       )
       logger.info("Sending report to #{to_address} from account #{from_address}")
-      ses.send_email :to => to_address,
-                     :source => from_address,
-                     :subject => "Aebus Report",
-                     :text_body => message
+      ses.send_email({
+        destination: {
+          to_addresses: to_address
+        },
+        source: from_address,
+        message: {
+          subject: {
+            charset: 'UTF-8',
+            data: 'Aebus Report'
+          },
+          body: {
+            text: {
+                charset: 'UTF-8',
+                data: message
+            }
+          }
+        }
+      })
+
 
     end
 

data/lib/aebus/version.rb

@@ -1,3 +1,3 @@
 module Aebus
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/config/config.rb

@@ -15,10 +15,10 @@ module Aebus
       def initialize(filename, current_time_utc)
 
         yaml_root = YAML::load(File.open(filename))
-        raise "Cannot find configuration file" unless yaml_root
+        raise 'Cannot find configuration file' unless yaml_root
 
         @defaults = yaml_root.delete(DEFAULT_STRING)
-        default_backups =  BackupSchedule.parse_backups_config(current_time_utc, @defaults["backups"])
+        default_backups =  BackupSchedule.parse_backups_config(current_time_utc, @defaults['backups'])
 
         @volumes = Hash.new
         yaml_root.each_pair do |k, v|
@@ -40,14 +40,14 @@ module Aebus
 
       def get_value_for_volume(volume_id, key)
         result = nil
-        if (@volumes.include? volume_id) then
-          if (@volumes[volume_id].config.include? key) then
+        if @volumes.include? volume_id
+          if @volumes[volume_id].config.include? key
             result = @volumes[volume_id].config[key]
           else
             result = @defaults[key]
           end
         end
-       result
+        result
       end
 
 

data/lib/config/volume.rb

@@ -4,7 +4,7 @@ module Aebus
 
   module Config
 
-    KEEP_ALL = "all"
+    KEEP_ALL = 'all'
 
     class BackupSchedule
 
@@ -12,17 +12,17 @@ module Aebus
 
       def initialize (current_time_utc, label, backup_config)
         @label = label
-        if (backup_config["enabled"]) then
-          calculate_deadlines(current_time_utc, backup_config["when"])
+        if backup_config['enabled']
+          calculate_deadlines(current_time_utc, backup_config['when'])
         end
-        @keep = backup_config["keep"]
+        @keep = backup_config['keep']
         # we use Infinity to model the keep all
         @keep = 1.0 / 0  if (@keep.nil? || @keep.eql?(KEEP_ALL))
 
       end
 
       def calculate_deadlines(current_time_utc, when_string)
-        raise(ArgumentError, "when field cannot be empty if the backup is enabled") unless when_string
+        raise(ArgumentError, 'when field cannot be empty if the backup is enabled') unless when_string
 
         parser = CronParser.new (when_string)
         @last_deadline = parser.last(current_time_utc)
@@ -59,8 +59,8 @@ module Aebus
         @config = config
         @id = volume_id
         @backups = default_backups ? default_backups.dup : Hash.new
-        if (config && config["backups"]) then
-          @backups.merge(BackupSchedule.parse_backups_config(current_time_utc,config["backups"]))
+        if config && config['backups']
+          @backups.merge(BackupSchedule.parse_backups_config(current_time_utc,config['backups']))
         end
       end
 
@@ -83,7 +83,7 @@ module Aebus
         return false unless snapshots
         snapshots.each do |snapshot|
 
-          if (snapshot.aebus_tags_include?(label) && (snapshot.start_time > last_deadline))
+          if snapshot.aebus_tags_include?(label) && (snapshot.start_time > last_deadline)
             return true
           end
 
@@ -98,7 +98,7 @@ module Aebus
         available_backups = @backups.each_with_object({}) { | (k, v) , h | h[k] = v.keep}
         removables.each do |snapshot|
           snapshot.aebus_tags.each do |tag|
-            if ((available_backups.include? tag) && (available_backups[tag] > 0))  then
+            if (available_backups.include? tag) && (available_backups[tag] > 0) then
                 snapshot.keep = true
                 available_backups[tag] -= 1
             end

data/lib/ec2/snapshot.rb

@@ -2,10 +2,10 @@ module Aebus
 
   module EC2
 
-    AEBUS_TAG = "Aebus"
-    AEBUS_MANUAL_TAG = "manual"
-    AEBUS_KEEP_TAG = "keep"
-    AEBUS_AUTO_TAG = "auto"
+    AEBUS_TAG = 'Aebus'
+    AEBUS_MANUAL_TAG = 'manual'
+    AEBUS_KEEP_TAG = 'keep'
+    AEBUS_AUTO_TAG = 'auto'
 
     class Snapshot
 
@@ -15,16 +15,16 @@ module Aebus
 
       def initialize(hash)
 
-        raise(ArgumentError,"hash cannot be nil") unless hash
+        raise(ArgumentError, 'hash cannot be nil') unless hash
         @keep
-        @id = hash.snapshotId
-        @start_time = Time.parse(hash.startTime)
-        @volume_id = hash.volumeId
+        @id = hash.snapshot_id
+        @start_time = hash.start_time
+        @volume_id = hash.volume_id
         @tags = Hash.new
-        if (hash.tagSet) then
-          tag_array = hash.tagSet.item
+        if hash.tags
+          tag_array = hash.tags
           tag_array.each do |tag|
-            @tags.store(tag["key"],tag["value"])
+            @tags.store(tag.key,tag.value)
           end
         end
       end
@@ -34,7 +34,7 @@ module Aebus
       end
 
       def aebus_tags_include?(label)
-        if aebus_snapshot? then
+        if aebus_snapshot?
           return aebus_tags.include? label
         end
         false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aebus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Marco Sandrini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: amazon-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.17
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.17
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: aws-ses
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '2'
 description: A tool to automate snapshot management in EC2
 email:
 - nessche@gmail.com
@@ -87,9 +73,9 @@ files:
 - lib/config/config.rb
 - lib/config/volume.rb
 - lib/ec2/snapshot.rb
-- lib/ec2/zones.rb
 homepage: https://github.com/nessche/Aebus
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -107,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Automated EC2 BackUp Software

data/lib/ec2/zones.rb

@@ -1,19 +0,0 @@
-module Aebus
-
-  module EC2
-
-    ZONES = {
-
-        "eu-west1" =>  "eu-west-1.ec2.amazonaws.com",
-        "us-east-1" =>  "ec2.us-east-1.amazonaws.com",
-        "us-west-1" =>  "ec2.us-west-1.amazonaws.com",
-        "ap-southeast-1" => "ec2.ap-southeast-1.amazonaws.com"
-    }
-
-    def self.zone_to_url(zone)
-      ZONES[zone]
-    end
-
-  end
-
-end