kelbim 0.1.4 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWNlZWFhMDllMjU2ZjBjMGMzNWQ0ZjliMDdlODY1MmVjMDVmY2JhZA==
-  data.tar.gz: !binary |-
-    YTkzNTdjZjk4NzIzMDg0YTdhMGUzOTVmNjZlYzhlMmM0NDk0ZmM5ZA==
+SHA1:
+  metadata.gz: 9bbb3197d476ccd10329c48a3edff97441e40f9f
+  data.tar.gz: dc3d13a4887646050d975d9cf27b266d2a048e22
 SHA512:
-  metadata.gz: !binary |-
-    ZGM5MzBhOGQ0ZDFmMjUyOTVkMTBkZjJmMjcwMmY3NTY2MGZiM2IwNGJmZTYx
-    OWMxMjczYjlmNzgwYjI3NWQ2OTY0ZDY3YTk1MDVlMjZlYjVjNGY5N2YzYzFj
-    Mzg5ZDcyOGE1MDk4NzMxNTMwMWRmMmE3ODA3YjQzYWIyZWJiYmU=
-  data.tar.gz: !binary |-
-    YzU1M2I2ZDMwYWMyZjExMTViYjliMmIzYWQ2NjUyOWNhYTZkNzg4ZWZlYzRi
-    NTdlZjllYzQ4NzRmMTkxYzg2NTZmMmM1ZWY4ZTIwMDc0ZWY3NjA2ZTA3MTk2
-    MzE4ZjQwNDQxMjMxZTlhMGJlMGZkNzIzN2NiOTI3MDZmZjk5MWU=
+  metadata.gz: f3a19d3148899e4d0776081456311d5f26be4c669ade5b6a0278c4ec4ab484d9baf5aeb5cbfa912bc7be41cb651b9bd742f03c1a71827c783df452ab0ec44bbb
+  data.tar.gz: 0eec8ae9e258df9d86cb51e4a1102bb4912cb9d44359110e5b91b21e0fa955bc8c41b6b6009ccbfd780b51ced7f62fce681f0dcf4cc151f38d58b2ffaf50c971

data/README.md

@@ -65,6 +65,10 @@ ec2 do
       unhealthy_threshold 2
     end
 
+    attributes do
+      cross_zone_load_balancing :enabled => false
+    end
+
     availability_zones(
       "ap-northeast-1a",
       "ap-northeast-1b"
@@ -97,6 +101,10 @@ ec2 "vpc-XXXXXXXXX" do
       unhealthy_threshold 2
     end
 
+    attributes do
+      cross_zone_load_balancing :enabled => true
+    end
+
     subnets(
       "subnet-XXXXXXXX"
     )
@@ -114,14 +122,9 @@ end
 ec2 "vpc-XXXXXXXXX" do
   load_balancer "my-load-balancer" do
     spec 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
+      url = URI.parse('http://www.example.com/')
+      res = Net::HTTP.start(url.host, url.port) {|http| http.get(url.path) }
+      expect(res).to be_a(Net::HTTPOK)
     end
     ...
 ```

data/lib/kelbim/dsl/attributes.rb

@@ -0,0 +1,32 @@
+require 'ostruct'
+require 'kelbim/dsl/checker'
+
+module Kelbim
+  class DSL
+    class EC2
+      class LoadBalancer
+        class Attributes
+          include Checker
+
+          def initialize(load_balancer, &block)
+            @error_identifier = "LoadBalancer `#{load_balancer}`"
+            @result = {}
+            instance_eval(&block)
+          end
+
+          def result
+            required(:cross_zone_load_balancing, @result[:cross_zone_load_balancing])
+            @result
+          end
+
+          def cross_zone_load_balancing(value)
+            call_once(:cross_zone_load_balancing)
+            expected_type(value, Hash)
+            expected_length(value, 1)
+            @result[:cross_zone_load_balancing] = value
+          end
+        end # Attributes
+      end # LoadBalancer
+    end # EC2
+  end # DSL
+end # Kelbim

data/lib/kelbim/dsl/converter.rb

@@ -41,6 +41,7 @@ end
         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
+        attributes = output_attributes(load_balancer[:attributes]).strip
         testcase = is_internal ? '' : ("\n    " + output_testcase(load_balancer[:dns_name]).strip + "\n")
 
         out = <<-EOS
@@ -51,6 +52,8 @@ end
     #{listeners}
 
     #{health_check}
+
+    #{attributes}
         EOS
 
         if vpc
@@ -178,6 +181,17 @@ end
       interval #{interval}
       healthy_threshold #{healthy_threshold}
       unhealthy_threshold #{unhealthy_threshold}
+    end
+        EOS
+      end
+
+      def output_attributes(attributes)
+        cross_zone_load_balancing = attributes[:cross_zone_load_balancing].inspect
+        cross_zone_load_balancing.sub!(/\A\s*{\s*/, '').sub!(/\s*}\s*\Z/, '')
+
+        <<-EOS
+    attributes do
+      cross_zone_load_balancing #{cross_zone_load_balancing}
     end
         EOS
       end

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

@@ -1,6 +1,7 @@
 require 'ostruct'
 require 'kelbim/dsl/checker'
 require 'kelbim/dsl/health-check'
+require 'kelbim/dsl/attributes'
 require 'kelbim/dsl/listeners'
 
 module Kelbim
@@ -27,6 +28,7 @@ module Kelbim
         def result
           required(:listeners, @result.listeners)
           required(:health_check, @result.health_check)
+          #required(:attributes, @result.attributes)
 
           if @vpc
             required(:subnets, @result.subnets)
@@ -63,6 +65,11 @@ module Kelbim
           @result.health_check = HealthCheck.new(@name, &block).result
         end
 
+        def attributes(&block)
+          call_once(:attributes)
+          @result.attributes = Attributes.new(@name, &block).result
+        end
+
         def subnets(*values)
           call_once(:subnets)
           raise "#{@error_identifier}: Subnet cannot be specified in EC2-Classic" unless @vpc

data/lib/kelbim/exporter.rb

@@ -33,6 +33,7 @@ module Kelbim
         :health_check => load_balancer.health_check,
         :scheme       => load_balancer.scheme,
         :dns_name     => load_balancer.dns_name,
+        :attributes   => load_balancer.attributes,
       }
 
       if @fetch_policies and load_balancer.policies.first

data/lib/kelbim/ext/elb-load-balancer-attributes-ext.rb

@@ -0,0 +1,43 @@
+require 'aws-sdk'
+
+proc {
+  define_client_method = proc do |operation|
+    operation[:outputs] ||= {}
+    builder = AWS::Core::QueryRequestBuilder.new('2012-06-01', operation)
+    parser = AWS::Core::QueryResponseParser.new(operation[:outputs])
+    AWS::ELB::Client::V20120601.send(:define_client_method, operation[:method], builder, parser)
+  end
+
+  define_client_method.call({
+    :name    => 'DescribeLoadBalancerAttributes',
+    :method  => :describe_load_balancer_attributes,
+    :inputs  => {'LoadBalancerName' => [:string, :required]},
+    :outputs => {
+      :children => {
+        'ResponseMetadata' => {
+          :ignore   => true,
+          :children => {'RequestId' => {:ignore => true}}},
+        'DescribeLoadBalancerAttributesResult' => {
+          :ignore   => true,
+          :children => {
+            'LoadBalancerAttributes' => {
+              :ignore   => true,
+              :children => {
+                'CrossZoneLoadBalancing' => {
+                  :children => {
+                    'Enabled' => {:type => :boolean}}}}}}}}}
+  })
+
+  define_client_method.call({
+    :name   => 'ModifyLoadBalancerAttributes',
+    :method => :modify_load_balancer_attributes,
+    :inputs => {
+      'LoadBalancerName' => [:string, :required],
+      'LoadBalancerAttributes' => [{
+        :structure => {
+          'CrossZoneLoadBalancing' => [{
+            :structure => {'Enabled' => [:boolean]}}]}},
+        :required]
+    },
+  })
+}.call

data/lib/kelbim/ext/elb-load-balancer-ext.rb

@@ -10,6 +10,29 @@ module AWS
           lb[:load_balancer_name] == name
         end
       end
+
+      def attributes
+        unless @attributes
+          credentials = AWS.config.credential_provider.credentials
+          elb = AWS::ELB.new(credentials)
+          @attributes = elb.client.describe_load_balancer_attributes(
+            :load_balancer_name => self.name).data
+        end
+
+        return @attributes.dup
+      end
+
+      def attributes=(attrs)
+        credentials = AWS.config.credential_provider.credentials
+        elb = AWS::ELB.new(credentials)
+
+        elb.client.modify_load_balancer_attributes({
+          :load_balancer_name       => self.name,
+          :load_balancer_attributes => attrs,
+        })
+
+        (@attributes = attrs).dup
+      end
     end # LoadBalancer
   end # ELB
 end # AWS

data/lib/kelbim/version.rb

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

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

@@ -32,6 +32,7 @@ module Kelbim
             :instances    => [], # instancesはLoadBalancerの処理で更新
             :scheme       => dsl.scheme,
             :health_check => {}, # health_checkはLoadBalancerの処理で更新
+            :attributes   => {}, # attributesはLoadBalancerの処理で更新
           })
 
           lb.listeners = dsl.listeners.map do |lstnr|
@@ -69,7 +70,7 @@ module Kelbim
             opts[:availability_zones] = dsl.availability_zones.map {|i|  AWS::EC2::AvailabilityZone.new(i) }
           end
 
-          # health_checkはLoadBalancerの処理で更新
+          # health_check、attributesはLoadBalancerの処理で更新
           lb = @load_balancers.create(dsl.name, opts)
           @options.updated = true
         end

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

@@ -28,6 +28,7 @@ module Kelbim
           end
 
           compare_health_check(dsl) or return false
+          compare_attributes(dsl) or return false
 
           if self.vpc_id
             compare_subnet_ids(dsl) or return false
@@ -77,6 +78,15 @@ module Kelbim
             end
           end
 
+          compare_attributes(dsl) do
+            log(:info, '  set attributes=' + dsl.attributes.inspect, :green)
+
+            unless @options.dry_run
+              @load_balancer.attributes = dsl.attributes
+              @options.updated = true
+            end
+          end
+
           if self.vpc_id
             compare_subnet_ids(dsl) do |aws_subnet_ids, dsl_subnet_ids|
               add_ids = (dsl_subnet_ids - aws_subnet_ids)
@@ -178,6 +188,13 @@ module Kelbim
           return same
         end
 
+        def compare_attributes(dsl)
+          return true unless dsl.attributes
+          same = (@load_balancer.attributes.sort == dsl.attributes.sort)
+          yield if !same && block_given?
+          return same
+        end
+
         def compare_subnet_ids(dsl)
           subnet_ids = @load_balancer.subnets.map {|i| i.id }
           same = (subnet_ids.sort == dsl.subnets.sort )

data/lib/kelbim.rb

@@ -1,2 +1,3 @@
+require 'kelbim/ext/elb-load-balancer-attributes-ext'
 require 'kelbim/version'
 require 'kelbim/client'

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.24.0
 - !ruby/object:Gem::Dependency
   name: uuid
   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
@@ -56,28 +56,28 @@ dependencies:
   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: term-ansicolor
   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
@@ -98,14 +98,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -134,6 +134,7 @@ files:
 - README.md
 - bin/kelbim
 - lib/kelbim/client.rb
+- lib/kelbim/dsl/attributes.rb
 - lib/kelbim/dsl/checker.rb
 - lib/kelbim/dsl/converter.rb
 - lib/kelbim/dsl/ec2.rb
@@ -145,6 +146,7 @@ files:
 - lib/kelbim/exporter.rb
 - lib/kelbim/ext/ec2-ext.rb
 - lib/kelbim/ext/elb-listener-ext.rb
+- lib/kelbim/ext/elb-load-balancer-attributes-ext.rb
 - lib/kelbim/ext/elb-load-balancer-ext.rb
 - lib/kelbim/ext/string-ext.rb
 - lib/kelbim/logger.rb
@@ -170,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Kelbim is a tool to manage ELB.