awspec 0.21.4 → 0.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09e60bc83f5157418e4a14d041c76512bcfd44c1
-  data.tar.gz: f54755018644fcde5c9b3d3dcef7e7ca2761172b
+  metadata.gz: e44bd4bb2ec33c8a5a4d3b8bce4b2fbb43409ffa
+  data.tar.gz: d7ea14e25e72ca1f046a0e9abd002fa392d6dd1e
 SHA512:
-  metadata.gz: 0f294f242b82340589654c4049c2072c52aa7a692fc9178175e8ff8b4c0f4578da85dac58685ba70151870b4284c03729c237694fe5453b074459d6a8d377913
-  data.tar.gz: 004e2bbbd525e7c29330ec31f095133daa9bee8cb414a7fbaf1717448b4b67f6cd3e118d715fab3abf15fd11cc5385f683d445856e9a3d80ad67bbb13ebf1b57
+  metadata.gz: 01e646ea517ce961c384b55ed2e48d62129cd126f408eb55dd5b84899b5b7652c6643dad1aaf9ab2972f9f5c0f66fe6ccc17a40b9e4c5feb889e1f45e899f883
+  data.tar.gz: 9338f1bb61b580d8fe958a996ec953bf86a47704f7fe61048a4aaa36e877a329a4d23bda8b3472d4b6ab64c1ff896c11aae61c1810f52f6f467a95d4e2886129

data/doc/_resource_types/route_table.md

@@ -3,7 +3,8 @@
 ```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') }
+  it { should have_route('0.0.0.0/0').target(gateway: 'igw-1ab2345c') }
+  it { should have_route('192.168.1.0/24').target(instance: 'my-ec2') }
+  it { should have_route('192.168.2.0/24').target(vpc_peering_connection: 'my-pcx') }
 end
 ```

data/doc/resource_types.md

@@ -222,8 +222,9 @@ RouteTable resource type.
 ```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') }
+  it { should have_route('0.0.0.0/0').target(gateway: 'igw-1ab2345c') }
+  it { should have_route('192.168.1.0/24').target(instance: 'my-ec2') }
+  it { should have_route('192.168.2.0/24').target(vpc_peering_connection: 'my-pcx') }
 end
 ```
 

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

@@ -28,6 +28,10 @@ module Awspec::Generator
             instance = find_ec2(route.instance_id)
             linespecs.push(ERB.new(route_table_spec_instance_linetemplate, nil, '-').result(binding)) if instance
           end
+          if route.vpc_peering_connection_id
+            connection = find_vpc_peering_connection(route.vpc_peering_connection_id)
+            linespecs.push(ERB.new(route_table_spec_connection_linetemplate, nil, '-').result(binding)) if connection
+          end
         end
         linespecs
       end
@@ -59,6 +63,19 @@ EOF
         template
       end
 
+      # rubocop:disable Metrics/LineLength
+      def route_table_spec_connection_linetemplate
+        template = <<-'EOF'
+<%- if connection.tag_name -%>
+it { should have_route('<%= route.destination_cidr_block %>').target(vpc_peering_connection: '<%= connection.tag_name %>') }
+<%- else -%>
+it { should have_route('<%= route.destination_cidr_block %>').target(vpc_peering_connection: '<%= route.vpc_peering_connection_id %>') }
+<%- end -%>
+EOF
+        template
+      end
+      # rubocop:enable Metrics/LineLength
+
       def route_table_spec_subnet_linetemplate
         template = <<-'EOF'
 <%- if subnet.tag_name -%>

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

@@ -42,15 +42,15 @@ module Awspec::Helper
                                                       })
       end
 
-      # fine_internet_gateway fine_virtual_gateway fine_customer_gateway
-      gateway_types = %w(internet virtual cutromer)
+      # fine_internet_gateway fine_vpn_gateway fine_customer_gateway
+      gateway_types = %w(internet vpn 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',
+                                                                                name: type + '-gateway-id',
                                                                                 values: [gateway_id]
                                                                               }
                                                                             ]

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

@@ -65,6 +65,27 @@ module Awspec::Helper
                                            })
         res[:subnets]
       end
+
+      def find_vpc_peering_connection(vpc_peering_connection_id)
+        res = @ec2_client.describe_vpc_peering_connections({
+                                                             filters: [
+                                                               {
+                                                                 name: 'vpc-peering-connection-id',
+                                                                 values: [vpc_peering_connection_id]
+                                                               }
+                                                             ]
+                                                           })
+        return res[:vpc_peering_connections].first if res[:vpc_peering_connections].count == 1
+        res = @ec2_client.describe_vpc_peering_connections({
+                                                             filters: [
+                                                               {
+                                                                 name: 'tag:Name',
+                                                                 values: [vpc_peering_connection_id]
+                                                               }
+                                                             ]
+                                                           })
+        return res[:vpc_peering_connections].first if res[:vpc_peering_connections].count == 1
+      end
     end
   end
 end

data/lib/awspec/matcher/have_route.rb

@@ -7,12 +7,13 @@ RSpec::Matchers.define :have_route do |destination|
     else
       @destination = destination
     end
-    route_table.has_route?(@destination, @gateway_id, @instance_id)
+    route_table.has_route?(@destination, @gateway_id, @instance_id, @vpc_peering_connection_id)
   end
 
   chain :target do |target|
     @gateway_id = target[:gateway]
-    @intance_id = target[:instance]
+    @instance_id = target[:instance]
+    @vpc_peering_connection_id = target[:vpc_peering_connection]
   end
 
   chain :destination do |dest|

data/lib/awspec/stub/route_table.rb

@@ -90,6 +90,16 @@ Aws.config[:ec2] = {
               network_interface_id: nil,
               vpc_peering_connection_id: nil,
               state: 'active'
+            },
+            {
+              destination_cidr_block: '192.168.2.0/24',
+              destination_prefix_list_id: nil,
+              gateway_id: nil,
+              instance_id: nil,
+              instance_owner_id: nil,
+              network_interface_id: nil,
+              vpc_peering_connection_id: 'pcx-c56789de',
+              state: 'active'
             }
           ],
           associations: [
@@ -144,6 +154,19 @@ Aws.config[:ec2] = {
           ]
         }
       ]
+    },
+    describe_vpc_peering_connections: {
+      vpc_peering_connections: [
+        {
+          vpc_peering_connection_id: 'pcx-c56789de',
+          tags: [
+            {
+              key: 'Name',
+              value: 'my-pcx'
+            }
+          ]
+        }
+      ]
     }
   }
 }

data/lib/awspec/type/route_table.rb

@@ -6,26 +6,14 @@ module Awspec::Type
       @id = @resource[:route_table_id] if @resource
     end
 
-    def has_route?(destination, gateway_id = nil, instance_id = nil)
+    def has_route?(destination, gateway_id = nil, instance_id = nil, vpc_peering_connection_id = nil)
       @resource.routes.find do |route|
         if destination
           next false unless route.destination_cidr_block == destination
         end
-        # * 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
+        next target_gateway?(route, gateway_id) if gateway_id
+        next target_instance?(route, instance_id) if instance_id
+        next target_vpc_peering_connection?(route, vpc_peering_connection_id) if vpc_peering_connection_id
       end
     end
 
@@ -36,5 +24,38 @@ module Awspec::Type
         a[:subnet_id] == subnet[:subnet_id]
       end
     end
+
+    private
+
+    def target_gateway?(route, gateway_id)
+      # * gateway
+      return true if route.gateway_id == gateway_id
+      # internet gateway
+      igw = find_internet_gateway(gateway_id)
+      return true if igw && igw.tag_name == gateway_id
+      # vpn gateway
+      vgw = find_vpn_gateway(gateway_id)
+      return true if vgw && vgw.tag_name == gateway_id
+      # customer gateway
+      cgw = find_customer_gateway(gateway_id)
+      return true if cgw && cgw.tag_name == gateway_id
+      false
+    end
+
+    def target_instance?(route, instance_id)
+      # instance
+      return true if route.instance_id == instance_id
+      instance = find_ec2(instance_id)
+      return true if instance && instance.tag_name == instance_id
+      false
+    end
+
+    def target_vpc_peering_connection?(route, vpc_peering_connection_id)
+      # vpc_peering_connection_id
+      return true if route.vpc_peering_connection_id == vpc_peering_connection_id
+      connection = find_vpc_peering_connection(vpc_peering_connection_id)
+      return true if connection && connection.tag_name == vpc_peering_connection_id
+      false
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.21.4'
+  VERSION = '0.21.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.21.5
 platform: ruby
 authors:
 - k1LoW