eipmap 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1351fbe44fd9d8e912acd128d43ae4a121d8f9a3
-  data.tar.gz: a784a527ae399411c25cf5563784f9fc61c0adb9
+  metadata.gz: 0c2e09d888f693e2ff73513b1632f34cc3787a67
+  data.tar.gz: 13a1ab89aaa0a6364549fd21377ad4bc54f52efe
 SHA512:
-  metadata.gz: bb29f18f62383b9dfb9157869324b0a8281c7bddf04cc6fbeebc8dd58a3a3560dff64208ca9d8cf14c48a3968c936ccbd8282d9d08233661f6d9c6dd35ca5893
-  data.tar.gz: 7caba6ba8454074e0c909b9c1ecee939d7898d1f2f1ce2a40c1929b1836896a5746ee65082d549586bc8cca1045630470be4e4b84de95cf7f187072c1444c5da
+  metadata.gz: 6435276c495116ff0db70e7afdc44cf9538183e822133a552d4f742316171d8d95fb5a265598fd8db9370052d54f2d55d9f08cd6840cf5a4a258b767f11d25eb
+  data.tar.gz: 0db786e666503f67ac238031dcf75be58dd6cbea246eaa5e339a0155da1cceb57a2712fc9c66d69ecc58bd544cefc46256a1b34358427c88163674cbc516a192

data/lib/eipmap/client.rb

@@ -10,7 +10,13 @@ class Eipmap::Client
 
   def export
     exported = Eipmap::Exporter.export(@ec2, @options)
-    Eipmap::DSL.convert(exported, @options)
+
+    instance_ids = exported.map {|domain, ips|
+      ips.map {|ip, attrs| attrs[:instance_id] }
+    }.flatten.select {|i| i }
+
+    instance_names = @driver.describe_instance_names(instance_ids)
+    Eipmap::DSL.convert(exported, @options.merge(:instance_names => instance_names))
   end
 
   def apply(file)

data/lib/eipmap/driver.rb

@@ -14,6 +14,21 @@ class Eipmap::Driver
     end
   end
 
+  def describe_instance_names(instance_ids)
+    id_names = {}
+
+    @ec2.describe_instances(:instance_ids => instance_ids).each do |resp|
+      resp.reservations.each do |reservation|
+        reservation.instances.each do |instance|
+          tag = instance.tags.find {|t| t.key == 'Name' }
+          id_names[instance.instance_id] = tag.value if tag
+        end
+      end
+    end
+
+    id_names
+  end
+
   private
 
   def associate_address(domain, ip, expected_attrs, actual_attrs)

data/lib/eipmap/dsl/converter.rb

@@ -6,6 +6,7 @@ class Eipmap::DSL::Converter
   def initialize(exported, options = {})
     @exported = exported
     @options = options
+    @instance_names = options[:instance_names] || {}
   end
 
   def convert
@@ -54,7 +55,14 @@ end
       args << ip_options.inspect.sub(/\A\{/, '').sub(/\}\z/, '')
     end
 
-    <<-EOS
+    instance_id = attrs[:instance_id]
+    instance_name = @instance_names[instance_id]
+
+    comment = instance_name ? (<<-EOS) : ''
+  # #{instance_id} #{instance_name}
+    EOS
+
+    comment + (<<-EOS)
   ip #{args.join(', ')}
     EOS
   end

data/lib/eipmap/version.rb

@@ -1,3 +1,3 @@
 module Eipmap
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/eipmap_spec.rb

@@ -116,4 +116,22 @@ end
       expect(describe_addresses["vpc"]).to eq swapped_eips_with_one_assoc
     end
   end
+
+  context "when dry-run" do
+    subject { client(dry_run: true) }
+
+    it do
+      dsl = <<-EOS
+domain "vpc" do
+<%- eips.each do |public_ip, attrs| -%>
+  ip "<%= public_ip %>", <%= attrs.inspect %>
+<%- end -%>
+end
+      EOS
+
+      result = apply(subject) { dsl }
+      expect(result).to be_falsey
+      expect(describe_addresses["vpc"].values).to match_array [{}, {}, {}]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eipmap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Eipmap is a tool to manage Elastic IP Addresses (EIP).