Merge pull request #219 from fumimaron9/feature/consul_config_recursor

update consul_config resource
sous-chefs · Sep 19, 2015 · 01bc1cf · 01bc1cf
2 parents a4adb85 + efbcb1e
commit 01bc1cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb
@@ -71,6 +71,7 @@ class ConsulConfig < Chef::Resource
       attribute(:ports, kind_of: [Hash, Mash])
       attribute(:protocol, kind_of: String)
       attribute(:recursor, kind_of: String)
+      attribute(:recursors, kind_of: Array)
       attribute(:retry_interval, kind_of: Integer)
       attribute(:server, equal_to: [true, false], default: true)
       attribute(:server_name, kind_of: String)
@@ -88,12 +89,12 @@ class ConsulConfig < Chef::Resource
       # Transforms the resource into a JSON format which matches the
       # Consul service's configuration format.
       def to_json
-        for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan bind_addr bootstrap bootstrap_expect check_update_interval client_addr data_dir datacenter disable_anonymous_signature disable_remote_exec disable_update_check dns_config domain enable_debug enable_syslog encrypt leave_on_terminate log_level node_name ports protocol recurser retry_interval server server_name skip_leave_on_interrupt start_join statsd_addr statsite_addr syslog_facility ui_dir verify_incoming verify_outgoing verify_server_hostname watches}
+        for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan bind_addr bootstrap bootstrap_expect check_update_interval client_addr data_dir datacenter disable_anonymous_signature disable_remote_exec disable_update_check dns_config domain enable_debug enable_syslog encrypt leave_on_terminate log_level node_name ports protocol recursor recursors retry_interval server server_name skip_leave_on_interrupt start_join statsd_addr statsite_addr syslog_facility ui_dir verify_incoming verify_outgoing verify_server_hostname watches}
         for_keeps << %i{ca_file cert_file key_file} if tls?
         config = to_hash.keep_if do |k, _|
           for_keeps.include?(k.to_sym)
         end.merge(options)
-        JSON.pretty_generate(config, quirks_mode: true)
+        JSON.pretty_generate(Hash[config.sort], quirks_mode: true)
       end
 
       def tls?

diff --git a/test/spec/libraries/consul_config_spec.rb b/test/spec/libraries/consul_config_spec.rb
@@ -15,16 +15,16 @@
     recipe do
       consul_config '/etc/consul/default.json' do
         options do
-          recurser 'foo'
+          recursor 'foo'
         end
       end
     end
 
     it { is_expected.to render_file('/etc/consul/default.json').with_content(<<-EOH.chomp) }
 {
+  "recursor": "foo",
   "verify_incoming": false,
-  "verify_outgoing": false,
-  "recurser": "foo"
+  "verify_outgoing": false
 }
 EOH
   end