Merge branch 'optional-broker-configuration-fixup'

sous-chefs · May 9, 2016 · a747369 · a747369
2 parents 4fc90f4 + 80c7f71
commit a747369
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 11 deletions.
diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml
@@ -14,9 +14,13 @@ provisioner:
       md5_checksum: <%= ENV.fetch('KAFKA_MD5', '').inspect %>
       ulimit_file: 128000
       broker:
-        broker.id: 1
-        controlled.shutdown.enable: <%= ENV.fetch('KAFKA_CTRL_SHUTDOWN', false) %>
-        log.dirs: ['/mnt/kafka-logs-1', '/mnt/kafka-logs-2']
+        broker:
+          id: 1
+        controlled:
+          shutdown:
+            enable: <%= ENV.fetch('KAFKA_CTRL_SHUTDOWN', false) %>
+        log:
+          dirs: ['/mnt/kafka-logs-1', '/mnt/kafka-logs-2']
         zookeeper.connect: ['localhost:2181']
       log4j:
         appenders:

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -26,10 +26,14 @@ provisioner:
       md5_checksum: <%= ENV.fetch('KAFKA_MD5', '').inspect %>
       ulimit_file: 128000
       broker:
-        broker.id: 1
-        controlled.shutdown.enable: <%= ENV.fetch('KAFKA_CTRL_SHUTDOWN', false) %>
-        log.dirs: ['/mnt/kafka-logs-1', '/mnt/kafka-logs-2']
-        zookeeper.connect: ['localhost:2181']
+        broker:
+          id: 1
+        controlled:
+          shutdown:
+            enable: <%= ENV.fetch('KAFKA_CTRL_SHUTDOWN', false) %>
+        log:
+          dirs: ['/mnt/kafka-logs-1', '/mnt/kafka-logs-2']
+        zookeeper_connect: ['localhost:2181']
       log4j:
         appenders:
           zookeeperAppender:

diff --git a/libraries/configuration.rb b/libraries/configuration.rb
@@ -5,6 +5,19 @@
 
 module Kafka
   module Configuration
+    def render_option?(value)
+      case value
+      when Hash
+        value.values.all? do |v|
+          render_option?(v)
+        end
+      when Array
+        !value.empty?
+      else
+        !value.nil?
+      end
+    end
+
     def render_option(prefix, value)
       prefix = convert_key(prefix)
       case value

diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -106,7 +106,7 @@ def broker_attribute?(*parts)
   end
   key = parts.pop
   r = parts.reduce(broker) { |b, p| b.fetch(p, b) }
-  r.fetch(key, nil)
+  r.attribute?(key)
 end
 
 def fetch_broker_attribute(*parts)

diff --git a/spec/recipes/defaults_spec.rb b/spec/recipes/defaults_spec.rb
@@ -63,11 +63,11 @@
 
     context 'when set to `nil`' do
       let :broker_attributes do
-        {broker_id: nil}
+        {broker: {id: nil}}
       end
 
       it 'does not override it' do
-        expect(node.kafka.broker.broker_id).to be_nil
+        expect(node.kafka.broker['broker']['id']).to be_nil
       end
     end
 

diff --git a/templates/default/server.properties.erb b/templates/default/server.properties.erb
@@ -2,7 +2,7 @@
 # Local modifications will be overwritten.
 
 <% @config.each do |key, value| %>
-<%   unless value.nil? %>
+<%   if render_option?(value) %>
 <%=    render_option(key, value) %>
 <%   end %>
 <% end %>