awspec 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1708fe037ed85b50638c71a0f1120c13f4042384
-  data.tar.gz: b424d9466944bac4274b874d8b3199b381a6d1fd
+  metadata.gz: d6df1c727f0aeffc393ecf79feba39041cd14b5c
+  data.tar.gz: 247f84a0ffef96e9b51903bb58049821541b3b0b
 SHA512:
-  metadata.gz: f977aeec94bb0afc4f0de92b06f43f57984a49f2a4558d39a8a4e7b237cda1e7e9ffb08393d0b31bc28fa71b19f15183d00964fea13032e871e712bb677ac73a
-  data.tar.gz: cf6ec02eb6a9b75ed66b0c24d88f4803a57eebadb15cb9e7a83a913cd98bf84b1af54e136d5410d255e900d8842498ff335945d47809d7ce3d682eb2b0a3c286
+  metadata.gz: abcc9b2a6623cc2c012bfb4bb606c48455fecf0e999e3ffdb356061998f1a6e5d8a136e8e77780f98510cb2f5a63896dfa23447883ee55c1f38f094e59912754
+  data.tar.gz: eaf78213317dd30bd9c39eb91c54b9f18814c519b809e685f1b85ff080386b49d960602a088c6fbcfb18be85e6d68f7e1aea9b96dd4d2bc44e13faebab5991d4

data/awspec.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1'
   spec.add_runtime_dependency 'rspec', '~> 3.0'
   spec.add_runtime_dependency 'rspec-its'
-  spec.add_runtime_dependency 'aws-sdk', '~> 2.1'
+  spec.add_runtime_dependency 'aws-sdk', '~> 2.2'
   spec.add_runtime_dependency 'awsecrets', '~> 1'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'activesupport'

data/doc/_resource_types/network_interface.md

@@ -0,0 +1,58 @@
+### exist
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should exist }
+end
+```
+
+### be_attached_to
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should be_attached_to('my-ec2') }
+  it { should be_attached_to('my-ec2').as_eth0 }
+end
+```
+
+### be_available, be_attaching, be_in_use, be_detaching
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should be_in_use }
+end
+```
+
+### have_private_ip_address
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should have_private_ip_address('10.0.1.1').primary }
+  it { should have_private_ip_address('10.0.1.2') }
+  its(:private_ip_addresses_count) { should eq 2 }
+end
+```
+
+### have_security_group
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should have_security_group('my-security-group-name') }
+end
+```
+
+### belong_to_subnet
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should belong_to_subnet('my-subnet') }
+end
+```
+
+### belong_to_vpc
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should belong_to_vpc('my-vpc') }
+end
+```

data/doc/resource_types.md

@@ -17,6 +17,7 @@
 | [launch_configuration](#launch_configuration)
 | [nat_gateway](#nat_gateway)
 | [network_acl](#network_acl)
+| [network_interface](#network_interface)
 | [rds](#rds)
 | [rds_db_parameter_group](#rds_db_parameter_group)
 | [route53_hosted_zone](#route53_hosted_zone)
@@ -801,6 +802,76 @@ describe network_acl('my-network-acl') do
 end
 ```
 
+## <a name="network_interface">network_interface</a>
+
+NetworkInterface resource type.
+
+### exist
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should exist }
+end
+```
+
+
+### be_attached_to
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should be_attached_to('my-ec2') }
+  it { should be_attached_to('my-ec2').as_eth0 }
+end
+```
+
+
+### be_available, be_attaching, be_in_use, be_detaching
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should be_in_use }
+end
+```
+
+
+### have_private_ip_address
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should have_private_ip_address('10.0.1.1').primary }
+  it { should have_private_ip_address('10.0.1.2') }
+  its(:private_ip_addresses_count) { should eq 2 }
+end
+```
+
+
+### have_security_group
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should have_security_group('my-security-group-name') }
+end
+```
+
+
+### belong_to_subnet
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should belong_to_subnet('my-subnet') }
+end
+```
+
+
+### belong_to_vpc
+
+```ruby
+describe network_interface('eni-12ab3cde') do
+  it { should belong_to_vpc('my-vpc') }
+end
+```
+
+### its(:network_interface_id), its(:subnet_id), its(:vpc_id), its(:availability_zone), its(:description), its(:owner_id), its(:requester_id), its(:requester_managed), its(:status), its(:mac_address), its(:private_ip_address), its(:private_dns_name), its(:source_dest_check), its(:association), its(:interface_type)
 ## <a name="rds">rds</a>
 
 RDS resource type.
@@ -880,7 +951,7 @@ end
 ```
 
 
-### its(:vpc_id), its(:db_instance_identifier), its(:db_instance_class), its(:engine), its(:db_instance_status), its(:master_username), its(:db_name), its(:endpoint), its(:allocated_storage), its(:instance_create_time), its(:preferred_backup_window), its(:backup_retention_period), its(:availability_zone), its(:preferred_maintenance_window), its(:pending_modified_values), its(:latest_restorable_time), its(:multi_az), its(:engine_version), its(:auto_minor_version_upgrade), its(:read_replica_source_db_instance_identifier), its(:license_model), its(:iops), its(:character_set_name), its(:secondary_availability_zone), its(:publicly_accessible), its(:storage_type), its(:tde_credential_arn), its(:db_instance_port), its(:db_cluster_identifier), its(:storage_encrypted), its(:kms_key_id), its(:dbi_resource_id), its(:ca_certificate_identifier), its(:copy_tags_to_snapshot), its(:monitoring_interval), its(:enhanced_monitoring_resource_arn), its(:monitoring_role_arn)
+### its(:vpc_id), its(:db_instance_identifier), its(:db_instance_class), its(:engine), its(:db_instance_status), its(:master_username), its(:db_name), its(:endpoint), its(:allocated_storage), its(:instance_create_time), its(:preferred_backup_window), its(:backup_retention_period), its(:availability_zone), its(:preferred_maintenance_window), its(:pending_modified_values), its(:latest_restorable_time), its(:multi_az), its(:engine_version), its(:auto_minor_version_upgrade), its(:read_replica_source_db_instance_identifier), its(:license_model), its(:iops), its(:character_set_name), its(:secondary_availability_zone), its(:publicly_accessible), its(:storage_type), its(:tde_credential_arn), its(:db_instance_port), its(:db_cluster_identifier), its(:storage_encrypted), its(:kms_key_id), its(:dbi_resource_id), its(:ca_certificate_identifier), its(:copy_tags_to_snapshot), its(:monitoring_interval), its(:enhanced_monitoring_resource_arn), its(:monitoring_role_arn), its(:promotion_tier)
 ### :unlock: Advanced use
 
 `rds` can use `Aws::RDS::DBInstance` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/DBInstance.html).

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

@@ -0,0 +1,21 @@
+module Awspec::Generator
+  module Doc
+    module Type
+      class NetworkInterface < Base
+        def initialize
+          super
+          @type_name = 'NetworkInterface'
+          @type = Awspec::Type::NetworkInterface.new('eni-12ab3cde')
+          @ret = @type.resource_via_client
+          @matchers = [
+            Awspec::Type::NetworkInterface::STATES.map { |state| 'be_' + state.tr('-', '_') }.join(', '),
+            'belong_to_vpc',
+            'belong_to_subnet'
+          ]
+          @ignore_matchers = Awspec::Type::NetworkInterface::STATES.map { |state| 'be_' + state.tr('-', '_') }
+          @describes = []
+        end
+      end
+    end
+  end
+end

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

@@ -56,6 +56,18 @@ module Awspec::Helper
         res.nat_gateways.single_resource(gateway_id)
       end
 
+      def find_network_interface(interface_id)
+        res = ec2_client.describe_network_interfaces({
+                                                       filters: [
+                                                         {
+                                                           name: 'network-interface-id',
+                                                           values: [interface_id]
+                                                         }
+                                                       ]
+                                                     })
+        res.network_interfaces.single_resource(interface_id)
+      end
+
       def select_ec2_by_vpc_id(vpc_id)
         res = ec2_client.describe_instances({
                                               filters: [{ name: 'vpc-id', values: [vpc_id] }]

data/lib/awspec/helper/type.rb

@@ -7,8 +7,8 @@ module Awspec
         ami autoscaling_group cloudwatch_alarm directconnect_virtual_interface
         ebs ec2 elasticache elasticache_cache_parameter_group elb iam_group
         iam_policy iam_role iam_user lambda launch_configuration nat_gateway
-        network_acl rds rds_db_parameter_group route53_hosted_zone route_table
-        s3_bucket security_group ses_identity subnet vpc
+        network_acl network_interface rds rds_db_parameter_group route53_hosted_zone
+        route_table s3_bucket security_group ses_identity subnet vpc
       )
 
       TYPES.each do |type|

data/lib/awspec/matcher.rb

@@ -32,3 +32,7 @@ require 'awspec/matcher/belong_to_metric'
 # NetworkAcl
 require 'awspec/matcher/be_allowed'
 require 'awspec/matcher/be_denied'
+
+# NetworkInterface
+require 'awspec/matcher/be_attached_to'
+require 'awspec/matcher/have_private_ip_address'

data/lib/awspec/matcher/be_attached_to.rb

@@ -0,0 +1,19 @@
+RSpec::Matchers.define :be_attached_to do |instance_id|
+  match do |type|
+    # NetworkInterface
+    if type.instance_of?(Awspec::Type::NetworkInterface)
+      return type.attached_to?(instance_id, @device_index)
+    end
+    type.attached_to?(instance_id)
+  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/matcher/belong_to_subnet.rb

@@ -1,7 +1,7 @@
 RSpec::Matchers.define :belong_to_subnet do |subnet_id|
   match do |type|
-    # EC2
-    if type.instance_of?(Awspec::Type::Ec2)
+    # EC2, NetworkInterface
+    if type.instance_of?(Awspec::Type::Ec2) || type.instance_of?(Awspec::Type::NetworkInterface)
       return true if type.subnet_id == subnet_id
       subnet = type.find_subnet(subnet_id)
       return false unless subnet

data/lib/awspec/matcher/have_private_ip_address.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :have_private_ip_address do |ip_address|
+  match do |eni|
+    eni.has_private_ip_address?(ip_address, @primary)
+  end
+
+  chain :primary do
+    @primary = true
+  end
+end

data/lib/awspec/stub/network_interface.rb

@@ -0,0 +1,139 @@
+Aws.config[:ec2] = {
+  stub_responses: {
+    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: [],
+          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
+        }
+      ]
+    },
+    describe_instances: {
+      reservations: [
+        {
+          instances: [
+            {
+              instance_id: 'i-ec12345a',
+              image_id: 'ami-abc12def',
+              vpc_id: 'vpc-ab123cde',
+              subnet_id: 'subnet-1234a567',
+              public_ip_address: '123.0.456.789',
+              private_ip_address: '10.0.1.1',
+              instance_type: 't2.small',
+              state: {
+                name: 'running'
+              },
+              security_groups: [
+                {
+                  group_id: 'sg-1a2b3cd4',
+                  group_name: 'my-security-group-name'
+                }
+              ],
+              block_device_mappings: [
+                {
+                  device_name: '/dev/sda',
+                  ebs: {
+                    volume_id: 'vol-123a123b'
+                  }
+                }
+              ],
+              tags: [
+                {
+                  key: 'Name',
+                  value: 'my-ec2'
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    describe_vpcs: {
+      vpcs: [
+        {
+          vpc_id: 'vpc-ab123cde',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-vpc'
+            }
+          ]
+        }
+      ]
+    },
+    describe_subnets: {
+      subnets: [
+        {
+          state: 'available',
+          vpc_id: 'vpc-ab123cde',
+          subnet_id: 'subnet-1234a567',
+          cidr_block: '10.0.1.0/24',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-subnet'
+            }
+          ]
+        }
+      ]
+    },
+    describe_security_groups: {
+      security_groups: [
+        {
+          group_id: 'sg-1a2b3cd4',
+          group_name: 'my-security-group-name',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-security-group-tag-name'
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

data/lib/awspec/type/network_interface.rb

@@ -0,0 +1,52 @@
+module Awspec::Type
+  class NetworkInterface < Base
+    def initialize(id)
+      super
+      @resource_via_client = find_network_interface(id)
+      @id = @resource_via_client.network_interface_id if @resource_via_client
+    end
+
+    STATES = %w(
+      available attaching in-use detaching
+    )
+
+    STATES.each do |state|
+      define_method state.tr('-', '_') + '?' do
+        @resource_via_client.status == state
+      end
+    end
+
+    def attached_to?(instance_id, device_index = 0)
+      instance = find_ec2(instance_id)
+      return false unless instance
+      return false unless @resource_via_client.attachment
+      @resource_via_client.attachment.instance_id == instance.instance_id && \
+        @resource_via_client.attachment.status == 'attached' && \
+        @resource_via_client.attachment.device_index == device_index
+    end
+
+    def has_private_ip_address?(ip_address, primary = nil)
+      @resource_via_client.private_ip_addresses.find do |i|
+        next false if !primary.nil? && i.primary != primary
+        i.private_ip_address == ip_address
+      end
+    end
+
+    def has_security_group?(sg_id)
+      sgs = @resource_via_client.groups
+      ret = sgs.find do |sg|
+        sg.group_id == sg_id || sg.group_name == sg_id
+      end
+      return true if ret
+      sg2 = find_security_group(sg_id)
+      return false unless sg2.tag_name == sg_id
+      sgs.find do |sg|
+        sg.group_id == sg2.group_id
+      end
+    end
+
+    def private_ip_addresses_count
+      @resource_via_client.private_ip_addresses.count
+    end
+  end
+end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.35.0'
+  VERSION = '0.36.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: awsecrets
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,7 @@ files:
 - doc/_resource_types/launch_configuration.md
 - doc/_resource_types/nat_gateway.md
 - doc/_resource_types/network_acl.md
+- doc/_resource_types/network_interface.md
 - doc/_resource_types/rds.md
 - doc/_resource_types/rds_db_parameter_group.md
 - doc/_resource_types/route53_hosted_zone.md
@@ -256,6 +257,7 @@ files:
 - lib/awspec/generator/doc/type/launch_configuration.rb
 - lib/awspec/generator/doc/type/nat_gateway.rb
 - lib/awspec/generator/doc/type/network_acl.rb
+- lib/awspec/generator/doc/type/network_interface.rb
 - lib/awspec/generator/doc/type/rds.rb
 - lib/awspec/generator/doc/type/rds_db_parameter_group.rb
 - lib/awspec/generator/doc/type/route53_hosted_zone.rb
@@ -306,6 +308,7 @@ files:
 - lib/awspec/matcher.rb
 - lib/awspec/matcher/be_allowed.rb
 - lib/awspec/matcher/be_allowed_action.rb
+- lib/awspec/matcher/be_attached_to.rb
 - lib/awspec/matcher/be_denied.rb
 - lib/awspec/matcher/be_opened.rb
 - lib/awspec/matcher/be_opened_only.rb
@@ -316,6 +319,7 @@ files:
 - lib/awspec/matcher/belong_to_replication_group.rb
 - lib/awspec/matcher/belong_to_subnet.rb
 - lib/awspec/matcher/belong_to_vpc.rb
+- lib/awspec/matcher/have_private_ip_address.rb
 - lib/awspec/matcher/have_record_set.rb
 - lib/awspec/matcher/have_route.rb
 - lib/awspec/matcher/have_tag.rb
@@ -340,6 +344,7 @@ files:
 - lib/awspec/stub/launch_configuration.rb
 - lib/awspec/stub/nat_gateway.rb
 - lib/awspec/stub/network_acl.rb
+- lib/awspec/stub/network_interface.rb
 - lib/awspec/stub/rds.rb
 - lib/awspec/stub/rds_db_parameter_group.rb
 - lib/awspec/stub/route53_hosted_zone.rb
@@ -368,6 +373,7 @@ files:
 - lib/awspec/type/launch_configuration.rb
 - lib/awspec/type/nat_gateway.rb
 - lib/awspec/type/network_acl.rb
+- lib/awspec/type/network_interface.rb
 - lib/awspec/type/rds.rb
 - lib/awspec/type/rds_db_parameter_group.rb
 - lib/awspec/type/route53_hosted_zone.rb