awspec 0.27.1 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9042af61aec1b5df8eeb34f52f8b17eecdbf2da
-  data.tar.gz: 57937ca1298ac6b179bfe2855e217cebf60228c0
+  metadata.gz: cdaf7283fd3ad83496a8d7e26f99250fda35c333
+  data.tar.gz: f91c17c13d033c634c758ce807f5c4dedec8f5ae
 SHA512:
-  metadata.gz: 6e53b2835ec1ee1f8b5a9f5694fec805a82f1ef2da866a9b3c53d1328c41a0c2c0df723ef1dc631dbcfa45626a968c3c037ea15a94b3c84cf3d5f6438088afa9
-  data.tar.gz: c0eb65762353fbfe117c1355520e16f806cfda3de8e5c78037f4cd17101034196657514be631e4d8232ddc87bf258c5ef3e40f068509b76b065f4ce78499977a
+  metadata.gz: 74d3b19c417e76c287b62575cc0115eb54b96157eaa8996eefbe666fc86f9ba8fb8f3b68bb7284c5c5142d1880df5ee7345007a22cdcbbd25f34044cf932d42f
+  data.tar.gz: a3e07e7c7b5ab90415e6bba0e0fee0c8c223f42c6aa026e799dd5e1e2a7dcf3b66331523f5746d8044e8f0369a5be8f62070f022d830e0a87fa283272b9b7280

data/doc/resource_types.md

@@ -202,7 +202,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(: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)
 ### :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/spec/route_table.rb

@@ -32,6 +32,9 @@ module Awspec::Generator
             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
+          if route.nat_gateway_id
+            linespecs.push(ERB.new(route_table_spec_nat_linetemplate, nil, '-').result(binding))
+          end
         end
         linespecs
       end
@@ -77,6 +80,13 @@ EOF
       end
       # rubocop:enable Metrics/LineLength
 
+      def route_table_spec_nat_linetemplate
+        template = <<-'EOF'
+it { should have_route('<%= route.destination_cidr_block %>').target(nat: '<%= route.nat_gateway_id %>') }
+EOF
+        template
+      end
+
       def route_table_spec_subnet_linetemplate
         template = <<-'EOF'
 <%- if subnet.tag_name -%>

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

@@ -42,8 +42,8 @@ module Awspec::Helper
                                                      })
       end
 
-      # fine_internet_gateway fine_vpn_gateway fine_customer_gateway
-      gateway_types = %w(internet vpn cutromer)
+      # find_internet_gateway find_vpn_gateway find_customer_gateway find_nat_gateway
+      gateway_types = %w(internet vpn customer nat)
       gateway_types.each do |type|
         define_method 'find_' + type + '_gateway' do |*args|
           gateway_id = args.first

data/lib/awspec/matcher/have_route.rb

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

data/lib/awspec/stub/route_table.rb

@@ -67,6 +67,7 @@ Aws.config[:ec2] = {
               gateway_id: 'local',
               instance_id: nil,
               instance_owner_id: nil,
+              nat_gateway_id: nil,
               network_interface_id: nil,
               vpc_peering_connection_id: nil,
               state: 'active'
@@ -77,6 +78,7 @@ Aws.config[:ec2] = {
               gateway_id: 'igw-1ab2345c',
               instance_id: nil,
               instance_owner_id: nil,
+              nat_gateway_id: nil,
               network_interface_id: nil,
               vpc_peering_connection_id: nil,
               state: 'active'
@@ -87,6 +89,7 @@ Aws.config[:ec2] = {
               gateway_id: nil,
               instance_id: 'i-ec12345a',
               instance_owner_id: nil,
+              nat_gateway_id: nil,
               network_interface_id: nil,
               vpc_peering_connection_id: nil,
               state: 'active'
@@ -97,9 +100,21 @@ Aws.config[:ec2] = {
               gateway_id: nil,
               instance_id: nil,
               instance_owner_id: nil,
+              nat_gateway_id: nil,
               network_interface_id: nil,
               vpc_peering_connection_id: 'pcx-c56789de',
               state: 'active'
+            },
+            {
+              destination_cidr_block: '192.168.3.0/24',
+              destination_prefix_list_id: nil,
+              gateway_id: nil,
+              instance_id: nil,
+              instance_owner_id: nil,
+              nat_gateway_id: 'nat-7ff7777f',
+              network_interface_id: nil,
+              vpc_peering_connection_id: nil,
+              state: 'active'
             }
           ],
           associations: [
@@ -155,6 +170,15 @@ Aws.config[:ec2] = {
         }
       ]
     },
+    describe_nat_gateways: {
+      nat_gateways: [
+        {
+          nat_gateway_id: 'nat-7ff7777f',
+          vpc_id: 'vpc-ab123cde',
+          state: 'available'
+        }
+      ]
+    },
     describe_vpc_peering_connections: {
       vpc_peering_connections: [
         {

data/lib/awspec/type/route_table.rb

@@ -8,7 +8,11 @@ module Awspec::Type
       @id = @resource_via_client[:route_table_id] if @resource_via_client
     end
 
-    def has_route?(destination, gateway_id = nil, instance_id = nil, vpc_peering_connection_id = nil)
+    def has_route?(destination,
+                   gateway_id = nil,
+                   instance_id = nil,
+                   vpc_peering_connection_id = nil,
+                   nat_gateway_id = nil)
       @resource_via_client.routes.find do |route|
         if destination
           next false unless route.destination_cidr_block == destination
@@ -16,6 +20,7 @@ module Awspec::Type
         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
+        next target_nat?(route, nat_gateway_id) if nat_gateway_id
       end
     end
 
@@ -41,6 +46,8 @@ module Awspec::Type
       # customer gateway
       cgw = find_customer_gateway(gateway_id)
       return true if cgw && cgw.tag_name == gateway_id
+      # nat gateway
+      return true if route.nat_gateway_id == gateway_id
       false
     end
 
@@ -52,6 +59,11 @@ module Awspec::Type
       false
     end
 
+    def target_nat?(route, nat_gateway_id)
+      # nat
+      route.nat_gateway_id == nat_gateway_id
+    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

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.27.1'
+  VERSION = '0.27.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.2
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec