awspec 0.21.2 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde04b9af6397716c07ab8b9923bc41d5022be8d
-  data.tar.gz: 3d7c616f0c991175aa6dd4ec319cb2c5c6feb246
+  metadata.gz: 3e1afe8cf22c31470696adebc9e12ade123b1c38
+  data.tar.gz: 092d0c2c0f93889e78c967f4cc9c8cee58193958
 SHA512:
-  metadata.gz: 45b01ee950eba95c6a21fdda034430514122d5f0c8ed93f6ffaf590a0c2ef8c9f341648dd2233e92f30f46f0401bef2a144e4d4182e2cf32f95b67eadac4b3bd
-  data.tar.gz: 46815428b3c35b2b75e9d135d2b226f0f862e97a82db1021977c1a0d2900aedb34b1c1dd9b30073b5fc243c36f8e9af21f16438299d72c05a0d895b8f6bd900b
+  metadata.gz: b64a0e66d01174810da25ca200eb23ab2077dfc4ca1daa34fee6649ae62156cdf57665a60959bcdd27373f53118691576d02a59646a4f297adf6214689b8d3c5
+  data.tar.gz: a465fbb92cdea043fac44eca48f1588f677d45ecc815607709cd2fda59281a9c80aaf810f8d13f0210a8884acfc9be1bbdaf73f42311b5717b8e091131a2a847

data/doc/resource_types.md

@@ -227,6 +227,8 @@ describe route_table('my-route-table') do
 end
 ```
 
+### have_subnet
+
 #### its(:route_table_id), its(:vpc_id)
 ## <a name="ebs">ebs</a>
 

data/lib/awspec/command/generate.rb

@@ -7,7 +7,7 @@ module Awspec
     class_option :profile
 
     types = %w(
-      vpc ec2 rds security_group elb network_acl route_table
+      vpc ec2 rds security_group elb network_acl route_table subnet
     )
 
     types.each do |type|

data/lib/awspec/generator.rb

@@ -11,6 +11,7 @@ require 'awspec/generator/spec/iam_policy'
 require 'awspec/generator/spec/cloudwatch_alarm'
 require 'awspec/generator/spec/network_acl'
 require 'awspec/generator/spec/route_table'
+require 'awspec/generator/spec/subnet'
 
 # Doc
 require 'awspec/generator/doc/type'

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

@@ -11,7 +11,8 @@ module Awspec::Generator
         @vpc_tag_name = vpc.tag_name
         route_tables = select_route_table_by_vpc_id(@vpc_id)
         specs = route_tables.map do |route_table|
-          linespecs = generate_linespecs(route_table)
+          linespecs = generate_route_linespecs(route_table)
+          subnet_linespecs = generate_subnet_linespecs(route_table)
           route_table_id = route_table[:route_table_id]
           route_table_tag_name = route_table.tag_name
           content = ERB.new(route_table_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
@@ -19,7 +20,7 @@ module Awspec::Generator
         specs.join("\n")
       end
 
-      def generate_linespecs(route_table)
+      def generate_route_linespecs(route_table)
         linespecs = []
         route_table.routes.each do |route|
           linespecs.push(ERB.new(route_table_spec_gateway_linetemplate, nil, '-').result(binding)) if route.gateway_id
@@ -31,6 +32,15 @@ module Awspec::Generator
         linespecs
       end
 
+      def generate_subnet_linespecs(route_table)
+        linespecs = []
+        route_table.associations.each do |a|
+          subnet = find_subnet(a.subnet_id)
+          linespecs.push(ERB.new(route_table_spec_subnet_linetemplate, nil, '-').result(binding)) if subnet
+        end
+        linespecs
+      end
+
       def route_table_spec_gateway_linetemplate
         template = <<-'EOF'
 it { should have_route('<%= route.destination_cidr_block %>').target(gateway: '<%= route.gateway_id %>') }
@@ -49,6 +59,17 @@ EOF
         template
       end
 
+      def route_table_spec_subnet_linetemplate
+        template = <<-'EOF'
+<%- if subnet.tag_name -%>
+it { should have_subnet('<%= subnet.tag_name %>') }
+<%- else -%>
+it { should have_subnet('<%= subnet.subnet_id %>') }
+<%- end -%>
+EOF
+        template
+      end
+
       def route_table_spec_template
         template = <<-'EOF'
 <%- if route_table_tag_name -%>
@@ -65,6 +86,9 @@ describe route_table('<%= route_table_id %>') do
 <% linespecs.each do |line| %>
   <%= line %>
 <% end %>
+<% subnet_linespecs.each do |line| %>
+  <%= line %>
+<% end %>
 end
 EOF
         template

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

@@ -0,0 +1,47 @@
+module Awspec::Generator
+  module Spec
+    class Subnet
+      include Awspec::Helper::Finder
+      def generate_by_vpc_id(vpc_id)
+        describes = %w(
+          subnet_id cidr_block
+        )
+        vpc = find_vpc(vpc_id)
+        fail 'Not Found VPC' unless vpc
+        @vpc_id = vpc[:vpc_id]
+        @vpc_tag_name = vpc.tag_name
+        subnets = select_subnet_by_vpc_id(@vpc_id)
+        specs = subnets.map do |subnet|
+          subnet_id = subnet[:subnet_id]
+          subnet_tag_name = subnet.tag_name
+          content = ERB.new(subnet_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      def subnet_spec_template
+        template = <<-'EOF'
+<%- if subnet_tag_name -%>
+describe subnet('<%= subnet_tag_name %>') do
+<%- else -%>
+describe subnet('<%= subnet_id %>') do
+<%- end -%>
+  it { should exist }
+  it { should be_<%= subnet.state %> }
+  it { should belong_to_vpc('<%= @vpc_tag_name %>') }
+<% describes.each do |describe| %>
+<%- if subnet.members.include?(describe.to_sym) && !subnet[describe.to_sym].nil? -%>
+<%- if subnet[describe].is_a?(String) -%>
+  its(:<%= describe %>) { should eq '<%= subnet[describe] %>' }
+<%- else -%>
+  its(:<%= describe %>) { should eq <%= subnet[describe] %> }
+<%- end -%>
+<%- end -%>
+<% end %>
+end
+EOF
+        template
+      end
+    end
+  end
+end

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

@@ -58,6 +58,13 @@ module Awspec::Helper
                                            })
         return res[:subnets].first if res[:subnets].count == 1
       end
+
+      def select_subnet_by_vpc_id(vpc_id)
+        res = @ec2_client.describe_subnets({
+                                             filters: [{ name: 'vpc-id', values: [vpc_id] }]
+                                           })
+        res[:subnets]
+      end
     end
   end
 end

data/lib/awspec/stub/route_table.rb

@@ -92,6 +92,14 @@ Aws.config[:ec2] = {
               state: 'active'
             }
           ],
+          associations: [
+            {
+              route_table_association_id: 'rtbassoc-b123456cd',
+              route_table_id: 'rtb-a12bcd34',
+              subnet_id: 'subnet-1234a567',
+              main: false
+            }
+          ],
           tags: [
             {
               key: 'Name',
@@ -101,6 +109,22 @@ Aws.config[:ec2] = {
         }
       ]
     },
+    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_internet_gateways: {
       internet_gateways: [
         {

data/lib/awspec/type/route_table.rb

@@ -28,5 +28,13 @@ module Awspec::Type
         next true if instance && instance.tag_name == instance_id
       end
     end
+
+    def has_subnet?(subnet_id)
+      subnet = find_subnet(subnet_id)
+      return false unless subnet
+      @resource.associations.find do |a|
+        a[:subnet_id] == subnet[:subnet_id]
+      end
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.21.2'
+  VERSION = '0.21.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors:
 - k1LoW
@@ -236,6 +236,7 @@ files:
 - lib/awspec/generator/spec/route53_hosted_zone.rb
 - lib/awspec/generator/spec/route_table.rb
 - lib/awspec/generator/spec/security_group.rb
+- lib/awspec/generator/spec/subnet.rb
 - lib/awspec/generator/spec/vpc.rb
 - lib/awspec/generator/template.rb
 - lib/awspec/helper.rb