Merge branch 'master' of https://github.com/johnbellone/consul-cookbook

sous-chefs · May 16, 2016 · 7a03bb1 · 7a03bb1
2 parents 41047f7 + 0bbc6f5
commit 7a03bb1
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 24 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ end
 group :unit, :integration do
   gem 'chef-sugar'
   gem 'chefspec'
-  gem 'berkshelf'
+  gem 'berkshelf', '~> 4.0'
   gem 'test-kitchen'
   gem 'serverspec'
 end

diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb
@@ -111,7 +111,7 @@ def tls?
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.owner
               group new_resource.group
               mode '0755'
@@ -120,7 +120,7 @@ def tls?
           end
 
           file new_resource.path do
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.owner
               group new_resource.group
               mode '0640'

diff --git a/libraries/consul_definition.rb b/libraries/consul_definition.rb
@@ -45,7 +45,7 @@ def to_json
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.user
               group new_resource.group
               mode '0755'
@@ -54,7 +54,7 @@ def to_json
 
           file new_resource.path do
             content new_resource.to_json
-            if node['os'].eql? 'linux'
+            unless windows?
               owner new_resource.user
               group new_resource.group
               mode '0640'

diff --git a/libraries/consul_installation_binary.rb b/libraries/consul_installation_binary.rb
@@ -84,7 +84,7 @@ def self.default_archive_url
       def self.binary_basename(node, resource)
         case node['kernel']['machine']
         when 'x86_64', 'amd64' then ['consul', resource.version, node['os'], 'amd64'].join('_')
-        when 'i386' then ['consul', resource.version, node['os'], '386'].join('_')
+        when /i\d86/ then ['consul', resource.version, node['os'], '386'].join('_')
         else ['consul', resource.version, node['os'], node['kernel']['machine']].join('_')
         end.concat('.zip')
       end

diff --git a/libraries/consul_installation_webui.rb b/libraries/consul_installation_webui.rb
@@ -47,6 +47,10 @@ def action_create
             recursive true
           end
 
+          directory ::File.dirname(options[:symlink_to]) do
+            recursive true
+          end
+
           zipfile options[:archive_basename] do
             path ::File.join(options[:extract_to], new_resource.version)
             source archive_url

diff --git a/libraries/consul_service.rb b/libraries/consul_service.rb
@@ -87,7 +87,7 @@ def service_options(service)
         service.directory(new_resource.data_dir)
         service.user(new_resource.user)
         service.environment(new_resource.environment)
-        service.restart_on_update(true)
+        service.restart_on_update(false)
         service.options(:systemd, template: 'consul:systemd.service.erb')
         service.options(:sysvinit, template: 'consul:sysvinit.service.erb')
 

diff --git a/libraries/consul_watch.rb b/libraries/consul_watch.rb
@@ -43,16 +43,20 @@ def to_json
         notifying_block do
           directory ::File.dirname(new_resource.path) do
             recursive true
-            owner new_resource.user
-            group new_resource.group
-            mode '0755'
+            unless windows?
+              owner new_resource.user
+              group new_resource.group
+              mode '0755'
+            end
           end
 
           file new_resource.path do
-            owner new_resource.user
-            group new_resource.group
             content new_resource.to_json
-            mode '0640'
+            unless windows?
+              owner new_resource.user
+              group new_resource.group
+              mode '0640'
+            end
           end
         end
       end

diff --git a/templates/default/sysvinit.service.erb b/templates/default/sysvinit.service.erb
@@ -35,7 +35,7 @@ _start() {
   start-stop-daemon --start --quiet --background \
       --pidfile $pidfile<% unless @pid_file_external %> --make-pidfile<% end %> \
       --chuid $user --chdir "<%= @directory %>" \
-      --startas /bin/bash -- -c "exec $exec <%= @daemon_options %> >$logfile 2>&1"
+      --startas /bin/bash -- -c "exec $exec <%= @daemon_options %> >> $logfile 2>&1"
 }
 
 _stop() {
@@ -64,7 +64,7 @@ _start() {
     daemon \
          --pidfile=$pidfile \
          --user=$user \
-         " { $exec <%= @daemon_options %> &> $logfile & } ; echo \$! >| $pidfile "
+         " { $exec <%= @daemon_options %> &>> $logfile & } ; echo \$! >| $pidfile "
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch $lockfile

diff --git a/test/cookbooks/consul_spec/recipes/consul_installation_webui.rb b/test/cookbooks/consul_spec/recipes/consul_installation_webui.rb
@@ -0,0 +1,3 @@
+consul_installation '0.6.4' do
+  provider :webui
+end
diff --git a/test/spec/libraries/consul_installation_webui_spec.rb b/test/spec/libraries/consul_installation_webui_spec.rb
@@ -8,15 +8,26 @@
   let(:chefspec_options) { {platform: 'ubuntu', version: '14.04'} }
 
   context 'webui installation' do
-    recipe do
-      consul_installation '0.6.4' do
-        provider :webui
-      end
+    recipe 'consul_spec::consul_installation_webui'
+
+    it do is_expected.to create_directory('/opt/consul-webui/0.6.4')
+      .with(
+        recursive: true
+      )
+    end
+
+    it do is_expected.to create_directory('/var/lib/consul')
+      .with(
+        recursive: true
+      )
     end
 
     it do is_expected.to unzip_zipfile('consul_0.6.4_web_ui.zip')
-      .with(source: 'https://releases.hashicorp.com/consul/0.6.4/consul_0.6.4_web_ui.zip',
-            path: '/opt/consul-webui/0.6.4')
+      .with(
+        checksum: '5f8841b51e0e3e2eb1f1dc66a47310ae42b0448e77df14c83bb49e0e0d5fa4b7',
+        path: '/opt/consul-webui/0.6.4',
+        source: 'https://releases.hashicorp.com/consul/0.6.4/consul_0.6.4_web_ui.zip'
+      )
     end
   end
 end
diff --git a/test/spec/libraries/consul_service_windows_spec.rb b/test/spec/libraries/consul_service_windows_spec.rb
@@ -1,5 +1,6 @@
 require 'spec_helper'
 require_relative '../../../libraries/consul_service'
+require_relative '../../../libraries/consul_service_windows'
 
 describe ConsulCookbook::Resource::ConsulService do
   step_into(:consul_service)
@@ -16,13 +17,27 @@
       allow(shellout).to receive(:run_command)
       allow(shellout).to receive(:exitstatus)
       allow(shellout).to receive(:stdout).and_return("Consul v0.6.0\nConsul Protocol: 3 (Understands back to: 1)\n")
+
+      # Stub admin_user method since we are testing a Windows host via Linux
+      # Fixed in https://github.com/poise/poise/commit/2f42850c82e295af279d060155bcd5c7ebb31d6a but not released yet
+      allow(Poise::Utils::Win32).to receive(:admin_user).and_return('Administrator')
     end
 
     recipe 'consul::default'
 
-    it { expect(chef_run).to create_directory('C:\Program Files\consul\conf.d') }
-    it { is_expected.to create_directory('C:\Program Files\consul\data') }
-    it { expect(chef_run).to install_nssm('consul').with(
+    it {
+      skip('Add poise inversion system to consul_service otherwise windows tests will not pass')
+      is_expected.to create_directory('C:\Program Files\consul\conf.d')
+    }
+
+    it {
+      skip('Add poise inversion system to consul_service otherwise windows tests will not pass')
+      is_expected.to create_directory('C:\Program Files\consul\data')
+    }
+
+    it {
+      skip('Add poise inversion system to consul_service otherwise windows tests will not pass')
+      expect(chef_run).to install_nssm('consul').with(
       program: 'C:\Program Files\consul\0.6.4\consul.exe',
       args: 'agent -config-file="""C:\Program Files\consul\consul.json""" -config-dir="""C:\Program Files\consul\conf.d"""'
     )}