awspec 0.66.0 → 0.66.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d082c7989d077043be4c2678e8319e2ae1692ad
-  data.tar.gz: a8f134cf2076f264a9019b5e04acb2bd41bf4e5d
+  metadata.gz: 7bfc427b5c45404f29d5b083a2677fddfbcb3436
+  data.tar.gz: 3fb322b83f4f0eae316f3f3ffdc26e9f1c19e746
 SHA512:
-  metadata.gz: 6dcce735c2782bd85a0ee42fdb01a7b7e8e4c14cc7ee605aa0006313249ed3741b307c8e0ff64128fd832a2e42d7b07f5fe73d5874d24930e9e55e9d50261d6d
-  data.tar.gz: 9f7fecbbf166d249d0ff06d840ec5b50dfe089b2efd00c2120bebb3d3a10f130f904d65f771345a5e51d8165dcec04eac3866ada7c6cff464d026aa791aae7c9
+  metadata.gz: 9134db801d2643c9ad4101ef3f27e06bc6f2a402c7e35e0e85a98ad8d384240d7e36c08219e8e3031e73c089561b3b9ac1ca75e7d5bbd80727d963de197bc48c
+  data.tar.gz: 03894ab2663220cc3561c58308de62ccc7dbbd9acf3516ca07f3a673775ffaf3fb6defeebaddbc21ffdd159054cb2c7b86538390c0285bbc43a4e17ec6efdec5

data/doc/_resource_types/ec2.md

@@ -72,6 +72,16 @@ describe ec2('my-ec2') do
 end
 ```
 
+### have_network_interface
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_network_interface('my-eni') }
+  it { should have_network_interface('eni-12ab3cde') }
+  it { should have_network_interface('my-eni').as_eth0 }
+end
+```
+
 ### have_security_group
 
 ```ruby

data/doc/resource_types.md

@@ -411,6 +411,17 @@ end
 ```
 
 
+### have_network_interface
+
+```ruby
+describe ec2('my-ec2') do
+  it { should have_network_interface('my-eni') }
+  it { should have_network_interface('eni-12ab3cde') }
+  it { should have_network_interface('my-eni').as_eth0 }
+end
+```
+
+
 ### have_security_group
 
 ```ruby
@@ -476,7 +487,7 @@ EcrRepository resource type.
 ### exist
 
 
-## <a name="ecs cluster">ecs cluster</a>
+## <a name="ecs_cluster">ecs_cluster</a>
 
 ECS Cluster resource type.
 
@@ -507,7 +518,7 @@ end
 ```
 
 ### its(:cluster_arn), its(:cluster_name), its(:status), its(:registered_container_instances_count), its(:running_tasks_count), its(:pending_tasks_count), its(:active_services_count)
-## <a name="ecs container instance">ecs container instance</a>
+## <a name="ecs_container_instance">ecs_container_instance</a>
 
 ECS Container Instance resource type.
 
@@ -532,7 +543,7 @@ end
 
 
 ### its(:container_instance_arn), its(:ec2_instance_id), its(:version), its(:version_info), its(:status), its(:agent_connected), its(:running_tasks_count), its(:pending_tasks_count), its(:agent_update_status), its(:attributes)
-## <a name="ecs service">ecs service</a>
+## <a name="ecs_service">ecs_service</a>
 
 ECS Service resource type.
 
@@ -554,7 +565,7 @@ end
 ```
 
 ### its(:service_arn), its(:service_name), its(:cluster_arn), its(:status), its(:desired_count), its(:running_count), its(:pending_count), its(:task_definition), its(:role_arn), its(:created_at), its(:placement_constraints), its(:placement_strategy)
-## <a name="ecs task definition">ecs task definition</a>
+## <a name="ecs_task_definition">ecs_task_definition</a>
 
 ECS Task Definition resource type.
 

data/lib/awspec/generator/doc/type/base.rb

@@ -56,7 +56,7 @@ module Awspec::Generator
 
         def doc_template
           template = <<-'EOF'
-## <a name="<%= @type_name.underscore %>"><%= @type_name.underscore %></a>
+## <a name="<%= @type_name.gsub(/ /, '_').underscore %>"><%= @type_name.gsub(/ /, '_').underscore %></a>
 
 <%= @type_name %> resource type.
 <%- if @descriptions.include?('first') -%><%= @descriptions['first'] %><%- end -%>

data/lib/awspec/generator/spec/ec2.rb

@@ -18,6 +18,7 @@ module Awspec::Generator
           subnet = find_subnet(instance.subnet_id)
           eips = select_eip_by_instance_id(instance_id)
           volumes = select_ebs_by_instance_id(instance_id)
+          network_interfaces = select_network_interface_by_instance_id(instance_id)
           content = ERB.new(ec2_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
@@ -65,6 +66,9 @@ describe ec2('<%= instance_id %>') do
   it { should have_ebs('<%= volume.volume_id %>') }
 <%- end -%>
 <% end %>
+<% network_interfaces.each do |interface| %>
+  it { should have_network_interface('<%= interface.network_interface_id %>') }
+<% end %>
 end
 EOF
         template

data/lib/awspec/helper/finder/ec2.rb

@@ -109,6 +109,13 @@ module Awspec::Helper
         res.addresses
       end
 
+      def select_network_interface_by_instance_id(id)
+        res = ec2_client.describe_network_interfaces({
+                                                       filters: [{ name: 'attachment.instance-id', values: [id] }]
+                                                     })
+        res.network_interfaces
+      end
+
       def select_nat_gateway_by_vpc_id(vpc_id)
         res = ec2_client.describe_nat_gateways({
                                                  filter: [{ name: 'vpc-id', values: [vpc_id] }]

data/lib/awspec/matcher.rb

@@ -2,6 +2,7 @@
 require 'awspec/matcher/belong_to_vpc'
 require 'awspec/matcher/belong_to_subnet'
 require 'awspec/matcher/have_tag'
+require 'awspec/matcher/have_network_interface'
 
 # RDS
 require 'awspec/matcher/belong_to_db_subnet_group'

data/lib/awspec/matcher/have_network_interface.rb

@@ -0,0 +1,15 @@
+RSpec::Matchers.define :have_network_interface do |network_interface_id|
+  match do |type|
+    type.has_network_interface?(network_interface_id, @device_index)
+  end
+
+  chain :device_index do |device_index|
+    @device_index = device_index
+  end
+
+  (0..10).each do |idx|
+    chain "as_eth#{idx}".to_sym do
+      @device_index = idx
+    end
+  end
+end

data/lib/awspec/stub/ec2.rb

@@ -29,6 +29,16 @@ Aws.config[:ec2] = {
                   }
                 }
               ],
+              network_interfaces: [
+                {
+                  network_interface_id: 'eni-12ab3cde',
+                  subnet_id: 'subnet-1234a567',
+                  vpc_id: 'vpc-ab123cde',
+                  attachment: {
+                    device_index: 1
+                  }
+                }
+              ],
               tags: [
                 {
                   key: 'Name',
@@ -151,6 +161,63 @@ Aws.config[:ec2] = {
           { group_name: 'my-vpc-security-group-name', group_id: nil }
         ]
       ]
+    },
+    describe_network_interfaces: {
+      network_interfaces: [
+        {
+          network_interface_id: 'eni-12ab3cde',
+          subnet_id: 'subnet-1234a567',
+          vpc_id: 'vpc-ab123cde',
+          availability_zone: 'ap-northeast-1c',
+          description: '',
+          owner_id: '1234567890',
+          requester_id: nil,
+          requester_managed: false,
+          status: 'in-use',
+          mac_address: '00:11:aa:bb:cc:22',
+          private_ip_address: '10.0.1.1',
+          private_dns_name: nil,
+          source_dest_check: true,
+          groups:
+            [
+              {
+                group_name: 'my-security-group-name',
+                group_id: 'sg-1a2b3cd4'
+              }
+            ],
+          attachment: {
+            attachment_id: 'eni-attach-12ab3cde',
+            instance_id: 'i-ec12345a',
+            instance_owner_id: '1234567890',
+            device_index: 0,
+            status: 'attached',
+            attach_time: nil,
+            delete_on_termination: true
+          },
+          association: nil,
+          tag_set: [
+            {
+              key: 'Name',
+              value: 'my-eni'
+            }
+          ],
+          private_ip_addresses: [
+            {
+              private_ip_address: '10.0.1.1',
+              private_dns_name: nil,
+              primary: true,
+              association: nil
+            },
+            {
+              private_ip_address: '10.0.1.2',
+              private_dns_name: '',
+              primary: false,
+              association: nil
+            }
+          ],
+          interface_type: nil
+        }
+      ]
     }
   }
 }

data/lib/awspec/stub/network_interface.rb

@@ -27,7 +27,7 @@ Aws.config[:ec2] = {
             attachment_id: 'eni-attach-12ab3cde',
             instance_id: 'i-ec12345a',
             instance_owner_id: '1234567890',
-            device_index: 0,
+            device_index: 1,
             status: 'attached',
             attach_time: nil,
             delete_on_termination: true

data/lib/awspec/type/ec2.rb

@@ -68,6 +68,15 @@ module Awspec::Type
       end
     end
 
+    def has_network_interface?(network_interface_id, device_index = nil)
+      res = find_network_interface(network_interface_id)
+      interfaces = resource_via_client.network_interfaces
+      ret = interfaces.find do |interface|
+        next false if device_index && interface.attachment.device_index != device_index
+        interface.network_interface_id == res.network_interface_id
+      end
+    end
+
     def has_event?(event_code)
       status = find_ec2_status(id)
       ret = status.events.find do |event|

data/lib/awspec/type/network_interface.rb

@@ -20,13 +20,13 @@ module Awspec::Type
       end
     end
 
-    def attached_to?(instance_id, device_index = 0)
+    def attached_to?(instance_id, device_index = nil)
       instance = find_ec2(instance_id)
       return false unless instance
       return false unless resource_via_client.attachment
+      return false if device_index && resource_via_client.attachment.device_index != device_index
       resource_via_client.attachment.instance_id == instance.instance_id && \
-        resource_via_client.attachment.status == 'attached' && \
-        resource_via_client.attachment.device_index == device_index
+        resource_via_client.attachment.status == 'attached'
     end
 
     def has_private_ip_address?(ip_address, primary = nil)

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.66.0'
+  VERSION = '0.66.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.66.0
+  version: 0.66.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -380,6 +380,7 @@ files:
 - lib/awspec/matcher/belong_to_vpc.rb
 - lib/awspec/matcher/have_inline_policy.rb
 - lib/awspec/matcher/have_key_policy.rb
+- lib/awspec/matcher/have_network_interface.rb
 - lib/awspec/matcher/have_origin.rb
 - lib/awspec/matcher/have_private_ip_address.rb
 - lib/awspec/matcher/have_record_set.rb