hocho-ec2 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0f244b10a1aa987e5c40e1c9a718ed7c8d84fe43
-  data.tar.gz: 552b998d5da7fd6780b1033806bda568be5668ff
+SHA256:
+  metadata.gz: 51c129620328777a9815f34fb6231b5240295d256a38e26a3f51a75821e4744f
+  data.tar.gz: 9518a6da4b6437293c7531d397d665162055d4e316311cc75962b08380350a5d
 SHA512:
-  metadata.gz: e0238555988a86c2b1b985db535a9ae435cece9f877bbd4d05f90289df172cefd55125a95b3fd5714a27d6fb8ca3433441e923f4e5e167ee7410045bbace3b0c
-  data.tar.gz: 0daa74f6c680c04f6187d950cfe4c351354222b25fb341d421c72e88687403c08da81991c17ddc4e143c4ed164e1922f18fca8b343e229ced7cbfe4b71a2d0fe
+  metadata.gz: f8febe9892932bfec8fc1fcbe7275e0cf32b862aa68dda935d4434ab383910156c0c4b094ad589fb191af5e02d005ef678b5a6bf110ebd78c589a9ea33536733
+  data.tar.gz: c6904281b1b6b611a1fbdf1aaa882f2d3989d50a299d2e096bb6ec64786239683369954557448c250e2fa7e4d922494f67e81159c5043dac177f7a6bdb67c2ff

data/lib/hocho-ec2/version.rb

@@ -1,3 +1,3 @@
 module HochoEc2
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/hocho/inventory_providers/ec2.rb

@@ -60,12 +60,19 @@ module Hocho
             [vpc.vpc_id, vpc]
           end
         end.to_h
+        subnets= ec2.describe_subnets().flat_map do |page|
+          page.subnets.map do |subnet|
+            [subnet.subnet_id, subnet]
+          end
+        end.to_h
         ec2.describe_instances(filters: filters).flat_map do |page|
           page.reservations.flat_map do |reservation|
             reservation.instances.map do |instance|
+              next if instance.state.name == 'terminated' || instance.state.name == 'terminating'
               vpc = vpcs[instance.vpc_id]
-              fetch_instance(instance, vpc)
-            end
+              subnet = subnets[instance.subnet_id]
+              fetch_instance(instance, vpc, subnet)
+            end.compact
           end
         end
       end
@@ -104,11 +111,12 @@ module Hocho
 
       private
 
-      def fetch_instance(instance, vpc)
+      def fetch_instance(instance, vpc, subnet)
         tags = {
           'ec2.instance-id' => instance.instance_id,
           'ec2.iam-instance-profile' => instance.iam_instance_profile,
           'ec2.vpc-id' => instance.vpc_id,
+          'ec2.subnet-id' => instance.subnet_id,
         }
         {'vpc-tags' => vpc.tags, 'tags' => instance.tags}.each do |prefix, aws_tags|
           aws_tags.each do |tag|
@@ -118,13 +126,14 @@ module Hocho
 
         ec2_attribute = instance.to_h
         vpc_attribute = vpc.to_h
-        [ec2_attribute, vpc_attribute].each do |attrs|
+        subnet_attribute = subnet.to_h
+        [ec2_attribute, vpc_attribute, subnet_attribute].each do |attrs|
           attrs[:tags] = attrs.fetch(:tags, []).map { |_| [_.fetch(:key), _.fetch(:value)] }.to_h
         end
 
         properties = {
           run_list: runlist_template.new(instance, vpc).result(),
-          attributes: {hocho_ec2: ec2_attribute, hocho_vpc: vpc_attribute,},
+          attributes: {hocho_ec2: ec2_attribute, hocho_vpc: vpc_attribute, hocho_subnet: subnet_attribute,},
         }
         {
           name: hostname_template.new(instance, vpc).result(),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hocho-ec2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sorah Fukumori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-07 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
@@ -105,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Hocho gem plugin to discover hosts in EC2