awspec 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df207790f4376bc443bf955cd3431d61a5944f0e
-  data.tar.gz: 2318f61037e3b4b1133f79ffcb75840ce61595fe
+  metadata.gz: eb7c243a9fcad6c31ac22a4f8d66f1bff11e6b66
+  data.tar.gz: 6af37940f727d37bbde405cde5973b4364f5fc19
 SHA512:
-  metadata.gz: 2efb966dd21639c1dc2fb8d1e909430e5b1250fcc626897eea88031fba0cbe9423d646ae64b144caec88da1d5183eb22ae70cb8eefc6d8c7f3d8ca37cab9f28d
-  data.tar.gz: 4864b9b8d31aa4d4224b8b8ae4510e3650ff238c5ac0411a03443135b6d313b095d084e8358727d621b5261a86dae0c09050478d3b22e8cde90cc9de3c1161c3
+  metadata.gz: 19de496aad11f977031078076db13d590ed151c22ca363157c4feec97dee1555ec26d8ff01709aa02081aecd3491145fac1b8b925eef891ad71a981df9fe5454
+  data.tar.gz: e9a60c8719d3585f7dbd058bc4f3b2d940e6803093a9de060f9ba8f709dc4e440cfaeb2835130ae6e2a52282157b8e028826691f1d707b208eab2682a8302ed5

data/README.md

@@ -1,6 +1,6 @@
 # awspec [![Gem](https://img.shields.io/gem/v/awspec.svg)](https://rubygems.org/gems/awspec) [![Travis](https://img.shields.io/travis/k1LoW/awspec.svg)](https://travis-ci.org/k1LoW/awspec)
 
-RSpec tests for your AWS resources inspired by Serverspec.
+RSpec tests for your AWS resources.
 
 ## Installation
 
@@ -20,11 +20,21 @@ Or install it yourself as:
 
 ## Usage
 
-### 1. Generate awspec template
+### 1. Generate awspec init files
 
     $ awspec init
 
-### 2. Write *_spec.rb
+### 2. Set AWS region/aws_access_key_id/aws_secret_access_key
+
+```sh
+$ cat <<EOF > spec/secrets.yml
+region: ap-northeast-1
+aws_access_key_id: XXXXXXXXXXXXXXXXXXXX
+aws_secret_access_key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+EOF
+```
+
+### 3. Write spec/*_spec.rb
 
 ```ruby
 describe ec2('my-ec2-tag-name') do
@@ -39,6 +49,14 @@ describe ec2('my-ec2-tag-name') do
 end
 ```
 
+### Advanced Usage: Spec generate command
+
+Generate spec from AWS resources already exists.
+
+```sh
+$ awspec generate ec2 vpc-ab123cde >> spec/ec2_spec.rb
+```
+
 ## Support AWS Resources
 
 - [X] EC2 (`ec2`)
@@ -58,7 +76,7 @@ end
 ## TODO
 
 - [ ] Comment format for Document generation
-- [ ] Spec generator
+- [X] Spec generate command
 
 ## Contributing
 
@@ -70,6 +88,8 @@ end
 
 ## References
 
+awspec is inspired by Serverspec.
+
 - Original idea (code / architecture) -> [Serverspec](https://github.com/serverspec/serverspec)
-- awspec original concept -> https://github.com/marcy-terui/awspec
+- `AWS + Serverspec` original concept -> https://github.com/marcy-terui/awspec
 - [Serverspec book](http://www.oreilly.co.jp/books/9784873117096/)

data/Rakefile

@@ -7,10 +7,14 @@ end
 if defined?(RSpec)
   task spec: 'spec:all'
   namespace :spec do
-    task all: ['spec:type']
+    task all: ['spec:type', 'spec:generator']
 
     RSpec::Core::RakeTask.new(:type) do |t|
       t.pattern = 'spec/type/*_spec.rb'
     end
+
+    RSpec::Core::RakeTask.new(:generator) do |t|
+      t.pattern = 'spec/generator/*_spec.rb'
+    end
   end
 end

data/lib/awspec.rb

@@ -5,7 +5,8 @@ require 'awspec/version'
 require 'awspec/cli'
 require 'awspec/matcher'
 require 'awspec/helper'
-require 'awspec/ext/string'
+require 'awspec/ext'
+require 'awspec/generator'
 
 module Awspec
 end

data/lib/awspec/cli.rb

@@ -1,11 +1,16 @@
 require 'thor'
 require 'awspec/setup'
+require 'awspec/command/generate'
 
 module Awspec
   class CLI < Thor
-    desc 'awspec init', 'Generate awspec spec_helper.rb'
+    desc 'awspec init', 'Generate init files'
     def init
       Awspec::Setup.run
     end
+
+    desc 'awspec generate [vpc_id]', 'Generate *_spec.rb from VPC ID (or VPC "Name" tag)'
+    subcommand 'generate', Generate
+    map 'g' => 'generate'
   end
 end

data/lib/awspec/command/generate.rb

@@ -0,0 +1,32 @@
+require 'thor'
+require 'awspec/setup'
+
+module Awspec
+  class Generate < Thor
+    types = %w(
+      vpc ec2 rds security_group
+    )
+
+    types.each do |type|
+      desc type + ' [vpc_id]', 'Generate VPC spec from VPC ID (or VPC "Name" tag)'
+      define_method type do |*args|
+        load_secrets
+        vpc_id = args.first
+        eval "puts Awspec::Generator::Spec::#{type.to_camel_case}.new.generate_from_vpc(vpc_id)"
+      end
+    end
+
+    no_commands do
+      def load_secrets
+        creds = YAML.load_file('spec/secrets.yml') if File.exist?('spec/secrets.yml')
+        creds = YAML.load_file('secrets.yml') if File.exist?('secrets.yml')
+        Aws.config.update({
+                            region: creds['region'],
+                            credentials: Aws::Credentials.new(
+                              creds['aws_access_key_id'],
+                              creds['aws_secret_access_key'])
+                          }) if creds
+      end
+    end
+  end
+end

data/lib/awspec/ext.rb

@@ -0,0 +1,2 @@
+require 'awspec/ext/string'
+require 'awspec/ext/struct'

data/lib/awspec/ext/struct.rb

@@ -0,0 +1,8 @@
+class Struct
+  def tag_name
+    tag = self[:tags].find do |t|
+      t[:key] == 'Name'
+    end
+    tag[:value] if tag
+  end
+end

data/lib/awspec/generator.rb

@@ -0,0 +1,4 @@
+require 'awspec/generator/spec/ec2'
+require 'awspec/generator/spec/rds'
+require 'awspec/generator/spec/vpc'
+require 'awspec/generator/spec/security_group'

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

@@ -0,0 +1,63 @@
+module Awspec::Generator
+  module Spec
+    class Ec2
+      include Awspec::Helper::Finder
+      def generate_from_vpc(vpc_id)
+        describes = %w(
+          instance_id image_id private_dns_name public_dns_name
+          instance_type private_ip_address public_ip_address
+        )
+        vpc = find_vpc(vpc_id)
+        fail 'Not Found VPC' unless vpc
+        @vpc_id = vpc[:vpc_id]
+        @vpc_tag_name = vpc.tag_name
+        instances = select_ec2_by_vpc_id(@vpc_id)
+        specs = instances.map do |instance|
+          instance_id = instance[:instance_id]
+          instance_tag_name = instance.tag_name
+          subnet = find_subnet(instance.subnet_id)
+          subnet_tag_name = subnet.tag_name
+          eips = select_eip_by_instance_id(instance_id)
+          content = ERB.new(ec2_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      # rubocop:disable all
+      def ec2_spec_template
+        template = <<-'EOF'
+<%- if instance_tag_name -%>
+describe ec2('<%= instance_tag_name %>') do
+<%- else -%>
+describe ec2('<%= instance_id %>') do
+<%- end -%>
+  it { should exist }
+  it { should be_<%= instance.state.name %> }
+<% describes.each do |describe| %>
+<%- if instance.key?(describe) -%>
+<%- if instance[describe].is_a?(TrueClass) || instance[describe].is_a?(FalseClass) -%>
+  its(:<%= describe %>) { should eq <%= instance[describe] %> }
+<%- else -%>
+  its(:<%= describe %>) { should eq '<%= instance[describe] %>' }
+<%- end -%>
+<%- end -%>
+<% end %>
+<% instance.security_groups.each do |sg| %>
+  it { should have_security_group('<%= sg.group_name %>') }
+<% end %>
+<%- if @vpc_tag_name -%>
+  it { should belong_to_vpc('<%= @vpc_tag_name %>') }
+<%- else -%>
+  it { should belong_to_vpc('<%= @vpc_id %>') }
+<%- end -%>
+  it { should belong_to_subnet('<%= subnet_tag_name %>') }
+<% eips.each do |eip| %>
+  it { should have_eip('<%= eip.public_ip %>') }
+<% end %>
+end
+EOF
+        template
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+module Awspec::Generator
+  module Spec
+    class Rds
+      include Awspec::Helper::Finder
+      def generate_from_vpc(vpc_id)
+        describes = %w(
+          db_instance_identifier db_instance_class multi_az availability_zone
+        )
+        vpc = find_vpc(vpc_id)
+        fail 'Not Found VPC' unless vpc
+        @vpc_id = vpc[:vpc_id]
+        @vpc_tag_name = vpc.tag_name
+        db_instances = select_rds_by_vpc_id(@vpc_id)
+        specs = db_instances.map do |db_instance|
+          instance_id = db_instance[:db_instance_identifier]
+          sg_group_names = db_instance[:vpc_security_groups].map do |sg|
+            sg_id = sg.vpc_security_group_id
+            ret = find_security_group(sg_id)
+            ret[:group_name]
+          end
+          content = ERB.new(rds_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      # rubocop:disable all
+      def rds_spec_template
+        template = <<-'EOF'
+describe rds('<%= instance_id %>') do
+  it { should exist }
+  it { should be_<%= db_instance.db_instance_status %> }
+<% describes.each do |describe| %>
+<%- if db_instance.key?(describe) -%>
+<%- if db_instance[describe].is_a?(TrueClass) || db_instance[describe].is_a?(FalseClass) -%>
+  its(:<%= describe %>) { should eq <%= db_instance[describe] %> }
+<%- else -%>
+  its(:<%= describe %>) { should eq '<%= db_instance[describe] %>' }
+<%- end -%>
+<%- end -%>
+<% end %>
+<% sg_group_names.each do |sg_group_name| %>
+  it { should have_security_group('<%= sg_group_name %>') }
+<% end %>
+<%- if @vpc_tag_name -%>
+  it { should belong_to_vpc('<%= @vpc_tag_name %>') }
+<%- else -%>
+  it { should belong_to_vpc('<%= @vpc_id %>') }
+<%- end -%>
+  it { should belong_to_db_subnet_group('<%= db_instance.db_subnet_group.db_subnet_group_name %>') }
+<% db_instance.db_parameter_groups.each do |pg| %>
+  it { should have_db_parameter_group('<%= pg.db_parameter_group_name %>') }
+<% end %>
+<% db_instance.option_group_memberships.each do |og| %>
+  it { should have_option_group('<%= og.option_group_name %>') }
+<% end %>
+end
+EOF
+        template
+      end
+    end
+  end
+end

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

@@ -0,0 +1,78 @@
+module Awspec::Generator
+  module Spec
+    class SecurityGroup
+      include Awspec::Helper::Finder
+      def generate_from_vpc(vpc_id)
+        describes = %w(
+          group_id
+        )
+        vpc = find_vpc(vpc_id)
+        fail 'Not Found VPC' unless vpc
+        @vpc_id = vpc[:vpc_id]
+        @vpc_tag_name = vpc.tag_name
+        sgs = select_security_group_by_vpc_id(@vpc_id)
+
+        specs = sgs.map do |sg|
+          linespecs = generate_linespecs(sg)
+          content = ERB.new(security_group_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      def generate_linespecs(sg)
+        linespecs = []
+        permissions = { 'inbound' => sg.ip_permissions, 'outbound' => sg.ip_permissions_egress }
+        %w(inbound outbound).each do |inout|
+          permissions[inout].each do |permission|
+            if permission.ip_protocol.to_i < 0 || permission.from_port.nil?
+              linespecs.push('its(:' + inout + ') { should be_opened }')
+              next
+            end
+            port = permission.from_port
+            protocol = permission.ip_protocol
+            permission.ip_ranges.each do |ip_range|
+              target = ip_range.cidr_ip
+              linespecs.push(ERB.new(security_group_spec_linetemplate, nil, '-').result(binding))
+            end
+            permission.user_id_group_pairs.each do |group|
+              target = group.group_name
+              linespecs.push(ERB.new(security_group_spec_linetemplate, nil, '-').result(binding))
+            end
+          end
+        end
+        linespecs
+      end
+
+      def security_group_spec_linetemplate
+        template = <<-'EOF'
+its(:<%= inout %>) { should be_opened(<%= port %>).protocol('<%= protocol %>').for('<%= target %>') }
+EOF
+        template
+      end
+
+      def security_group_spec_template
+        template = <<-'EOF'
+describe security_group('<%= sg.group_name %>') do
+  it { should exist }
+<% describes.each do |describe| %>
+<%- if sg.key?(describe) -%>
+  its(:<%= describe %>) { should eq '<%= sg[describe] %>' }
+<%- end -%>
+<% end %>
+<% linespecs.each do |line| %>
+  <%= line %>
+<% end %>
+  its(:outbound_permissions_count) { should eq <%= sg.ip_permissions.count %> }
+  its(:inbound_permissions_count) { should eq <%= sg.ip_permissions_egress.count %> }
+<%- if @vpc_tag_name -%>
+  it { should belong_to_vpc('<%= @vpc_tag_name %>') }
+<%- else -%>
+  it { should belong_to_vpc('<%= @vpc_id %>') }
+<%- end -%>
+end
+EOF
+        template
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+module Awspec::Generator
+  module Spec
+    class Vpc
+      include Awspec::Helper::Finder
+      def generate_from_vpc(vpc_id)
+        describes = %w(
+          vpc_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
+        route_tables = select_route_table_by_vpc_id(@vpc_id)
+        network_acls = select_network_acl_by_vpc_id(@vpc_id)
+        spec = ERB.new(vpc_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+      end
+
+      # rubocop:disable all
+      def vpc_spec_template
+        template = <<-'EOF'
+<%- if @vpc_tag_name -%>
+describe vpc('<%= @vpc_tag_name %>') do
+<%- else -%>
+describe vpc('<%= @vpc_id %>') do
+<%- end -%>
+  it { should exist }
+  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 -%>
+  its(:<%= describe %>) { should eq '<%= vpc[describe] %>' }
+<%- end -%>
+<%- end -%>
+<% end %>
+<% route_tables.each do |route_table| %>
+<%- if route_table.tag_name -%>
+  it { should have_route_table('<%= route_table.tag_name %>') }
+<%- else -%>
+  it { should have_route_table('<%= route_table.route_table_id %>') }
+<%- end -%>
+<% end %>
+<% network_acls.each do |network_acl| %>
+<%- if network_acl.tag_name -%>
+  it { should have_network_acl('<%= network_acl.tag_name %>') }
+<%- else -%>
+  it { should have_network_acl('<%= network_acl.network_acl_id %>') }
+<%- end -%>
+<% end %>
+end
+EOF
+        template
+      end
+    end
+  end
+end

data/lib/awspec/helper.rb

@@ -1,4 +1,5 @@
 require 'awspec/helper/type'
+require 'awspec/helper/finder'
 extend Awspec::Helper::Type
 class RSpec::Core::ExampleGroup
   extend Awspec::Helper::Type

data/lib/awspec/helper/finder.rb

@@ -0,0 +1,27 @@
+require 'aws-sdk'
+require 'awspec/helper/finder/vpc'
+require 'awspec/helper/finder/ec2'
+require 'awspec/helper/finder/security_group'
+require 'awspec/helper/finder/rds'
+require 'awspec/helper/finder/route53'
+require 'awspec/helper/finder/s3'
+
+module Awspec::Helper
+  module Finder
+    attr_reader :ec2_client
+    include Awspec::Helper::Finder::Vpc
+    include Awspec::Helper::Finder::Ec2
+    include Awspec::Helper::Finder::SecurityGroup
+    include Awspec::Helper::Finder::Rds
+    include Awspec::Helper::Finder::Route53
+    include Awspec::Helper::Finder::S3
+
+    # rubocop:disable all
+    def initialize(id = nil)
+      @ec2_client = Aws::EC2::Client.new
+      @rds_client = Aws::RDS::Client.new
+      @route53_client = Aws::Route53::Client.new
+      @s3_client = Aws::S3::Client.new
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+module Awspec::Helper
+  module Finder
+    module Ec2
+      def find_ec2(id)
+        if id.is_a?(Array)
+          # Aws::EC2::Client.describe_instances native filters format
+          res = @ec2_client.describe_instances({
+                                                 filters: id
+                                               })
+        elsif id.is_a?(Hash)
+          # syntax sugar
+          filters = []
+          id.each do |k, v|
+            filters.push({ name: k, values: Array(v) })
+          end
+          res = @ec2_client.describe_instances({
+                                                 filters: filters
+                                               })
+        else
+          # instance_id or tag:Name
+          begin
+            res = @ec2_client.describe_instances({
+                                                   instance_ids: [id]
+                                                 })
+          rescue
+            # Aws::EC2::Errors::InvalidInstanceIDMalformed
+            # Aws::EC2::Errors::InvalidInstanceIDNotFound
+            res = @ec2_client.describe_instances({
+                                                   filters: [{ name: 'tag:Name', values: [id] }]
+                                                 })
+          end
+        end
+        return res[:reservations][0][:instances][0] if res[:reservations].count == 1 && \
+                                                       res[:reservations][0][:instances].count == 1
+      end
+
+      def find_subnet(subnet_id)
+        res = @ec2_client.describe_subnets({
+                                             filters: [{ name: 'subnet-id', values: [subnet_id] }]
+                                           })
+        return res[:subnets][0] if res[:subnets].count == 1
+        res = @ec2_client.describe_subnets({
+                                             filters: [{ name: 'tag:Name', values: [subnet_id] }]
+                                           })
+        return res[:subnets][0] if res[:subnets].count == 1
+      end
+
+      def find_security_group(sg_id)
+        res = @ec2_client.describe_security_groups({
+                                                     filters: [{ name: 'group-id', values: [sg_id] }]
+                                                   })
+        return res[:security_groups][0] if res[:security_groups].count == 1
+        res = @ec2_client.describe_security_groups({
+                                                     filters: [{ name: 'group-name', values: [sg_id] }]
+                                                   })
+        return res[:security_groups][0] if res[:security_groups].count == 1
+        res = @ec2_client.describe_security_groups({
+                                                     filters: [{ name: 'tag:Name', values: [sg_id] }]
+                                                   })
+        return res[:security_groups][0] if res[:security_groups].count == 1
+      end
+
+      def select_ec2_by_vpc_id(vpc_id)
+        res = @ec2_client.describe_instances({
+                                               filters: [{ name: 'vpc-id', values: [vpc_id] }]
+                                             })
+        instances = []
+        return instances unless res[:reservations].count > 0
+        res[:reservations].each do |reservation|
+          reservation.instances.each do |instance|
+            instances.push(instance)
+          end
+        end
+        instances
+      end
+
+      def select_eip_by_instance_id(id)
+        res = @ec2_client.describe_addresses({
+                                               filters: [{ name: 'instance-id', values: [id] }]
+                                             })
+        return [] unless res[:addresses].count > 0
+        res[:addresses]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Awspec::Helper
+  module Finder
+    module Rds
+      def find_rds(id)
+        # db_instance_identifier
+        res = @rds_client.describe_db_instances({
+                                                  db_instance_identifier: id
+                                                })
+        return res[:db_instances][0] if res[:db_instances].count == 1
+      end
+
+      def select_rds_by_vpc_id(vpc_id)
+        res = @rds_client.describe_db_instances
+        db_instances = res[:db_instances].select do |db_instance|
+          db_instance.db_subnet_group.vpc_id == vpc_id
+        end
+        db_instances
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Awspec::Helper
+  module Finder
+    module Route53
+      def find_hosted_zone(id)
+        hosted_zones = {}
+        marker = nil
+        loop do
+          res = @route53_client.list_hosted_zones({
+                                                    marker: marker
+                                                  })
+          marker = res.marker
+          break if res.hosted_zones.empty?
+          res.hosted_zones.each do |hosted_zone|
+            hosted_zones[hosted_zone[:name]] = hosted_zones
+            if hosted_zone[:name] == id || hosted_zone[:id] == '/hostedzone/' + id || hosted_zone[:id] == id
+              return hosted_zone
+            end
+          end
+
+          break if marker.nil?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Awspec::Helper
+  module Finder
+    module S3
+      def find_bucket(id)
+        res = @s3_client.list_buckets
+        ret = @s3_client.list_buckets[:buckets].find do |bucket|
+          bucket.name == id
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Awspec::Helper
+  module Finder
+    module SecurityGroup
+      def find_security_group(id)
+        res = @ec2_client.describe_security_groups({
+                                                     filters: [{ name: 'group-id', values: [id] }]
+                                                   })
+
+        return res[:security_groups][0] if res[:security_groups].count == 1
+        res = @ec2_client.describe_security_groups({
+                                                     filters: [{ name: 'group-name', values: [id] }]
+                                                   })
+
+        return res[:security_groups][0] if res[:security_groups].count == 1
+        res = @ec2_client.describe_security_groups({
+                                                     filters: [{ name: 'tag:Name', values: [id] }]
+                                                   })
+
+        return res[:security_groups][0] if res[:security_groups].count == 1
+      end
+
+      def select_security_group_by_vpc_id(vpc_id)
+        res = @ec2_client.describe_security_groups({
+                                                     filters: [{ name: 'vpc-id', values: [vpc_id] }]
+                                                   })
+        res[:security_groups]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module Awspec::Helper
+  module Finder
+    module Vpc
+      def find_vpc(id)
+        res = @ec2_client.describe_vpcs({
+                                          filters: [{ name: 'vpc-id', values: [id] }]
+                                        })
+        return res[:vpcs][0] if res[:vpcs].count == 1
+        res = @ec2_client.describe_vpcs({
+                                          filters: [{ name: 'tag:Name', values: [id] }]
+                                        })
+        return res[:vpcs][0] if res[:vpcs].count == 1
+      end
+
+      def find_route_table(id)
+        res = @ec2_client.describe_route_tables({
+                                                  filters: [{ name: 'route-table-id', values: [id] }]
+                                                })
+        return res[:route_tables][0] if res[:route_tables].count == 1
+        res = @ec2_client.describe_route_tables({
+                                                  filters: [{ name: 'tag:Name', values: [id] }]
+                                                })
+        return res[:route_tables][0] if res[:route_tables].count == 1
+      end
+
+      def find_network_acl(id)
+        res = @ec2_client.describe_network_acls({
+                                                  filters: [{ name: 'network-acl-id', values: [id] }]
+                                                })
+        return res[:network_acls][0] if res[:network_acls].count == 1
+        res = @ec2_client.describe_network_acls({
+                                                  filters: [{ name: 'tag:Name', values: [id] }]
+                                                })
+        return res[:network_acls][0] if res[:network_acls].count == 1
+      end
+
+      def select_route_table_by_vpc_id(vpc_id)
+        res = @ec2_client.describe_route_tables({
+                                                  filters: [{ name: 'vpc-id', values: [vpc_id] }]
+                                                })
+        res[:route_tables]
+      end
+
+      def select_network_acl_by_vpc_id(vpc_id)
+        res = @ec2_client.describe_network_acls({
+                                                  filters: [{ name: 'vpc-id', values: [vpc_id] }]
+                                                })
+        res[:network_acls]
+      end
+    end
+  end
+end

data/lib/awspec/matcher/belong_to_subnet.rb

@@ -3,18 +3,16 @@ RSpec::Matchers.define :belong_to_subnet do |subnet_id|
     # EC2
     if resource.instance_of?(Awspec::Type::Ec2)
       return true if resource.subnet_id == subnet_id
-      ret = resource.client.describe_subnets({
-                                               filters: [{ name: 'tag:Name', values: [subnet_id] }]
-                                             })
-      return false unless ret
-      return ret[:subnets][0][:subnet_id] == resource.subnet_id
+      subnet = resource.find_subnet(subnet_id)
+      return false unless subnet
+      return subnet[:subnet_id] == resource.subnet_id
     end
 
     # RDS
     if resource.instance_of?(Awspec::Type::Rds)
       subnets = resource.instance[:db_subnet_group][:subnets]
-      ret = subnets.find do |subnet|
-        subnet[:subnet_identifier] == subnet_id
+      ret = subnets.find do |s|
+        s[:subnet_identifier] == subnet_id
       end
 
       return ret[:subnet_availability_zone][:name] == resource.availability_zone if ret
@@ -23,8 +21,8 @@ RSpec::Matchers.define :belong_to_subnet do |subnet_id|
                                                    filters: [{ name: 'tag:Name', values: [subnet_id] }]
                                                  })
       return false unless res
-      ret = subnets.find do |subnet|
-        subnet[:subnet_identifier] == res[:subnets][0][:subnet_id]
+      ret = subnets.find do |s|
+        s[:subnet_identifier] == res[:subnets][0][:subnet_id]
       end
 
       return ret[:subnet_availability_zone][:name] == resource.availability_zone if ret

data/lib/awspec/setup.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'yaml'
 
 module Awspec
   class Setup

data/lib/awspec/type/base.rb

@@ -1,101 +1,18 @@
 require 'aws-sdk'
+require 'awspec/helper/finder'
 
 module Awspec::Type
   class Base
-    attr_reader :id, :ec2_client
+    include Awspec::Helper::Finder
+    attr_reader :id
 
-    # rubocop:disable all
     def initialize(id = nil)
+      super
       @id = nil
-      @ec2_client = Aws::EC2::Client.new
     end
-    # rubocop:enable all
 
     def exists?
       @id
     end
-
-    def find_vpc(id)
-      res = @ec2_client.describe_vpcs({
-                                        filters: [{ name: 'vpc-id', values: [id] }]
-                                      })
-      return res[:vpcs][0] if res[:vpcs].count == 1
-      res = @ec2_client.describe_vpcs({
-                                        filters: [{ name: 'tag:Name', values: [id] }]
-                                      })
-      return res[:vpcs][0] if res[:vpcs].count == 1
-    end
-
-    def find_route_table(id)
-      res = @ec2_client.describe_route_tables({
-                                                filters: [{ name: 'route-table-id', values: [id] }]
-                                              })
-      return res[:route_tables][0] if res[:route_tables].count == 1
-      res = @ec2_client.describe_route_tables({
-                                                filters: [{ name: 'tag:Name', values: [id] }]
-                                              })
-      return res[:route_tables][0] if res[:route_tables].count == 1
-    end
-
-    def find_network_acl(id)
-      res = @ec2_client.describe_network_acls({
-                                                filters: [{ name: 'network-acl-id', values: [id] }]
-                                              })
-      return res[:network_acls][0] if res[:network_acls].count == 1
-      res = @ec2_client.describe_network_acls({
-                                                filters: [{ name: 'tag:Name', values: [id] }]
-                                              })
-      return res[:network_acls][0] if res[:network_acls].count == 1
-    end
-
-    def find_security_group(id)
-      res = @ec2_client.describe_security_groups({
-                                                   filters: [{ name: 'group-id', values: [id] }]
-                                                 })
-
-      return res[:security_groups][0] if res[:security_groups].count == 1
-      res = @ec2_client.describe_security_groups({
-                                                   filters: [{ name: 'group-name', values: [id] }]
-                                                 })
-
-      return res[:security_groups][0] if res[:security_groups].count == 1
-      res = @ec2_client.describe_security_groups({
-                                                   filters: [{ name: 'tag:Name', values: [id] }]
-                                                 })
-
-      return res[:security_groups][0] if res[:security_groups].count == 1
-    end
-
-    def find_ec2(id)
-      if id.is_a?(Array)
-        # Aws::EC2::Client.describe_instances native filters format
-        res = @client.describe_instances({
-                                           filters: id
-                                         })
-      elsif id.is_a?(Hash)
-        # syntax sugar
-        filters = []
-        id.each do |k, v|
-          filters.push({ name: k, values: Array(v) })
-        end
-        res = @client.describe_instances({
-                                           filters: filters
-                                         })
-      else
-        # instance_id or tag:Name
-        begin
-          res = @client.describe_instances({
-                                             instance_ids: [id]
-                                           })
-        rescue
-          # Aws::EC2::Errors::InvalidInstanceIDMalformed
-          # Aws::EC2::Errors::InvalidInstanceIDNotFound
-          res = @client.describe_instances({
-                                             filters: [{ name: 'tag:Name', values: [id] }]
-                                           })
-        end
-      end
-      return res[:reservations][0][:instances][0] if res[:reservations][0][:instances].count == 1
-    end
   end
 end

data/lib/awspec/type/ec2.rb

@@ -34,8 +34,9 @@ module Awspec::Type
         filters: [{ name: 'instance-id', values: [@id] }]
       }
       option[:public_ips] = [ip_address] if ip_address
-      ret = @client.describe_addresses(option)
-      ret[:addresses].count == 1
+      ret = @ec2_client.describe_addresses(option)
+      return ret[:addresses].count == 1 if ip_address
+      return ret[:addresses].count > 0 unless ip_address
     end
 
     def has_security_group?(sg_id)

data/lib/awspec/type/rds.rb

@@ -4,12 +4,7 @@ module Awspec::Type
 
     def initialize(id)
       super
-      @client = Aws::RDS::Client.new
-      # db_instance_identifier
-      res = @client.describe_db_instances({
-                                            db_instance_identifier: id
-                                          })
-      @instance = res[:db_instances][0] if res[:db_instances].count == 1
+      @instance = find_rds(id)
       @id = @instance[:db_instance_identifier] if @instance
     end
 

data/lib/awspec/type/rds_db_parameter_group.rb

@@ -4,12 +4,11 @@ module Awspec::Type
 
     def initialize(name)
       super
-      @client = Aws::RDS::Client.new
       @parameters = {}
 
       marker = nil
       while @parameters.empty? || !marker.nil?
-        res = @client.describe_db_parameters(
+        res = @rds_client.describe_db_parameters(
           db_parameter_group_name: name,
           marker: marker)
         marker = res.marker

data/lib/awspec/type/route53_hosted_zone.rb

@@ -4,13 +4,12 @@ module Awspec::Type
 
     def initialize(id)
       super
-      @client = Aws::Route53::Client.new
       @hosted_zone = find_hosted_zone(id)
       @id = @hosted_zone[:id] if @hosted_zone
       return unless @id
-      res = @client.list_resource_record_sets({
-                                                hosted_zone_id: @id
-                                              })
+      res = @route53_client.list_resource_record_sets({
+                                                        hosted_zone_id: @id
+                                                      })
       @resource_record_sets = res.resource_record_sets
     end
 
@@ -32,26 +31,6 @@ module Awspec::Type
       end
     end
 
-    def find_hosted_zone(id)
-      hosted_zones = {}
-      marker = nil
-      loop do
-        res = @client.list_hosted_zones({
-                                          marker: marker
-                                        })
-        marker = res.marker
-        break if res.hosted_zones.empty?
-        res.hosted_zones.each do |hosted_zone|
-          hosted_zones[hosted_zone[:name]] = hosted_zones
-          if hosted_zone[:name] == id || hosted_zone[:id] == '/hostedzone/' + id || hosted_zone[:id] == id
-            return hosted_zone
-          end
-        end
-
-        break if marker.nil?
-      end
-    end
-
     def method_missing(name)
       describe = name.to_s
       if @hosted_zone.key?(describe)

data/lib/awspec/type/s3.rb

@@ -1,26 +1,21 @@
 module Awspec::Type
   class S3 < Base
-    attr_reader :client, :bucket
+    attr_reader :s3_client, :bucket
 
     def initialize(id)
       super
-      @client = Aws::S3::Client.new
-      res = @client.list_buckets
-      ret = @client.list_buckets[:buckets].find do |bucket|
-        bucket.name == id
-      end
-      @id = id if ret
-      @bucket = ret
+      @bucket = find_bucket(id)
+      @id = id if @bucket
     end
 
     def has_object?(key)
-      res = @client.head_object({
-                                  bucket: @id,
-                                  key: key.sub(%r(\A/), '')
-                                })
+      res = @s3_client.head_object({
+                                     bucket: @id,
+                                     key: key.sub(%r(\A/), '')
+                                   })
       res
-      rescue
-        false
+    rescue
+      false
     end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -127,8 +127,23 @@ files:
 - bin/awspec
 - lib/awspec.rb
 - lib/awspec/cli.rb
+- lib/awspec/command/generate.rb
+- lib/awspec/ext.rb
 - lib/awspec/ext/string.rb
+- lib/awspec/ext/struct.rb
+- lib/awspec/generator.rb
+- lib/awspec/generator/spec/ec2.rb
+- lib/awspec/generator/spec/rds.rb
+- lib/awspec/generator/spec/security_group.rb
+- lib/awspec/generator/spec/vpc.rb
 - lib/awspec/helper.rb
+- lib/awspec/helper/finder.rb
+- lib/awspec/helper/finder/ec2.rb
+- lib/awspec/helper/finder/rds.rb
+- lib/awspec/helper/finder/route53.rb
+- lib/awspec/helper/finder/s3.rb
+- lib/awspec/helper/finder/security_group.rb
+- lib/awspec/helper/finder/vpc.rb
 - lib/awspec/helper/type.rb
 - lib/awspec/matcher.rb
 - lib/awspec/matcher/be_opened.rb