awspec 0.20.2 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97d0436598f0439f4d63729eba87f983b5a5a569
-  data.tar.gz: 61b7da80bc5e131b7e058234a7cbc2bfdedd9620
+  metadata.gz: 3b5d0cf9f4832184634ab74c32058ab4ae35f5a0
+  data.tar.gz: 5a7c565b050c7a8056e0c6b1c93505b3283d4db5
 SHA512:
-  metadata.gz: a02f1c12494ac3c18637c4294c5ae80df73b354836fa58918f60eb4b57b0a6184cbe462a437907cf1d9712cae775b1bcac1c7338ee417a128f66f930d30c734c
-  data.tar.gz: 150e479220d830a9a40ea3952df9ff9047650addc62a75743d0ac60f197e92dd2fa15e07ae73f09e3fcc40927525ea1e2f752c2f8261f94f233213b5405b545e
+  metadata.gz: 9d15177534f9c8aa864c9a8e2bc11039554499409e8b720425623dcc531a14f85d5842578bdab20d0b19a00e03a01f88f9f03eda5951c159b7b77d960616adc2
+  data.tar.gz: 5e9a7aefb3dd7b9120f3df3e303e824c12563813deab2bdaa131b760a393dd3ced81fc9fbfbfcc5c8e79de19d2e59a2645383fd58a497d0d73dec22d331cbe41

data/awspec.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'aws_config'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'term-ansicolor'
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'

data/doc/_resource_types/route_table.md

@@ -0,0 +1,9 @@
+### have_route
+
+```ruby
+describe route_table('my-route-table') do
+  it { should have_route('10.0.0.0/16').target(gateway: 'local') }
+  it { should have_route('0.0.0.0/0').target(gateway: 'my-igw') }
+  it { should have_route('192.168.1.0/24').target(instance: 'my-instance') }
+end
+```

data/doc/resource_types.md

@@ -219,6 +219,14 @@ RouteTable resource type.
 
 ### have_route
 
+```ruby
+describe route_table('my-route-table') do
+  it { should have_route('10.0.0.0/16').target(gateway: 'local') }
+  it { should have_route('0.0.0.0/0').target(gateway: 'my-igw') }
+  it { should have_route('192.168.1.0/24').target(instance: 'my-instance') }
+end
+```
+
 #### its(:route_table_id), its(:vpc_id)
 ## <a name="ebs">ebs</a>
 

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

@@ -22,14 +22,29 @@ module Awspec::Generator
       def generate_linespecs(route_table)
         linespecs = []
         route_table.routes.each do |route|
-          linespecs.push(ERB.new(route_table_spec_linetemplate, nil, '-').result(binding))
+          linespecs.push(ERB.new(route_table_spec_gateway_linetemplate, nil, '-').result(binding)) if route.gateway_id
+          if route.instance_id
+            instance = find_ec2(route.instance_id)
+            linespecs.push(ERB.new(route_table_spec_instance_linetemplate, nil, '-').result(binding)) if instance
+          end
         end
         linespecs
       end
 
-      def route_table_spec_linetemplate
+      def route_table_spec_gateway_linetemplate
         template = <<-'EOF'
-it { shold have_route('<%= route.gateway_id %>').destination('<%= route.destination_cidr_block %>') }
+it { should have_route('<%= route.destination_cidr_block %>').target(geteway: '<%= route.gateway_id %>') }
+EOF
+        template
+      end
+
+      def route_table_spec_instance_linetemplate
+        template = <<-'EOF'
+<%- if instance.tag_name -%>
+it { should have_route('<%= route.destination_cidr_block %>').target(instance: '<%= instance.tag_name %>') }
+<%- else -%>
+it { should have_route('<%= route.destination_cidr_block %>').target(instance: '<%= route.instance_id %>') }
+<%- end -%>
 EOF
         template
       end

data/lib/awspec/helper.rb

@@ -1,3 +1,4 @@
+require 'awspec/helper/color'
 require 'awspec/helper/type'
 require 'awspec/helper/finder'
 require 'awspec/helper/credentials_loader'

data/lib/awspec/helper/color.rb

@@ -0,0 +1,5 @@
+require 'term/ansicolor'
+
+class Color
+  extend Term::ANSIColor
+end

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

@@ -42,26 +42,30 @@ module Awspec::Helper
                                                       })
       end
 
-      def find_subnet(subnet_id)
-        res = @ec2_client.describe_subnets({
-                                             filters: [{ name: 'subnet-id', values: [subnet_id] }]
-                                           })
-        return res[:subnets].first if res[:subnets].count == 1
-        res = @ec2_client.describe_subnets({
-                                             filters: [{ name: 'tag:Name', values: [subnet_id] }]
-                                           })
-        return res[:subnets].first if res[:subnets].count == 1
-      end
-
-      def find_internet_gateway(gateway_id)
-        res = @ec2_client.describe_internet_gateways({
-                                                       filters: [{ name: 'internet-gateway-id', values: [gateway_id] }]
-                                                     })
-        return res[:internet_gateways].first if res[:internet_gateways].count == 1
-        res = @ec2_client.describe_internet_gateways({
-                                                       filters: [{ name: 'tag:Name', values: [gateway_id] }]
-                                                     })
-        return res[:internet_gateways].first if res[:internet_gateways].count == 1
+      # fine_internet_gateway fine_virtual_gateway fine_customer_gateway
+      gateway_types = %w(internet virtual cutromer)
+      gateway_types.each do |type|
+        define_method 'find_' + type + '_gateway' do |*args|
+          gateway_id = args.first
+          res = @ec2_client.method('describe_' + type + '_gateways').call({
+                                                                            filters: [
+                                                                              {
+                                                                                name: 'internet-gateway-id',
+                                                                                values: [gateway_id]
+                                                                              }
+                                                                            ]
+                                                                          })
+          return res[type + '_gateways'].first if res[type + '_gateways'].count == 1
+          res = @ec2_client.method('describe_' + type + '_gateways').call({
+                                                                            filters: [
+                                                                              {
+                                                                                name: 'tag:Name',
+                                                                                values: [gateway_id]
+                                                                              }
+                                                                            ]
+                                                                          })
+          return res[type + '_gateways'].first if res[type + '_gateways'].count == 1
+        end
       end
 
       def find_security_group(sg_id)

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

@@ -47,6 +47,17 @@ module Awspec::Helper
                                                 })
         res[:network_acls]
       end
+
+      def find_subnet(subnet_id)
+        res = @ec2_client.describe_subnets({
+                                             filters: [{ name: 'subnet-id', values: [subnet_id] }]
+                                           })
+        return res[:subnets].first if res[:subnets].count == 1
+        res = @ec2_client.describe_subnets({
+                                             filters: [{ name: 'tag:Name', values: [subnet_id] }]
+                                           })
+        return res[:subnets].first if res[:subnets].count == 1
+      end
     end
   end
 end

data/lib/awspec/helper/type.rb

@@ -19,7 +19,8 @@ module Awspec
 
       # deprecated resource type
       def auto_scaling_group(name)
-        puts '!!! `auto_scaling_group` type is deprecated. use `autoscaling_group` !!!'
+        puts ''
+        puts Color.on_red(Color.white('!!! `auto_scaling_group` type is deprecated. use `autoscaling_group` !!!'))
         Awspec::Type::AutoscalingGroup.new(name)
       end
     end

data/lib/awspec/matcher/have_route.rb

@@ -1,13 +1,34 @@
-RSpec::Matchers.define :have_route do |target|
+require 'ipaddr'
+
+RSpec::Matchers.define :have_route do |destination|
   match do |route_table|
-    route_table.has_route?(target, @destination)
+    if !is_ipaddr?(destination) && @use_destination # for deprecated usage
+      @gateway_id = destination
+    else
+      @destination = destination
+    end
+    route_table.has_route?(@destination, @gateway_id, @instance_id)
+  end
+
+  chain :target do |target|
+    @gateway_id = target[:gateway]
+    @intance_id = target[:instance]
   end
 
-  chain :destination do |destination|
-    @destination = destination
+  chain :destination do |dest|
+    # rubocop:disable Metrics/LineLength
+    puts ''
+    puts Color.on_red(Color.white('!!! route_table destination is deprecated. see https://github.com/k1LoW/awspec/pull/65 !!!'))
+    # rubocop:enable Metrics/LineLength
+    @use_destination = true
+    @destination = dest
   end
 
-  chain :destination_cidr_block do |destination|
-    @destination = destination
+  private
+
+  def is_ipaddr?(str)
+    IPAddr.new(str)
+  rescue
+    false
   end
 end

data/lib/awspec/stub/route_table.rb

@@ -1,5 +1,45 @@
 Aws.config[:ec2] = {
   stub_responses: {
+    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: [
         {
@@ -40,6 +80,16 @@ Aws.config[:ec2] = {
               network_interface_id: nil,
               vpc_peering_connection_id: nil,
               state: 'active'
+            },
+            {
+              destination_cidr_block: '192.168.1.0/24',
+              destination_prefix_list_id: nil,
+              gateway_id: nil,
+              instance_id: 'i-ec12345a',
+              instance_owner_id: nil,
+              network_interface_id: nil,
+              vpc_peering_connection_id: nil,
+              state: 'active'
             }
           ],
           tags: [

data/lib/awspec/type/route_table.rb

@@ -6,14 +6,26 @@ module Awspec::Type
       @id = @resource[:route_table_id] if @resource
     end
 
-    def has_route?(target, destination = nil)
+    def has_route?(destination, gateway_id = nil, instance_id = nil)
       @resource.routes.find do |route|
         if destination
           next false unless route.destination_cidr_block == destination
         end
-        next true if route.gateway_id == target
-        igw = find_internet_gateway(target)
-        next true if igw.internet_gateway_id == target || igw.tag_name == target
+        # * gateway
+        next true if route.gateway_id == gateway_id
+        # internet gateway
+        igw = find_internet_gateway(gateway_id)
+        next true if igw && igw.tag_name == gateway_id
+        # virtual gateway
+        vgw = find_virtual_gateway(gateway_id)
+        next true if vgw && vgw.tag_name == gateway_id
+        # customer gateway
+        cgw = find_customer_gateway(gateway_id)
+        next true if cgw && cgw.tag_name == gateway_id
+        # instance
+        next true if route.instance_id == instance_id
+        instance = find_ec2(instance_id)
+        next true if instance && instance.tag_name == instance_id
       end
     end
   end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.20.2'
+  VERSION = '0.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +192,7 @@ files:
 - doc/_resource_types/lambda.md
 - doc/_resource_types/network_acl.md
 - doc/_resource_types/rds_db_parameter_group.md
+- doc/_resource_types/route_table.md
 - doc/_resource_types/security_group.md
 - doc/contributing.md
 - doc/resource_types.md
@@ -224,6 +239,7 @@ files:
 - lib/awspec/generator/spec/vpc.rb
 - lib/awspec/generator/template.rb
 - lib/awspec/helper.rb
+- lib/awspec/helper/color.rb
 - lib/awspec/helper/credentials_loader.rb
 - lib/awspec/helper/finder.rb
 - lib/awspec/helper/finder/autoscaling.rb