kelbim 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYxNjc1NDAwN2VmMWRmZDM4Mzg3ZGVjMWQ0NGZhMWIzZGJmMmQ1Nw==
+    NWNlZWFhMDllMjU2ZjBjMGMzNWQ0ZjliMDdlODY1MmVjMDVmY2JhZA==
   data.tar.gz: !binary |-
-    YzNlOTcyZWU3M2QyM2FkMTljZTIxYzRlNjRlOGUzNDZhMWI0MzQ5MQ==
+    YTkzNTdjZjk4NzIzMDg0YTdhMGUzOTVmNjZlYzhlMmM0NDk0ZmM5ZA==
 SHA512:
   metadata.gz: !binary |-
-    NTYwYjY2OWRkNmUwODRkYWU2M2QyZWE2Y2Q5MmI5YzBhNzc3ZGZiOGU4YzUy
-    MzBjYzJhZmRkMjQwY2E0NWIzMTFhZWE0MjIzZTMwYTJlYjBlZjNlYmIzZWJj
-    NDM2NWFkMjIwYTJlOWFiYjJjODg1ZmRhNTQ5MTdiMmFhN2QyOGU=
+    ZGM5MzBhOGQ0ZDFmMjUyOTVkMTBkZjJmMjcwMmY3NTY2MGZiM2IwNGJmZTYx
+    OWMxMjczYjlmNzgwYjI3NWQ2OTY0ZDY3YTk1MDVlMjZlYjVjNGY5N2YzYzFj
+    Mzg5ZDcyOGE1MDk4NzMxNTMwMWRmMmE3ODA3YjQzYWIyZWJiYmU=
   data.tar.gz: !binary |-
-    ZjlhMmE2NTg3N2Q4NmVmODVlM2YwYmYwYWUyNzZhNDQ4NGQ1ODE2MmY5ODJm
-    N2VkYmNiZjIwZDk3Mjk4YWRhZTY1MjJiMmJkMWI2YWVlZmZjMzJiMDE3NWI4
-    MTI3N2M3YTY0MjI0YWI2ZTFkOTVhOTYzMTI5OTgzYzA2YmJhYjg=
+    YzU1M2I2ZDMwYWMyZjExMTViYjliMmIzYWQ2NjUyOWNhYTZkNzg4ZWZlYzRi
+    NTdlZjllYzQ4NzRmMTkxYzg2NTZmMmM1ZWY4ZTIwMDc0ZWY3NjA2ZTA3MTk2
+    MzE4ZjQwNDQxMjMxZTlhMGJlMGZkNzIzN2NiOTI3MDZmZjk5MWU=

data/bin/kelbim

@@ -30,17 +30,19 @@ ARGV.options do |opt|
     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('-a', '--apply')                   {    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('-n', '--elb-names NAMES', Array)  {|v| options[:elb_names]               = v                    }
+    opt.on('',   '--dry-run')                 {    options[:dry_run]                 = true                 }
+    opt.on('',   '--ec2s VPC_IDS', Array)     {|v| options[:ec2s]                    = v                    }
+    opt.on('',   '--without-deleting-policy') {    options[:without_deleting_policy] = true                 }
+    opt.on('-e', '--export')                  {    mode                              = :export              }
     opt.on('-o', '--output FILE')             {|v| output_file                       = v                    }
-    opt.on('',   '--split')                   {|v| split                             = true                 }
-    opt.on('',   '--split-more')              {|v| split                             = :more                }
-    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('',   '--split')                   {    split                             = true                 }
+    opt.on('',   '--split-more')              {    split                             = :more                }
+    opt.on('-t', '--test')                    {    mode                              = :test                }
+    opt.on('',   '--show-load-balancers')     {    mode                              = :show_load_balancers }
+    opt.on('',   '--show-policies')           {    mode                              = :show_policies       }
     opt.on(''  , '--no-color')                {    options[:color]                   = false                }
     opt.on(''  , '--debug')                   {    options[:debug]                   = true                 }
     opt.parse!

data/lib/kelbim/client.rb

@@ -120,6 +120,10 @@ module Kelbim
       vpc_ids = @options.ec2.vpcs.map {|i| i.id }
 
       dsl_ec2s.each do |vpc, ec2_dsl|
+        if @options.ec2s
+          next unless @options.ec2s.include?(vpc || 'classic')
+        end
+
         if vpc and not vpc_ids.include?(vpc)
           log(:warn, "EC2 `#{vpc}` is not found", :yellow)
           next
@@ -143,6 +147,11 @@ module Kelbim
 
       lb_list_dsl.each do |key, lb_dsl|
         name = key[0]
+
+        if @options.elb_names
+          next unless @options.elb_names.include?(name)
+        end
+
         lb_aws = lb_list_aws[key]
 
         unless lb_aws
@@ -153,6 +162,11 @@ module Kelbim
 
       lb_list_dsl.each do |key, lb_dsl|
         name = key[0]
+
+        if @options.elb_names
+          next unless @options.elb_names.include?(name)
+        end
+
         log(:info, "Comparing #{vpc || :classic} > #{name}", :intense_black)
 
         lb_aws = lb_list_aws.delete(key)
@@ -160,6 +174,12 @@ module Kelbim
       end
 
       lb_list_aws.each do |key, lb_aws|
+        name = key[0]
+
+        if @options.elb_names
+          next unless @options.elb_names.include?(name)
+        end
+
         lb_aws.delete
       end
     end

data/lib/kelbim/version.rb

@@ -1,5 +1,5 @@
 module Kelbim
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 
 Version = Kelbim::VERSION

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

@@ -17,7 +17,7 @@ module Kelbim
                 :port              => dsl.port,
                 :instance_protocol => dsl.instance_protocol,
                 :instance_port     => dsl.instance_port,
-                :policies          => dsl.policies.map {|i| Listener::PolicyCollection.create_mock_policy(i) },
+                :policies          => [], # Listener作成時に同時にPolicyを作成することはできない
                 :load_balancer     => load_balancer,
               })
 

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

@@ -31,10 +31,13 @@ module Kelbim
             :vpc_id       => vpc,
             :instances    => [], # instancesはLoadBalancerの処理で更新
             :scheme       => dsl.scheme,
-            :listeners    => dsl.listeners.map {|i| LoadBalancer::ListenerCollection.create_mock_listener(i, @load_balancer) },
             :health_check => {}, # health_checkはLoadBalancerの処理で更新
           })
 
+          lb.listeners = dsl.listeners.map do |lstnr|
+            LoadBalancer::ListenerCollection.create_mock_listener(lstnr, lb)
+          end
+
           if vpc
             lb.subnets = dsl.subnets.map {|i| OpenStruct.new(:id => i) }
             sg_names = @options.security_group_names[vpc] || {}

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

@@ -14,7 +14,7 @@ module Kelbim
               include Logger::ClientHelper
 
               class << self
-                def create_mock_policy(dsl)
+                def create_mock_policy(dsl, listener)
                   dsl_type, dsl_name_or_attrs = dsl
                   policy_type = PolicyTypes.symbol_to_string(dsl_type)
                   plcy = OpenStruct.new(:type => policy_type)
@@ -23,12 +23,25 @@ module Kelbim
                     plcy.name = dsl_name_or_attrs
                     plcy.attribute = {'<new policy attribute name>' => ['<new policy attribute value>']}
                   else
-                    plcy.name = '<new policy name>'
+                    plcy.name = create_policy_name(listener, policy_type).sub(/\w+-\w+-\w+-\w+-\w+\Z/, '...')
                     plcy.attributes = PolicyTypes.unexpand(dsl_type, dsl_name_or_attrs)
                   end
 
                   return plcy
                 end
+
+                def create_policy_name(listener, policy_type)
+                  [
+                    listener.load_balancer.vpc_id || :classic,
+                    listener.load_balancer.name,
+                    listener.protocol,
+                    listener.port,
+                    listener.instance_protocol,
+                    listener.instance_port,
+                    policy_type,
+                    UUID.new.generate,
+                  ].join('-').gsub(/\s/, '_')
+                end
               end # of class methods
 
               def initialize(policies, listener, options)
@@ -49,7 +62,7 @@ module Kelbim
                 log_id += PolicyTypes.name?(dsl_name_or_attrs) ? dsl_name_or_attrs : dsl_name_or_attrs.inspect
                 log(:info, 'Create Policy', :cyan, log_id)
 
-                plcy = @options.dry_run ? self.class.create_mock_policy(dsl) : create_policy(dsl)
+                plcy = @options.dry_run ? self.class.create_mock_policy(dsl, @listener) : create_policy(dsl)
                 Policy.new(plcy, @listener, @options)
               end
 
@@ -65,19 +78,8 @@ module Kelbim
                     raise "Can't find Policy: #{dsl_name_or_attrs} in #{@listener.load_balancer.vpc_id || :classic} > #{@listener.load_balancer.name}"
                   end
                 else
-                  policy_name = [
-                    @listener.load_balancer.vpc_id || :classic,
-                    @listener.load_balancer.name,
-                    @listener.protocol,
-                    @listener.port,
-                    @listener.instance_protocol,
-                    @listener.instance_port,
-                    policy_type,
-                    UUID.new.generate,
-                  ].join('-').gsub(/\s/, '_')
-
                   plcy = @listener.load_balancer.policies.create(
-                    policy_name,
+                    self.class.create_policy_name(@listener, policy_type),
                     policy_type,
                     PolicyTypes.unexpand(dsl_type, dsl_name_or_attrs)
                   )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk