kelbim 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eedb5e0c3b9983991baaaacd8233fe41d9ed137
-  data.tar.gz: 73b2b07df5e2219bfaaf81c9d0d39b9b56d363eb
+  metadata.gz: 3a3aa9626f47a857cfeb39f3f20b5154099016a6
+  data.tar.gz: 85e9bcd93725b03f76e569c25f7beb56391d2f66
 SHA512:
-  metadata.gz: 6aa83ac6a4a98111e0f3816c15d200236256bbe6cff68c24087be96c11b27da1952e1b7f7e9dd66ecc91f2a73b3c4e43430c59ac1b87927cb87bcf5705f59f07
-  data.tar.gz: 430af7b5270717adddd3cd7452f15e392cb118c845b5db5930a9097c458740233d1d14583ba88affbd4d655562c1d01977b03d307fb003c3eb559b0e081ae160
+  metadata.gz: 7d17e5a9853ba64b82c8d8ef70032bb465ea9a1369743d921144d80f176a6e5574eb991a7ff140f1f7aac113a7ad49cf54b36f74da8e23b35555a04f6a4c8d73
+  data.tar.gz: 0097ad300a14b1c36d3524f0d7b9dd4305400e163e7eb86139c9f3aa93665643ae19dc4c658ea0c6c04b1de12548e46af1efd2ba0a0e5c5dcb8e6eac02be2626

data/README.md

@@ -4,7 +4,7 @@ Kelbim is a tool to manage ELB.
 
 It defines the state of ELB using DSL, and updates ELB according to DSL.
 
-**Attention! This is the alpha version!**
+**Attention! This is a alpha version!**
 
 ## Installation
 
@@ -100,5 +100,32 @@ ec2 "vpc-XXXXXXXXX" do
 end
 ```
 
+## Test
+
+```ruby
+ec2 "vpc-XXXXXXXXX" do
+  load_balancer "my-load-balancer" do
+    test do
+      host = "my-load-balancer-XXXXXXXXXX.ap-northeast-1.elb.amazonaws.com"
+
+      expect {
+        timeout(3) do
+          socket = TCPSocket.open(host, 8080)
+          socket.close if socket
+        end
+      }.not_to raise_error
+    end
+    ...
+```
+
+```sh
+shell> kelbim -t
+Test `ELBfile`
+...
+
+Finished in 3.16 seconds
+3 examples, 0 failures
+```
+
 ## Link
 * [RubyGems.org site](http://rubygems.org/gems/kelbim)

data/bin/kelbim

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 $: << File.expand_path("#{File.dirname __FILE__}/../lib")
 require 'rubygems'
+require 'json'
 require 'kelbim'
 require 'optparse'
+require 'rspec'
 
 DEFAULT_FILENAME = 'ELBfile'
 
@@ -23,18 +25,21 @@ ARGV.options do |opt|
     secret_key = nil
     region = nil
 
-    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key                   = v       }
-    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key                   = v       }
-    opt.on('-r', '--region REGION')         {|v| region                       = v       }
-    opt.on('-a', '--apply')                 {|v| mode                         = :apply  }
-    opt.on('-f', '--file FILE')             {|v| file                         = v       }
-    opt.on('',   '--dry-run')               {|v| options[:dry_run]            = true    }
-    opt.on('-e', '--export')                {|v| mode                         = :export }
-    opt.on('-o', '--output FILE')           {|v| output_file                  = v       }
-    opt.on('',   '--split')                 {|v| split                        = true    }
-    opt.on('-t', '--test')                  {|v| mode                         = :test   }
-    opt.on(''  , '--no-color')              {    options[:color]              = false   }
-    opt.on(''  , '--debug')                 {    options[:debug]              = true    }
+    opt.on('-k', '--access-key ACCESS_KEY')   {|v| access_key                        = v                    }
+    opt.on('-s', '--secret-key SECRET_KEY')   {|v| secret_key                        = v                    }
+    opt.on('-r', '--region REGION')           {|v| region                            = v                    }
+    opt.on('-a', '--apply')                   {|v| mode                              = :apply               }
+    opt.on('-f', '--file FILE')               {|v| file                              = v                    }
+    opt.on('',   '--dry-run')                 {|v| options[:dry_run]                 = true                 }
+    opt.on('',   '--without-deleting-policy') {|v| options[:without_deleting_policy] = true                 }
+    opt.on('-e', '--export')                  {|v| mode                              = :export              }
+    opt.on('-o', '--output FILE')             {|v| output_file                       = v                    }
+    opt.on('',   '--split')                   {|v| split                             = true                 }
+    opt.on('-t', '--test')                    {|v| mode                              = :test                }
+    opt.on('',   '--show-load-balancers')     {|v| mode                              = :show_load_balancers }
+    opt.on('',   '--show-policies')           {|v| mode                              = :show_policies       }
+    opt.on(''  , '--no-color')                {    options[:color]                   = false                }
+    opt.on(''  , '--debug')                   {    options[:debug]                   = true                 }
     opt.parse!
 
     if access_key and secret_key
@@ -123,8 +128,12 @@ begin
     end
 
     logger.info("Test `#{file}`")
-    # XXX:
+    RSpec.configuration.color_enabled = options[:color]
     client.test(file)
+  when :show_load_balancers
+    puts JSON.pretty_generate(client.load_balancers)
+  when :show_policies
+    puts JSON.pretty_generate(client.policies)
   else
     raise 'must not happen'
   end

data/lib/kelbim/client.rb

@@ -4,6 +4,7 @@ require 'kelbim/exporter'
 require 'kelbim/ext/ec2-ext'
 require 'kelbim/ext/elb-load-balancer-ext'
 require 'kelbim/policy-types'
+require 'kelbim/tester'
 require 'kelbim/wrapper/elb-wrapper'
 require 'kelbim/logger'
 
@@ -23,7 +24,54 @@ module Kelbim
     end
 
     def test(file)
-      # XXX:
+      AWS.memoize do
+        dsl = load_file(file)
+        Tester.test(dsl)
+      end
+    end
+
+    def load_balancers
+      exported = nil
+
+      AWS.memoize do
+        exported = Exporter.export(@options.elb)
+      end
+
+      retval = {}
+
+      exported.map do |vpc, lbs|
+        vpc = vpc || 'classic'
+        retval[vpc] = {}
+
+        lbs.map do |name, attrs|
+          retval[vpc][name] = attrs[:dns_name]
+        end
+      end
+
+      return retval
+    end
+
+    def policies
+      exported = nil
+
+      AWS.memoize do
+        exported = Exporter.export(@options.elb)
+      end
+
+      retval = {}
+
+      exported.map do |vpc, lbs|
+        vpc = vpc || 'classic'
+
+        lbs.map do |name, attrs|
+          if attrs[:policies]
+            retval[vpc] ||= {}
+            retval[vpc][name] = attrs[:policies]
+          end
+        end
+      end
+
+      return retval
     end
 
     def export

data/lib/kelbim/dsl/converter.rb

@@ -36,19 +36,16 @@ end
 
       def output_load_balancer(vpc, name, load_balancer)
         name = name.inspect
-        internal = (load_balancer[:scheme] == 'internal') ? ', :internal => true ' : ' '
+        is_internal = (load_balancer[:scheme] == 'internal')
+        internal = is_internal ? ', :internal => true ' : ' '
         instances = output_instances(load_balancer[:instances], vpc).strip
         listeners = output_listeners(load_balancer[:listeners]).strip
         health_check = output_health_check(load_balancer[:health_check]).strip
-        dns_name = load_balancer[:dns_name]
+        testcase = (is_internal and not load_balancer.fetch(:listeners, []).empty?) ? '' : ("\n    " + output_testcase(load_balancer).strip + "\n")
 
         out = <<-EOS
-  load_balancer #{name}#{internal}do
-    #test do
-    #  #host = #{dns_name.inspect}
-    #  #expect(Net::HTTP.start(host, 80).get("/")).to be_a(Net::HTTPOK)
-    #end
-
+  load_balancer #{name}#{internal}do#{
+    testcase}
     #{instances}
 
     #{listeners}
@@ -92,6 +89,34 @@ end
         return out
       end
 
+      def output_testcase(load_balancer)
+        dns_name = load_balancer[:dns_name]
+        ports = load_balancer[:listeners].map {|i| i[:port] }
+
+        out = <<-EOS
+    test do
+      host = #{dns_name.inspect}
+        EOS
+
+        ports.each do |port|
+          out.concat(<<-EOS)
+
+      expect {
+        timeout(3) do
+          socket = TCPSocket.open(host, #{port})
+          socket.close if socket
+        end
+      }.not_to raise_error
+          EOS
+        end
+
+        out.concat(<<-EOS)
+    end
+        EOS
+
+        return out
+      end
+
       def output_instances(instances, vpc)
         if instances.empty?
           instances = '# not registered'

data/lib/kelbim/dsl/ec2.rb

@@ -7,13 +7,13 @@ module Kelbim
     class EC2
       attr_reader :result
 
-      def initialize(vpc, &block)
+      def initialize(vpc, load_balancers, &block)
         @names = []
         @error_identifier = "EC2 `#{vpc || :classic}`"
 
         @result = OpenStruct.new({
           :vpc            => vpc,
-          :load_balancers => [],
+          :load_balancers => load_balancers,
         })
 
         instance_eval(&block)

data/lib/kelbim/dsl/load-balancer.rb

@@ -18,6 +18,7 @@ module Kelbim
             :name      => name,
             :instances => [],
             :internal  => internal,
+            :scheme    => internal ? 'internal' : 'internet-facing',
           })
 
           instance_eval(&block)
@@ -38,7 +39,7 @@ module Kelbim
         end
 
         def test(&block)
-          call_once(:instances)
+          call_once(:test)
           @result.test = block
         end
 

data/lib/kelbim/dsl.rb

@@ -38,7 +38,11 @@ module Kelbim
     end
 
     def ec2(vpc = nil, &block)
-      @result.ec2s[vpc] = EC2.new(vpc, &block).result
+      if (ec2_result = @result.ec2s[vpc])
+        @result.ec2s[vpc] = EC2.new(vpc, ec2_result.load_balancers, &block).result
+      else
+        @result.ec2s[vpc] = EC2.new(vpc, [], &block).result
+      end
     end
   end # DSL
 end # Kelbim

data/lib/kelbim/exporter.rb

@@ -34,6 +34,11 @@ module Kelbim
         :dns_name     => load_balancer.dns_name,
       }
 
+      if load_balancer.policies.first
+        attrs[:policies] = h = {}
+        load_balancer.policies.each {|i| h[i.name] = i.type }
+      end
+
       if load_balancer.vpc_id
         attrs[:subnets] = load_balancer.subnets.map {|i| i.id }
         attrs[:security_groups] = load_balancer.security_groups.map {|i| i.name }

data/lib/kelbim/ext/base_text_formatter-ext.rb

@@ -0,0 +1,25 @@
+require 'rspec'
+require 'rspec/core/formatters/base_text_formatter'
+
+module RSpec
+  module Core
+    module Formatters
+      class BaseTextFormatter < BaseFormatter
+        def dump_failure_info(example)
+          exception = example.execution_result[:exception]
+
+          if exception.message
+            line = exception.message.to_s.split("\n").first
+            output.puts "#{long_padding}#{failure_color(line)}"
+          end
+        end
+
+        def dump_backtrace(example)
+        end
+
+        def dump_commands_to_rerun_failed_examples
+        end
+      end # BaseTextFormatter
+    end # Formatters
+  end # Core
+end # RSpec

data/lib/kelbim/tester.rb

@@ -0,0 +1,36 @@
+require 'rspec'
+require 'net/http'
+require 'socket'
+require 'timeout'
+require 'kelbim/ext/base_text_formatter-ext'
+require 'kelbim/logger'
+
+module Kelbim
+  class Tester
+    class << self
+      def test(dsl)
+        self.new(dsl).test
+      end
+    end # of class methods
+
+    def initialize(dsl)
+      @dsl = dsl
+    end
+
+    def test
+      require 'rspec/autorun'
+
+      @dsl.ec2s.each do |vpc, ec2|
+        vpc ||= 'classic'
+
+        ec2.load_balancers.each do |lb|
+          if lb.test
+            RSpec.describe("#{vpc || :classic} > #{lb.name}") {
+              it(&lb.test)
+            }
+          end
+        end
+      end
+    end
+  end # Tester
+end # Kelbim

data/lib/kelbim/version.rb

@@ -1,3 +1,5 @@
 module Kelbim
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
+
+Version = Kelbim::VERSION

data/lib/kelbim/wrapper/listener-collection.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'kelbim/wrapper/listener'
+require 'kelbim/wrapper/policy-collection'
 require 'kelbim/logger'
 
 module Kelbim
@@ -9,36 +10,25 @@ module Kelbim
         class ListenerCollection
           include Logger::ClientHelper
 
-          def initialize(listeners, load_balancer, options)
-            @listeners = listeners
-            @load_balancer = load_balancer
-            @options = options
-          end
-
-          def each
-            @listeners.each do |lstnr|
-              yield(Listener.new(lstnr, @options))
-            end
-          end
-
-          def create(dsl)
-            log_id = [[dsl.protocol, dsl.port], [dsl.instance_protocol, dsl.instance_port]].map {|i| i.inspect }.join(' => ')
-            log_id = "#{@load_balancer.vpc_id || :classic} > #{@load_balancer.name} > #{log_id}"
-            log(:info, 'Create Listener', :cyan, log_id)
-
-            if @options.dry_run
+          class << self
+            def create_mock_listener(dsl, load_balancer)
               lstnr = OpenStruct.new({
                 :protocol          => dsl.protocol,
                 :port              => dsl.port,
                 :instance_protocol => dsl.instance_protocol,
                 :instance_port     => dsl.instance_port,
-                :policies          => dsl.policies.map {|i| PolicyCollection.create_mock_policy(i) },
+                :policies          => dsl.policies.map {|i| Listener::PolicyCollection.create_mock_policy(i) },
+                :load_balancer     => load_balancer,
               })
 
               if dsl.server_certificate
                 lstnr.server_certificate = OpenStruct.new(:name => dsl.server_certificate)
               end
-            else
+
+              return lstnr
+            end
+
+            def create_listener_options(dsl, iam)
               lstnr_opts = {
                 :protocol          => dsl.protocol,
                 :port              => dsl.port,
@@ -47,7 +37,7 @@ module Kelbim
               }
 
               if (ss_name = dsl.server_certificate)
-                ss = @options.iam.server_certificates[ss_name]
+                ss = iam.server_certificates[ss_name]
 
                 unless ss
                   raise "Can't find ServerCertificate: #{ss_name} in #{load_balancer.vpc_id || :classic} > #{@load_balancer.name}"
@@ -56,6 +46,34 @@ module Kelbim
                 lstnr_opts[:server_certificate] = ss.arn
               end
 
+              return lstnr_opts
+            end
+          end # of class methods
+
+          def initialize(listeners, load_balancer, options)
+            @listeners = listeners
+            @load_balancer = load_balancer
+            @options = options
+          end
+
+          def each
+            @listeners.each do |lstnr|
+              yield(Listener.new(lstnr, @options))
+            end
+          end
+
+          def create(dsl)
+            log_id = [[dsl.protocol, dsl.port], [dsl.instance_protocol, dsl.instance_port]].map {|i| i.inspect }.join(' => ')
+            log_id = "#{@load_balancer.vpc_id || :classic} > #{@load_balancer.name} > #{log_id}"
+            log(:info, 'Create Listener', :cyan, log_id)
+
+            lstnr = nil
+
+            if @options.dry_run
+              lstnr = self.class.create_mock_listener(dsl, @load_balancer)
+            else
+              lstnr_opts = self.class.create_listener_options(dsl, @options.iam)
+
               # lstnr_optsは破壊的に更新される
               lstnr = @listeners.create(lstnr_opts.dup)
               @options.updated = true

data/lib/kelbim/wrapper/listener.rb

@@ -33,7 +33,7 @@ module Kelbim
               log(:info, 'Update Listener', :green, log_id)
 
               compare_server_certificate(dsl) do
-                log(:info, "  set server_certificate=#{dsl.server_certificate}", :green)
+                log(:info, "  set server_certificate=#{dsl.server_certificate ? dsl.server_certificate.name : nil.inspect}", :green)
 
                 unless @options.dry_run
                   ss = @options.iam.server_certificates[dsl.server_certificate]

data/lib/kelbim/wrapper/load-balancer-collection.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'kelbim/wrapper/load-balancer'
+require 'kelbim/wrapper/listener-collection'
 require 'kelbim/logger'
 
 module Kelbim
@@ -29,19 +30,11 @@ module Kelbim
             :name         => dsl.name,
             :vpc_id       => vpc,
             :instances    => dsl.instances,
-            :scheme       => (dsl.internal ? 'internal' : 'internet-facing'),
-            :listeners    => listeners,
+            :scheme       => dsl.scheme,
+            :listeners    => dsl.listeners.map {|i| LoadBalancer::ListenerCollection.create_mock_listener(i, @load_balancer) },
             :health_check => {}, # health_checkはLoadBalancerの処理で更新
           })
 
-          listeners.each do |lstnr|
-            lstnr.load_balancer = lb
-
-            if lstnr.server_certificate
-              lstnr.server_certificate = OpenStruct.new(:name => lstnr.server_certificate)
-            end
-          end
-
           if vpc
             lb.subnets = dsl.subnets.map {|i| OpenStruct.new(:id => i) }
             sg_names = @options.security_group_names[vpc] || {}
@@ -51,30 +44,14 @@ module Kelbim
           end
         else
           opts = {
-            :scheme       => (dsl.internal ? 'internal' : 'internet-facing'),
-            :listeners    => [],
+            :scheme    => dsl.scheme,
+            :listeners => [],
           }
 
           opts[:instances] = dsl.instances unless dsl.instances.empty?
 
           dsl.listeners.each do |lstnr|
-            lstnr_opts = {
-              :port              => lstnr.port,
-              :protocol          => lstnr.protocol,
-              :instance_protocol => lstnr.instance_protocol,
-              :instance_port     => lstnr.instance_port,
-            }
-
-            if (ss_name = lstnr.server_certificate)
-              ss = @options.iam.server_certificates[ss_name]
-
-              unless ss
-                raise "Can't find ServerCertificate: #{ss_name} in #{vpc || :classic} > #{dsl.name}"
-              end
-
-              lstnr_opts[:server_certificate] = ss.arn
-            end
-
+            lstnr_opts = LoadBalancer::ListenerCollection.create_listener_options(lstnr, @options.iam)
             opts[:listeners] << lstnr_opts
           end
 

data/lib/kelbim/wrapper/load-balancer.rb

@@ -23,6 +23,10 @@ module Kelbim
         end
 
         def eql?(dsl)
+          compare_scheme(dsl) do
+            log(:warn, "`scheme`('internet-facing' or 'internal') cannot be updated", :yellow, "#{vpc_id || :classic} > #{name}")
+          end
+
           compare_health_check(dsl) or return false
 
           if self.vpc_id
@@ -65,7 +69,7 @@ module Kelbim
           end
 
           compare_health_check(dsl) do
-              log(:info, '  set health_check=' + dsl.health_check.inspect, :green)
+            log(:info, '  set health_check=' + dsl.health_check.inspect, :green)
 
             unless @options.dry_run
               @load_balancer.configure_health_check(dsl.health_check)
@@ -162,6 +166,12 @@ module Kelbim
         end
 
         private
+        def compare_scheme(dsl)
+          same = (@load_balancer.scheme == dsl.scheme)
+          yield if !same && block_given?
+          return same
+        end
+
         def compare_health_check(dsl)
           same = (@load_balancer.health_check.sort == dsl.health_check.sort)
           yield if !same && block_given?

data/lib/kelbim/wrapper/policy-collection.rb

@@ -21,7 +21,7 @@ module Kelbim
 
                   if PolicyTypes.name?(dsl_name_or_attrs)
                     plcy.name = dsl_name_or_attrs
-                    plcy.type = {'<new policy attribute name>' => ['<new policy attribute value>']}
+                    plcy.attribute = {'<new policy attribute name>' => ['<new policy attribute value>']}
                   else
                     plcy.name = '<new policy name>'
                     plcy.attributes = PolicyTypes.unexpand(dsl_type, dsl_name_or_attrs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - winebarrel
@@ -38,6 +38,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 description: Kelbim is a tool to manage ELB. It defines the state of ELB using DSL,
   and updates ELB according to DSL.
 email:
@@ -87,12 +129,14 @@ files:
 - lib/kelbim/dsl/load-balancer.rb
 - lib/kelbim/dsl.rb
 - lib/kelbim/exporter.rb
+- lib/kelbim/ext/base_text_formatter-ext.rb
 - lib/kelbim/ext/ec2-ext.rb
 - lib/kelbim/ext/elb-listener-ext.rb
 - lib/kelbim/ext/elb-load-balancer-ext.rb
 - lib/kelbim/ext/string-ext.rb
 - lib/kelbim/logger.rb
 - lib/kelbim/policy-types.rb
+- lib/kelbim/tester.rb
 - lib/kelbim/version.rb
 - lib/kelbim/wrapper/elb-wrapper.rb
 - lib/kelbim/wrapper/listener-collection.rb