kelbim 0.3.0.beta2 → 0.3.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeaec566d9b8f365d3b7f7a015c50e40a1578b53
-  data.tar.gz: 1fd50d4d65614436350447e4bc6bdcd26936b810
+  metadata.gz: 730d02c7b0af20ca6ef821c7d29d2fcb4c28c2e3
+  data.tar.gz: 14f42001d200a19a2c62ca67582d64a3ce4569e6
 SHA512:
-  metadata.gz: 38ffb53b7817cdf92da0000a3c7da74b1965cb131c34ad275b60c54d121eb000e06803070047040b58810ef01f5176789d055cb692cfb8fdfb4bd325d3da4a0e
-  data.tar.gz: bc1f9a19bfce02b82f9dffee27cfc0654c578221fce37333d4ed07d61158d198bd39804b76969d4a1ed6c7a694eab5cb85ecd2016d32226965c112252592f46e
+  metadata.gz: 0e5da86b232b0fa27b09ad53ec97d1cf02e60cc799cd2571001931e85d53e7bc1e80d9b5ec86700ebc81696f2c5a1bba6c567af622403a952e8fe1df038a3176
+  data.tar.gz: 8d0f04b83bcc412ffe24ba4f6a3f0b71de090b7faa8028aadb91f9ba92d5e119335b01dea17548226ebaef65f89a2de0eefe76dc08ac5a5cff79d7bcd66575ab

data/lib/kelbim/dsl/converter.rb

@@ -139,6 +139,7 @@ end
         instance_port = listener[:instance_port]
         policies = listener[:policies]
         server_certificate = listener[:server_certificate]
+        ssl_certificate_id = listener[:ssl_certificate_id]
 
         out = "listener [#{protocol}, #{port}] => [#{instance_protocol}, #{instance_port}]"
 
@@ -160,6 +161,10 @@ end
           out << "        server_certificate #{server_certificate.name.inspect}\n"
         end
 
+        if ssl_certificate_id
+          out << "        ssl_certificate_id #{ssl_certificate_id.inspect}\n"
+        end
+
         out << "      end"
 
         return out

data/lib/kelbim/exporter.rb

@@ -68,6 +68,7 @@ module Kelbim
         :instance_port      => listener.instance_port,
         :server_certificate => listener.server_certificate,
         :policies           => listener.policies.map {|i| export_policy(i) },
+        :ssl_certificate_id => listener.ssl_certificate_id,
       }
     end
 

data/lib/kelbim/ext/elb-listener-ext.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk-v1'
+require 'aws-sdk'
 
 module AWS
   class ELB
@@ -16,6 +16,18 @@ module AWS
           load_balancer.policies.find {|i| i.name == name }
         end
       end
+
+      def ssl_certificate_id
+        _description[:listener][:ssl_certificate_id]
+      end
+
+      def ssl_certificate_id=(arn)
+        client.set_load_balancer_listener_ssl_certificate(
+          :load_balancer_name => load_balancer.name,
+          :load_balancer_port => port,
+          :ssl_certificate_id => arn)
+        nil
+      end
     end # Listener
   end # ELB
 end # AWS

data/lib/kelbim/version.rb

@@ -1,5 +1,5 @@
 module Kelbim
-  VERSION = "0.3.0.beta2"
+  VERSION = "0.3.0.beta3"
 end
 
 Version = Kelbim::VERSION

data/lib/kelbim/wrapper/listener.rb

@@ -9,7 +9,7 @@ module Kelbim
 
             def_delegators(
               :@listener,
-              :protocol, :port, :instance_protocol, :instance_port, :load_balancer)
+              :protocol, :port, :instance_protocol, :instance_port, :load_balancer, :ssl_certificate_id)
 
             def initialize(listener, options)
               @listener = listener
@@ -21,7 +21,7 @@ module Kelbim
             end
 
             def eql?(dsl)
-              not has_difference_protocol_port?(dsl) and compare_server_certificate(dsl)
+              not has_difference_protocol_port?(dsl) and compare_server_certificate(dsl) and compare_ssl_certificate_id(dsl)
             end
 
             def update(dsl)
@@ -42,6 +42,16 @@ module Kelbim
                   @options.updated = true
                 end
               end
+
+              compare_ssl_certificate_id(dsl) do |old_data, new_data|
+                log(:info, "  ssl_certificate_id:", :green)
+                log(:info, Kelbim::Utils.diff(old_data, new_data, :color => @options[:color], :indent => '    '), false)
+
+                unless @options.dry_run
+                  @listener.ssl_certificate_id = @dsl.ssl_certificate_id
+                  @options.updated = true
+                end
+              end
             end
 
             def update_policies(policy_list, old_policy_list)
@@ -96,10 +106,29 @@ module Kelbim
             def compare_server_certificate(dsl)
               aws_server_certificate = @listener.server_certificate
               aws_server_certificate = aws_server_certificate.name if aws_server_certificate
+
+              # XXX:
+              if not aws_server_certificate.nil? and dsl.server_certificate.nil?
+                log(:warn, "It can not be server_certificate to nil", :yellow, log_id)
+                return true
+              end
+
               same = (aws_server_certificate == dsl.server_certificate)
               yield(aws_server_certificate, dsl.server_certificate) if !same && block_given?
               return same
             end
+
+            def compare_ssl_certificate_id(dsl)
+              # XXX:
+              if not @listener.ssl_certificate_id.nil? and dsl.ssl_certificate_id.nil?
+                log(:warn, "It can not be ssl_certificate_id to nil", :yellow, log_id)
+                return true
+              end
+
+              same = (@listener.ssl_certificate_id == dsl.ssl_certificate_id)
+              yield(@listener.ssl_certificate_id, dsl.ssl_certificate_id) if !same && block_given?
+              return same
+            end
           end # Listener
         end # ListenerCollection
       end # LoadBalancer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kelbim
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta2
+  version: 0.3.0.beta3
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1