(#495) Notify Service[sensu-enterprise] from Sensu::Check resources

Vagrantfile

@@ -137,7 +137,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     server.vm.network :forwarded_port, guest: 3000, host: 3000, auto_correct: true
     server.vm.network :forwarded_port, guest: 15672, host: 15672, auto_correct: true
     server.vm.provision :shell, :path => "tests/provision_basic_el.sh"
-    server.vm.provision :shell, :path => "tests/provision_enterprise_server.sh"
+    server.vm.provision :shell,
+      :path => "tests/provision_enterprise_server.sh",
+      :env => {
+        'FACTER_SE_USER' => ENV['FACTER_SE_USER'].to_s,
+        'FACTER_SE_PASS' => ENV['FACTER_SE_PASS'].to_s,
+      }
+
     server.vm.provision :shell, :path => "tests/rabbitmq.sh"
   end
 

lib/puppet/type/sensu_check.rb

@@ -21,10 +21,13 @@ def should
   def initialize(*args)
     super *args
 
-    self[:notify] = [
-      "Service[sensu-client]",
-      "Service[sensu-server]",
-    ].select { |ref| catalog.resource(ref) }
+    if c = catalog
+      self[:notify] = [
+        "Service[sensu-client]",
+        "Service[sensu-server]",
+        "Service[sensu-enterprise]",
+      ].select { |ref| c.resource(ref) }
+    end
   end
 
   ensurable do

lib/puppet/type/sensu_check_config.rb

@@ -4,10 +4,13 @@
   def initialize(*args)
     super *args
 
-    self[:notify] = [
-      "Service[sensu-client]",
-      "Service[sensu-server]",
-    ].select { |ref| catalog.resource(ref) }
+    if c = catalog
+      self[:notify] = [
+        'Service[sensu-client]',
+        'Service[sensu-server]',
+        'Service[sensu-enterprise]',
+      ].select { |ref| c.resource(ref) }
+    end
   end
 
   ensurable do

lib/puppet/type/sensu_extension.rb

@@ -4,10 +4,13 @@
   def initialize(*args)
     super *args
 
-    self[:notify] = [
-      "Service[sensu-api]",
-      "Service[sensu-server]",
-    ].select { |ref| catalog.resource(ref) }
+    if c = catalog
+      self[:notify] = [
+        'Service[sensu-api]',
+        'Service[sensu-server]',
+        'Service[sensu-enterprise]',
+      ].select { |ref| c.resource(ref) }
+    end
   end
 
   ensurable do

lib/puppet/type/sensu_handler.rb

@@ -1,12 +1,18 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..',
+                                   'puppet_x', 'sensu', 'boolean_property.rb'))
+
 Puppet::Type.newtype(:sensu_handler) do
   @doc = ""
 
   def initialize(*args)
     super *args
 
-    self[:notify] = [
-      "Service[sensu-server]",
-    ].select { |ref| catalog.resource(ref) }
+    if c = catalog
+      self[:notify] = [
+        'Service[sensu-server]',
+        'Service[sensu-enterprise]',
+      ].select { |ref| c.resource(ref) }
+    end
   end
 
   ensurable do

lib/puppet/type/sensu_mutator.rb

@@ -4,9 +4,12 @@
   def initialize(*args)
     super *args
 
-    self[:notify] = [
-      "Service[sensu-server]",
-    ].select { |ref| catalog.resource(ref) }
+    if c = catalog
+      self[:notify] = [
+        'Service[sensu-server]',
+        'Service[sensu-enterprise]',
+      ].select { |ref| c.resource(ref) }
+    end
   end
 
   ensurable do

lib/puppet/type/sensu_rabbitmq_config.rb

@@ -8,12 +8,14 @@
   def initialize(*args)
     super(*args)
 
-    self[:notify] = [
-      'Service[sensu-server]',
-      'Service[sensu-client]',
-      'Service[sensu-api]',
-      'Service[sensu-enterprise]'
-    ].select { |ref| catalog.resource(ref) }
+    if c = catalog
+      self[:notify] = [
+        'Service[sensu-server]',
+        'Service[sensu-client]',
+        'Service[sensu-api]',
+        'Service[sensu-enterprise]',
+      ].select { |ref| c.resource(ref) }
+    end
   end
 
   def has_cluster?

lib/puppet/type/sensu_redis_config.rb

@@ -8,10 +8,13 @@
   def initialize(*args)
     super *args
 
-    self[:notify] = [
-      "Service[sensu-api]",
-      "Service[sensu-server]",
-    ].select { |ref| catalog.resource(ref) }
+    if c = catalog
+      self[:notify] = [
+        'Service[sensu-api]',
+        'Service[sensu-server]',
+        'Service[sensu-enterprise]',
+      ].select { |ref| c.resource(ref) }
+    end
   end
 
   def has_sentinels?

spec/unit/sensu_check_config_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Puppet::Type.type(:sensu_check_config) do
+  let(:resource_hash) do
+    {
+      :title => 'foo.example.com',
+      :catalog => Puppet::Resource::Catalog.new
+    }
+  end
+
+  describe 'notifications' do
+    context 'when managing sensu-enterprise (#495)' do
+      let(:service_resource) do
+        Puppet::Type.type(:service).new(name: 'sensu-enterprise')
+      end
+      let(:resource_hash) do
+        c = Puppet::Resource::Catalog.new
+        c.add_resource(service_resource)
+        {
+          :title => 'foo.example.com',
+          :catalog => c
+        }
+      end
+
+      it 'notifies Service[sensu-enterprise]' do
+        notify_list = described_class.new(resource_hash)[:notify]
+        # compare the resource reference strings, the object identities differ.
+        expect(notify_list.map(&:ref)).to eq [service_resource.ref]
+      end
+    end
+  end
+end

spec/unit/sensu_check_spec.rb

@@ -55,4 +55,26 @@
     #   ).to eq nil
     # end
   end
+
+  describe 'notifications' do
+    context 'when managing sensu-enterprise (#495)' do
+      let(:service_resource) do
+        Puppet::Type.type(:service).new(name: 'sensu-enterprise')
+      end
+      let(:resource_hash) do
+        c = Puppet::Resource::Catalog.new
+        c.add_resource(service_resource)
+        {
+          :title => 'foo.example.com',
+          :catalog => c
+        }
+      end
+
+      it 'notifies Service[sensu-enterprise]' do
+        notify_list = described_class.new(resource_hash)[:notify]
+        # compare the resource reference strings, the object identities differ.
+        expect(notify_list.map(&:ref)).to eq [service_resource.ref]
+      end
+    end
+  end
 end

spec/unit/sensu_extension_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Puppet::Type.type(:sensu_extension) do
+  let(:resource_hash) do
+    {
+      :title => 'Emanon',
+      :catalog => Puppet::Resource::Catalog.new
+    }
+  end
+
+  describe 'notifications' do
+    context 'when managing sensu-enterprise (#495)' do
+      let(:service_resource) do
+        Puppet::Type.type(:service).new(name: 'sensu-enterprise')
+      end
+      let(:resource_hash) do
+        c = Puppet::Resource::Catalog.new
+        c.add_resource(service_resource)
+        {
+          :title => 'Emanon',
+          :catalog => c
+        }
+      end
+
+      it 'notifies Service[sensu-enterprise]' do
+        notify_list = described_class.new(resource_hash)[:notify]
+        # compare the resource reference strings, the object identities differ.
+        expect(notify_list.map(&:ref)).to eq [service_resource.ref]
+      end
+    end
+  end
+end

spec/unit/sensu_handler_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Puppet::Type.type(:sensu_handler) do
+  let(:resource_hash) do
+    {
+      :title => 'myhandler',
+      :catalog => Puppet::Resource::Catalog.new
+    }
+  end
+
+  describe 'notifications' do
+    context 'when managing sensu-enterprise (#495)' do
+      let(:service_resource) do
+        Puppet::Type.type(:service).new(name: 'sensu-enterprise')
+      end
+      let(:resource_hash) do
+        c = Puppet::Resource::Catalog.new
+        c.add_resource(service_resource)
+        {
+          :title => 'myhandler',
+          :catalog => c
+        }
+      end
+
+      it 'notifies Service[sensu-enterprise]' do
+        notify_list = described_class.new(resource_hash)[:notify]
+        # compare the resource reference strings, the object identities differ.
+        expect(notify_list.map(&:ref)).to eq [service_resource.ref]
+      end
+    end
+  end
+end

spec/unit/sensu_mutator_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Puppet::Type.type(:sensu_mutator) do
+  let(:resource_hash) do
+    {
+      :title => 'mymutator',
+      :catalog => Puppet::Resource::Catalog.new
+    }
+  end
+
+  describe 'notifications' do
+    context 'when managing sensu-enterprise (#495)' do
+      let(:service_resource) do
+        Puppet::Type.type(:service).new(name: 'sensu-enterprise')
+      end
+      let(:resource_hash) do
+        c = Puppet::Resource::Catalog.new
+        c.add_resource(service_resource)
+        {
+          :title => 'mymutator',
+          :catalog => c
+        }
+      end
+
+      it 'notifies Service[sensu-enterprise]' do
+        notify_list = described_class.new(resource_hash)[:notify]
+        # compare the resource reference strings, the object identities differ.
+        expect(notify_list.map(&:ref)).to eq [service_resource.ref]
+      end
+    end
+  end
+end

spec/unit/sensu_rabbitmq_config_spec.rb

@@ -98,4 +98,26 @@ def create_type_instance(resource_hash)
       end
     end
   end
+
+  describe 'notifications' do
+    context 'when managing sensu-enterprise (#495)' do
+      let(:service_resource) do
+        Puppet::Type.type(:service).new(name: 'sensu-enterprise')
+      end
+      let(:resource_hash) do
+        c = Puppet::Resource::Catalog.new
+        c.add_resource(service_resource)
+        {
+          :title => 'foo.example.com',
+          :catalog => c
+        }
+      end
+
+      it 'notifies Service[sensu-enterprise]' do
+        notify_list = described_class.new(resource_hash)[:notify]
+        # compare the resource reference strings, the object identities differ.
+        expect(notify_list.map(&:ref)).to eq [service_resource.ref]
+      end
+    end
+  end
 end

spec/unit/sensu_redis_config_spec.rb

@@ -180,4 +180,25 @@ def create_type_instance(resource_hash)
     end
   end
 
+  describe 'notifications' do
+    context 'when managing sensu-enterprise (#495)' do
+      let(:service_resource) do
+        Puppet::Type.type(:service).new(name: 'sensu-enterprise')
+      end
+      let(:resource_hash) do
+        c = Puppet::Resource::Catalog.new
+        c.add_resource(service_resource)
+        {
+          :title => 'foo.example.com',
+          :catalog => c
+        }
+      end
+
+      it 'notifies Service[sensu-enterprise]' do
+        notify_list = described_class.new(resource_hash)[:notify]
+        # compare the resource reference strings, the object identities differ.
+        expect(notify_list.map(&:ref)).to eq [service_resource.ref]
+      end
+    end
+  end
 end

tests/provision_enterprise_server.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+if [ -z "${FACTER_SE_USER:-}" ]; then
+  echo "ERROR: You must export FACTER_SE_USER and FACTER_SE_PASS" >&2
+  echo "ERROR: In the shell that executes vagrant up" >&2
+  exit 1
+fi
+echo "FACTER_SE_USER=$FACTER_SE_USER"
+
 # setup module dependencies
 puppet module install puppetlabs/rabbitmq
 

tests/sensu-server-enterprise.pp

@@ -9,18 +9,19 @@
     mode   => '0600',
   }
 
+  # NOTE: When testing sensu enterprise, provide the SE_USER and SE_PASS to use
+  # with the online repository using the FACTER_SE_USER and FACTER_SE_PASS
+  # environment variables.  An effective way to manage this is with `direnv`
   class { '::sensu':
     install_repo              => true,
-    server                    => true,
+    enterprise                => true,
+    enterprise_user           => $facts['se_user'],
+    enterprise_pass           => $facts['se_pass'],
     manage_services           => true,
     manage_user               => true,
     rabbitmq_password         => 'correct-horse-battery-staple',
     rabbitmq_vhost            => '/sensu',
-    api                       => true,
-    api_user                  => 'admin',
-    api_password              => 'secret',
     client_address            => $::ipaddress_eth1,
-    # enterprise options
     api_ssl_port              => '4568',
     api_ssl_keystore_file     => '/etc/sensu/api.keystore',
     api_ssl_keystore_password => 'sensutest',