sensu-settings 10.10.0 → 10.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c688fbfc882c64607771f71795541be631861b36
-  data.tar.gz: 15afa27b366876286f908d834c1932ad98b4aa0b
+  metadata.gz: ac7f083e3a7151c2bec0a9814910fc40c6f489cc
+  data.tar.gz: 18bd44c1fa9158c079a218ad31881844955a8ef8
 SHA512:
-  metadata.gz: 63b496deafec5a6d57e559270a9affd8d60f4c34dd75e8122e797a3f32b4e2a44f769d509685710f53abebd7660f95d327803bdee1c006d312909a46243d3127
-  data.tar.gz: 92efda1105c102520f847708a10dcb37c244254a9774f85d5ccfb23f4669cc2c792fea521165c8a845c1684b82d6fa89ee3744973fd26f81e7184d0f9f2d9eaa
+  metadata.gz: b9753cf338608265e2075c4435f237cd8bf98985179a48cd38b0a52c4de26107b2efc0bb88fd0bb0dc2cb4bc3b7ddf60a39d09e6e7767a74528d2bb3d8bf63f4
+  data.tar.gz: 1d0c0b72917172cd9e04b78c923e9cbd43309701a84e0f726e5b91e0d04d3e92af186b8e216ce5323d54db844be7278c7064655cbc16ec2037c16f606d7e7136

data/lib/sensu/settings/validator.rb

@@ -47,7 +47,8 @@ module Sensu
       private
 
       # Validate setting categories: checks, filters, mutators, and
-      # handlers.
+      # handlers. This method also validates each object type,
+      # ensuring that they are hashes.
       #
       # @param settings [Hash] sensu settings to validate.
       def validate_categories(settings)
@@ -55,7 +56,12 @@ module Sensu
           if is_a_hash?(settings[category])
             validate_method = ("validate_" + category.to_s.chop).to_sym
             settings[category].each do |name, details|
-              send(validate_method, details.merge(:name => name.to_s))
+              if details.is_a?(Hash)
+                send(validate_method, details.merge(:name => name.to_s))
+              else
+                object_type = category[0..-2]
+                invalid(details, "#{object_type} must be a hash")
+              end
             end
           else
             invalid(settings[category], "#{category} must be a hash")

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

@@ -38,7 +38,7 @@ module Sensu
         # @param check [Hash] sensu check definition.
         def validate_check_source(check)
           if is_a_string?(check[:source])
-            must_match_regex(/\A[\w\.-]+\z/, check[:source]) ||
+            must_match_regex(/\A([:]{3}[\w\|\.-]+[:]{3}|[\w\.-]+)\z/, check[:source]) ||
               invalid(check, "check source cannot contain spaces or special characters")
           else
             invalid(check, "check source must be a string")

data/sensu-settings.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 10.10.0
+  version: 10.11.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json