sensu-settings 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a3bc1839a6bb401f3c669c081d03416855d502
-  data.tar.gz: a7741e0e1e8f4a0a836cc45f00c88617dded54f3
+  metadata.gz: 59c86f090d9e6b164204356e7d7924f72163e6b6
+  data.tar.gz: d28b6cced806d5e0283697f5819dff25c227f85d
 SHA512:
-  metadata.gz: 1dd681e6a477fd9321b4daaaf2340d8bf7d31eda31e90ac2686a805c5cab55f6ae5150b16a9be553799ebca5df7a6e840a7c7a5853190fce6d1ff6946eed22d8
-  data.tar.gz: 0847523f88e6ae486a6efcfe3e4690db7d49ece84ba8272b48851eb9bb68c0bb2ce074c8b6a522be9958fe058aebac39cc3acf5137a9f703347448ea6af347f4
+  metadata.gz: 0249f3b2e216d465ac811e883760ad3c055a6baeedf7c5ddd86632b2692b1550262e246d2d1ae06b976c375aaeb2379d898e7d37ce6b5100bf30708a552ce2da
+  data.tar.gz: b14a67f57e2184907f07e98f21081f66f3decbe90e3bbbf10a6c1e9f55cd4fff56871ced058409758733dbc23b5882a8deaeb82990ce0a2d52d2b310247c164e

data/lib/sensu/settings/validators/client.rb

@@ -105,6 +105,33 @@ module Sensu
             invalid(client, "client signature must be a string")
         end
 
+        # Validate client registration handlers.
+        # Validates: registration (handler, handlers)
+        #
+        # @param client [Hash] sensu client definition.
+        def validate_client_registration_handlers(client)
+          must_be_a_string_if_set(client[:registration][:handler]) ||
+            invalid(client, "client registration handler must be a string")
+          must_be_an_array_if_set(client[:registration][:handlers]) ||
+            invalid(client, "client registration handlers must be an array")
+          if is_an_array?(client[:registration][:handlers])
+            items_must_be_strings(client[:registration][:handlers]) ||
+              invalid(client, "client registration handlers must each be a string")
+          end
+        end
+
+        # Validate client registration.
+        # Validates: registration
+        #
+        # @param client [Hash] sensu client definition.
+        def validate_client_registration(client)
+          must_be_a_hash_if_set(client[:registration]) ||
+            invalid(client, "client registration must be a hash")
+          if is_a_hash?(client[:registration])
+            validate_client_registration_handlers(client)
+          end
+        end
+
         # Validate a Sensu client definition.
         # Validates: name, address, safe_mode
         #
@@ -125,6 +152,7 @@ module Sensu
             validate_client_keepalive(client)
             validate_client_redact(client)
             validate_client_signature(client)
+            validate_client_registration(client)
           end
         end
       end

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "3.2.0"
+  spec.version       = "3.3.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"

data/spec/validator_spec.rb

@@ -604,6 +604,37 @@ describe "Sensu::Settings::Validator" do
     expect(@validator.reset).to eq(0)
   end
 
+  it "can validate client registration" do
+    client = {
+      :name => "foo",
+      :address => "127.0.0.1",
+      :subscriptions => ["bar"]
+    }
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(0)
+    client[:registration] = true
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(1)
+    client[:registration] = {}
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(0)
+    client[:registration][:handler] = 1
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(1)
+    client[:registration][:handler] = "foo"
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(0)
+    client[:registration][:handlers] = 1
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(1)
+    client[:registration][:handlers] = [1]
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(1)
+    client[:registration][:handlers] = ["foo"]
+    @validator.validate_client(client)
+    expect(@validator.reset).to eq(0)
+  end
+
   it "can run, validating client" do
     settings = {
       :client => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -157,4 +157,3 @@ test_files:
 - spec/rules_spec.rb
 - spec/settings_spec.rb
 - spec/validator_spec.rb
-has_rdoc: