sensu-settings 9.9.0 → 9.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad6aa38a2670cc323faf4d9c9e44cf378808181c
-  data.tar.gz: b1329ce300073a6efee7bc5f2a9eed8a495db24b
+  metadata.gz: 4130a5c9f9c7f870dade98007e89537935948eaa
+  data.tar.gz: aa739d99b17cccabfd6acbef823e750cf80ff2f0
 SHA512:
-  metadata.gz: 4933d28d1f7319626868f186e3d796cebb3e6b3510154ddb717ddfada7c188bf26124d8c8541a9482876c15703f7a280869996aa82b2616010163b490ac933e9
-  data.tar.gz: 2122cf394f8eb98b23376586c801e4b0248a636c7a0bd2e2b17f2983c780a960fd6a72ac650992a03aef81cefb438a73931ff3ed3baee4c7a8f6149ea83a6c57
+  metadata.gz: f48976092495a8ff65573e8e6ce643a43dee64bdc34fc4975167715027a023dfe6fdff5ffff23382a9383905302ade85d274f475b8899ec3b98b34c86b34d21f
+  data.tar.gz: ed2ab15c91f45f7b2a62c0ca418937fdf8f037169cfc0888ccc198548add6bd80b20b006c28d2abe7dc0c09491bf403ec6eb85b91f3c525cb1dda13db4da5e3b

data/lib/sensu/settings/loader.rb

@@ -353,7 +353,7 @@ module Sensu
         else
           contents.sub!(/^\357\273\277/, "")
         end
-        contents
+        contents.strip
       end
 
       # Deep merge two hashes.

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

@@ -15,6 +15,34 @@ module Sensu
           end
         end
 
+        # Validate API endpoints.
+        # Validates: endpoints
+        #
+        # @param api [Hash] sensu api definition.
+        def validate_api_endpoints(api)
+          if is_an_array?(api[:endpoints])
+            api[:endpoints].each do |endpoint|
+              if is_a_hash?(endpoint)
+                if endpoint[:url]
+                  must_be_a_string(endpoint[:url]) ||
+                    invalid(api, "api endpoint url must be a string")
+                else
+                  must_be_a_string(endpoint[:host]) ||
+                    invalid(api, "api endpoint host must be a string")
+                  must_be_an_integer(endpoint[:port]) ||
+                    invalid(api, "api endpoint port must be an integer")
+                  must_be_boolean_if_set(endpoint[:ssl]) ||
+                    invalid(api, "api endpoint ssl must be a boolean")
+                end
+              else
+                invalid(api, "api endpoints must each be a hash")
+              end
+            end
+          else
+            invalid(api, "api endpoints must be an array")
+          end
+        end
+
         # Validate a Sensu API definition.
         # Validates: port, bind
         #
@@ -28,6 +56,7 @@ module Sensu
             must_be_a_string_if_set(api[:bind]) ||
               invalid(api, "api bind must be a string")
             validate_api_authentication(api)
+            validate_api_endpoints(api) if api[:endpoints]
           end
         end
       end

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "9.9.0"
+  spec.version       = "9.10.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: 9.9.0
+  version: 9.10.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json