awspec 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64695d36dc5c2eacd3cfb6999fa4639aaad880a5
-  data.tar.gz: 8f8929979324810c08d756abb48f7f0259a74d17
+  metadata.gz: 233cbc5d2647507ec61335211db2877435b21d93
+  data.tar.gz: a3dca3393a13bcbf2802b80c0fc2f3a226a3ff9a
 SHA512:
-  metadata.gz: a38ee03bfc99f1eac2854bc49b43cb31fc533fdebaa11a4bfef33c0a7bbc0d6060bbc769a254483349fa74c8b7c7916a9285030a4dcfe11e889705915dcbbcf6
-  data.tar.gz: 04d2562dfed0c1edf4cb1a0cd62c8d9b66b3136c9c7d25b3cad7671b45260d9d0d2d660b8857d120e8c7360a2c65f0d4ee123258222a9a1a4fff6d4b47b6cf20
+  metadata.gz: 11b94b62d04b77bbd8f477e0f4b554f13309d447b44e336ea558802a10b33cb54ec7cbda2a50031a489a04c216dd60ea789193e7a3d065d81baa784506cfa566
+  data.tar.gz: b141e71cea34ed5595e9d983dbee5505d55b118d9a55b5461c6dca080966513a6456a34fd974618f78fa34dda73ddccff994989fbddd965cc5558dcac303d3b8

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.6
-  - 2.2.1
+  - 2.2.3
+  - 2.1.7
 
 before_install:
   - gem update bundler

data/doc/_resource_types/security_group.md

@@ -0,0 +1,10 @@
+### its(:inbound), its(:outbound)
+
+```ruby
+describe security_group('my-security-group-name') do
+  its(:outbound) { should be_opened }
+  its(:inbound) { should be_opened(80) }
+  its(:inbound) { should be_opened(80).protocol('tcp').for('203.0.113.1/32') }
+  its(:inbound) { should be_opened(22).protocol('tcp').for('sg-5a6b7cd8') }
+end
+```

data/doc/resource_types.md

@@ -127,6 +127,15 @@ SecurityGroup resource type.
 
 ### its(:inbound), its(:outbound)
 
+```ruby
+describe security_group('my-security-group-name') do
+  its(:outbound) { should be_opened }
+  its(:inbound) { should be_opened(80) }
+  its(:inbound) { should be_opened(80).protocol('tcp').for('203.0.113.1/32') }
+  its(:inbound) { should be_opened(22).protocol('tcp').for('sg-5a6b7cd8') }
+end
+```
+
 #### its(:ip_permissions_count), its(:ip_permissions_egress_count), its(:owner_id), its(:group_name), its(:group_id), its(:description), its(:vpc_id)
 ## <a name="vpc">vpc</a>
 

data/lib/awspec/command/generate.rb

@@ -4,7 +4,7 @@ require 'awspec/setup'
 module Awspec
   class Generate < Thor
     types = %w(
-      vpc ec2 rds security_group
+      vpc ec2 rds security_group elb
     )
 
     types.each do |type|

data/lib/awspec/generator.rb

@@ -6,6 +6,7 @@ require 'awspec/generator/spec/rds'
 require 'awspec/generator/spec/vpc'
 require 'awspec/generator/spec/security_group'
 require 'awspec/generator/spec/route53_hosted_zone'
+require 'awspec/generator/spec/elb'
 
 # Doc
 types.each do |type|

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

@@ -17,6 +17,7 @@ module Awspec::Generator
           instance_tag_name = instance.tag_name
           subnet = find_subnet(instance.subnet_id)
           eips = select_eip_by_instance_id(instance_id)
+          volumes = select_ebs_by_instance_id(instance_id)
           content = ERB.new(ec2_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
         end
         specs.join("\n")
@@ -34,10 +35,10 @@ describe ec2('<%= instance_id %>') do
   it { should be_<%= instance.state.name %> }
 <% describes.each do |describe| %>
 <%- if instance.members.include?(describe.to_sym) && !instance[describe.to_sym].nil? -%>
-<%- if instance[describe].is_a?(TrueClass) || instance[describe].is_a?(FalseClass) -%>
-  its(:<%= describe %>) { should eq <%= instance[describe] %> }
-<%- else -%>
+<%- if instance[describe].is_a?(String) -%>
   its(:<%= describe %>) { should eq '<%= instance[describe] %>' }
+<%- else -%>
+  its(:<%= describe %>) { should eq <%= instance[describe] %> }
 <%- end -%>
 <%- end -%>
 <% end %>
@@ -57,6 +58,13 @@ describe ec2('<%= instance_id %>') do
 <% eips.each do |eip| %>
   it { should have_eip('<%= eip.public_ip %>') }
 <% end %>
+<% volumes.each do |volume| %>
+<%- if volume.tag_name -%>
+  it { should have_ebs('<%= volume.tag_name %>') }
+<%- else -%>
+  it { should have_ebs('<%= volume.volume_id %>') }
+<%- end -%>
+<% end %>
 end
 EOF
         template

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

@@ -0,0 +1,57 @@
+module Awspec::Generator
+  module Spec
+    class Elb
+      include Awspec::Helper::Finder
+      def generate_by_vpc_id(vpc_id)
+        describes = %w(
+          load_balancer_name
+        )
+        health_check_options = %w(
+          target interval timeout
+          unhealthy_threshold healthy_threshold
+        )
+        vpc = find_vpc(vpc_id)
+        fail 'Not Found VPC' unless vpc
+        @vpc_id = vpc[:vpc_id]
+        @vpc_tag_name = vpc.tag_name
+        lbs = select_elb_by_vpc_id(@vpc_id)
+
+        specs = lbs.map do |lb|
+          content = ERB.new(elb_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      # rubocop:disable all
+      def elb_spec_template
+        template = <<-'EOF'
+describe elb('<%= lb.load_balancer_name %>') do
+  it { should exist }
+<% describes.each do |describe| %>
+<%- if lb.members.include?(describe.to_sym) && !lb[describe.to_sym].nil? -%>
+<%- if lb[describe].is_a?(TrueClass) || lb[describe].is_a?(FalseClass) -%>
+  its(:<%= describe %>) { should eq <%= lb[describe] %> }
+<%- else -%>
+  its(:<%= describe %>) { should eq '<%= lb[describe] %>' }
+<%- end -%>
+<%- end -%>
+<% end %>
+<% health_check_options.each do |option| %>
+<%- if lb[:health_check].members.include?(option.to_sym) && !lb[:health_check][option].nil? -%>
+<%- if lb[:health_check][option].is_a?(String) -%>
+  its(:health_check_<%= option %>) { should eq '<%= lb[:health_check][option] %>' }
+<%- else -%>
+  its(:health_check_<%= option %>) { should eq <%= lb[:health_check][option] %> }
+<%- end -%>
+<%- end -%>
+<% end %>
+<% lb[:listener_descriptions].each do |desc| %>
+  it { should have_listener(protocol: '<%= desc.listener.protocol %>', port: <%= desc.listener.load_balancer_port %>, instance_protocol: '<%= desc.listener.instance_protocol %>', instance_port: <%= desc.listener.instance_port %>) }
+<% end %>
+end
+EOF
+        template
+      end
+    end
+  end
+end

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

@@ -31,10 +31,10 @@ describe rds('<%= instance_id %>') do
   it { should be_<%= db_instance.db_instance_status %> }
 <% describes.each do |describe| %>
 <%- if db_instance.members.include?(describe.to_sym) && !db_instance[describe.to_sym].nil? -%>
-<%- if db_instance[describe].is_a?(TrueClass) || db_instance[describe].is_a?(FalseClass) -%>
-  its(:<%= describe %>) { should eq <%= db_instance[describe] %> }
-<%- else -%>
+<%- if db_instance[describe].is_a?(String) -%>
   its(:<%= describe %>) { should eq '<%= db_instance[describe] %>' }
+<%- else -%>
+  its(:<%= describe %>) { should eq <%= db_instance[describe] %> }
 <%- end -%>
 <%- end -%>
 <% end %>

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

@@ -27,10 +27,10 @@ describe vpc('<%= @vpc_id %>') do
   it { should be_<%= vpc.state %> }
 <% describes.each do |describe| %>
 <%- if vpc.key?(describe) -%>
-<%- if vpc[describe].is_a?(TrueClass) || vpc[describe].is_a?(FalseClass) -%>
-  its(:<%= describe %>) { should eq <%= vpc[describe] %> }
-<%- else -%>
+<%- if vpc[describe].is_a?(String) -%>
   its(:<%= describe %>) { should eq '<%= vpc[describe] %>' }
+<%- else -%>
+  its(:<%= describe %>) { should eq <%= vpc[describe] %> }
 <%- end -%>
 <%- end -%>
 <% end %>

data/lib/awspec/helper/finder.rb

@@ -6,6 +6,7 @@ require 'awspec/helper/finder/rds'
 require 'awspec/helper/finder/route53'
 require 'awspec/helper/finder/s3'
 require 'awspec/helper/finder/auto_scaling'
+require 'awspec/helper/finder/ebs'
 require 'awspec/helper/finder/elb'
 
 module Awspec::Helper
@@ -18,6 +19,7 @@ module Awspec::Helper
     include Awspec::Helper::Finder::Route53
     include Awspec::Helper::Finder::S3
     include Awspec::Helper::Finder::AutoScaling
+    include Awspec::Helper::Finder::Ebs
     include Awspec::Helper::Finder::Elb
 
     # rubocop:disable all

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

@@ -0,0 +1,27 @@
+module Awspec::Helper
+  module Finder
+    module Ebs
+      def find_ebs(volume_id)
+        res = @ec2_client.describe_volumes({
+                                             filters: [{ name: 'volume-id', values: [volume_id] }]
+                                           })
+        return res[:volumes][0] if res[:volumes].count == 1
+        res = @ec2_client.describe_volumes({
+                                             filters: [{ name: 'tag:Name', values: [volume_id] }]
+                                           })
+        return res[:volumes][0] if res[:volumes].count == 1
+      end
+
+      def select_ebs_by_instance_id(id)
+        res = find_ec2(id)
+        volumes = []
+        return volumes unless res
+        res[:block_device_mappings].each do |block|
+          volume = find_ebs(block.ebs.volume_id)
+          volumes.push(volume) if volume
+        end
+        volumes
+      end
+    end
+  end
+end

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

@@ -73,17 +73,6 @@ module Awspec::Helper
         return res[:security_groups][0] if res[:security_groups].count == 1
       end
 
-      def find_ebs(volume_id)
-        res = @ec2_client.describe_volumes({
-                                             filters: [{ name: 'volume-id', values: [volume_id] }]
-                                           })
-        return res[:volumes][0] if res[:volumes].count == 1
-        res = @ec2_client.describe_volumes({
-                                             filters: [{ name: 'tag:Name', values: [volume_id] }]
-                                           })
-        return res[:volumes][0] if res[:volumes].count == 1
-      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/finder/elb.rb

@@ -9,6 +9,13 @@ module Awspec::Helper
       rescue
         return nil
       end
+
+      def select_elb_by_vpc_id(vpc_id)
+        res = @elb_client.describe_load_balancers
+        res[:load_balancer_descriptions].select do |lb|
+          lb.vpc_id == vpc_id
+        end
+      end
     end
   end
 end

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

@@ -11,10 +11,9 @@ module Awspec::Helper
 
       def select_rds_by_vpc_id(vpc_id)
         res = @rds_client.describe_db_instances
-        db_instances = res[:db_instances].select do |db_instance|
+        res[:db_instances].select do |db_instance|
           db_instance.db_subnet_group.vpc_id == vpc_id
         end
-        db_instances
       end
     end
   end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -142,6 +142,7 @@ files:
 - bin/awspec
 - doc/_resource_types/ec2.md
 - doc/_resource_types/elb.md
+- doc/_resource_types/security_group.md
 - doc/resource_types.md
 - lib/awspec.rb
 - lib/awspec/cli.rb
@@ -165,6 +166,7 @@ files:
 - lib/awspec/generator/doc/subnet.rb
 - lib/awspec/generator/doc/vpc.rb
 - lib/awspec/generator/spec/ec2.rb
+- lib/awspec/generator/spec/elb.rb
 - lib/awspec/generator/spec/rds.rb
 - lib/awspec/generator/spec/route53_hosted_zone.rb
 - lib/awspec/generator/spec/security_group.rb
@@ -172,6 +174,7 @@ files:
 - lib/awspec/helper.rb
 - lib/awspec/helper/finder.rb
 - lib/awspec/helper/finder/auto_scaling.rb
+- lib/awspec/helper/finder/ebs.rb
 - lib/awspec/helper/finder/ec2.rb
 - lib/awspec/helper/finder/elb.rb
 - lib/awspec/helper/finder/rds.rb