Added required ACL token to Windows reload action. Added windows_clie…

…nt suite

.kitchen.yml

@@ -39,6 +39,8 @@ suites:
 
   - name: client
     named_run_list: client
+    excludes:
+      - windows-2012r2
 
   - name: git
     attributes:
@@ -50,9 +52,15 @@ suites:
           provider: git
     excludes:
       - windows-2012r2
+
   - name: windows
     attributes:
       consul:
         config: *default-config
     includes:
       - windows-2012r2
+
+  - name: windows_client
+    named_run_list: client
+    includes:
+      - windows-2012r2

libraries/consul_service.rb

@@ -46,6 +46,10 @@ class ConsulService < Chef::Resource
       # The location of the Consul executable.
       # @return [String]
       attribute(:program, kind_of: String, default: '/usr/local/bin/consul')
+      # @!attribute acl_token
+      # The ACL token. Needed to reload the Consul service on Windows
+      # @return [String]
+      attribute(:acl_token, kind_of: String, default: lazy { node['consul']['config']['acl_master_token']})
 
       def command
         "#{program} agent -config-file=#{config_file} -config-dir=#{config_dir}"

libraries/consul_service_windows.rb

@@ -75,7 +75,7 @@ def action_enable
       def action_reload
         notifying_block do
           execute 'Reload consul' do
-            command 'consul.exe reload'
+            command 'consul.exe reload' + (new_resource.acl_token ? " -token=#{new_resource.acl_token}" : '')
             cwd ::File.dirname(new_resource.program)
             action :run
           end

recipes/default.rb

@@ -30,7 +30,9 @@
   config_file config.path
   program install.consul_program
 
-  unless node.platform_family?('windows')
+  if node.platform_family?('windows')
+    acl_token node['consul']['config']['acl_master_token']
+  else
     user node['consul']['service_user']
     group node['consul']['service_group']
   end

test/integration/windows/windows_spec.rb

@@ -16,13 +16,13 @@
   it { should be_running }
 end
 
-[8300, 8400, 8500, 8600].each do |p|
+[8300, 8500, 8600].each do |p|
   describe port(p) do
     it { should be_listening }
   end
 end
 
-describe command("#{consul_command} members -detailed") do
+describe command("#{consul_command} members -detailed -token=doublesecret") do
   its(:exit_status) { should eq 0 }
   its(:stdout) { should include 'alive' }
   its(:stdout) { should include 'role=consul' }

test/integration/windows_client/default_spec.rb

@@ -0,0 +1,36 @@
+require_relative '../spec_helper'
+
+consul_executable = "C:\\Program\ Files\\consul\\#{consul_version}\\consul.exe"
+consul_command    = "& '#{consul_executable}'"
+
+config_file = 'C:\Program Files\consul\consul.json'
+config_dir  = 'C:\Program Files\consul\conf.d'
+
+describe file(consul_executable) do
+  it { should be_file }
+end
+
+describe service('consul') do
+  it { should be_enabled }
+  it { should be_running }
+end
+
+[8500, 8600].each do |p|
+  describe port(p) do
+    it { should be_listening }
+  end
+end
+
+describe command("#{consul_command} members -detailed -token=doublesecret") do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should include 'alive' }
+  its(:stdout) { should include 'role=node' }
+end
+
+describe file(config_file) do
+  it { should be_file }
+end
+
+describe file(config_dir) do
+  it { should be_directory }
+end