sensu-settings 9.0.0 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cbf9a4e7d37ba04e4fbbcfe697fcadb75a448c2
-  data.tar.gz: c6c4db9dcbf1f9f076aa6f5f9770c865b9ed1fe0
+  metadata.gz: 8b950b91c23d3c11482819e912226b3b86ea4a34
+  data.tar.gz: 29c40cb6cca44e4b658c667e928ed4817256bdd3
 SHA512:
-  metadata.gz: 7b07bc280b7a7c920cc3f4eac878f49645bf34a48812c021cb2c111d55a0b8a23fbc9594a8aa8180491da316386ff2ae8d7f84126e7e0ba5b46cc7a10d5cc558
-  data.tar.gz: 5aff8a7a597d6d6c8ceeaa061663fa403167003c734c7b53dd6bfb7c2c4ab7cc8c5e2900b8c66d694b2ead2f60953d4151d8c026b45a3f8684d1fb21e60f6399
+  metadata.gz: 71fe52ecfd5e5b7c5248d584dfb38d599db6641a3bd9fae6af2a43ddfd15589f9d21872b9fd0107cc991f8f62582d3abcb1efe47c031a1cdbd9cd4b58652b457
+  data.tar.gz: 30dd3f1dad803d23d0d213cc16697f25654eeefe67e14f752272171c0c03fad9a9b7dddd8ecd22f05827bbf51297d7e3fa7c147c331841809e888bc497b7819c

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

@@ -134,7 +134,7 @@ module Sensu
         #
         # @param check [Hash] sensu check definition.
         def validate_check_subdue(check)
-          validate_time_windows(check, :subdue)
+          validate_time_windows(check, "check", :subdue)
         end
 
         # Validate a Sensu check definition.

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

@@ -7,7 +7,7 @@ module Sensu
         #
         # @param filter [Hash] sensu filter definition.
         def validate_filter_when(filter)
-          validate_time_windows(filter, :when)
+          validate_time_windows(filter, "filter", :when)
         end
 
         # Validate a Sensu filter definition.

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

@@ -7,38 +7,42 @@ module Sensu
         #
         # @param definition [Hash] sensu definition.
         # @param scope [String] definition scope to validate.
+        # @param attribute [String] definition attribute to validate.
         # @param condition [Hash] to have begin and end validated.
-        def validate_time_window_condition(definition, scope, condition)
+        def validate_time_window_condition(definition, scope, attribute, condition)
           if is_a_hash?(condition)
-            if either_are_set?(condition[:begin], condition[:end])
-              must_be_time(condition[:begin], condition[:end]) ||
-                invalid(definition, "#{scope} begin and end times must be valid")
-            end
+            must_be_time(condition[:begin], condition[:end]) ||
+              invalid(definition, "#{scope} #{attribute} day time window begin and end times must be valid")
           else
-            invalid(definition, "#{scope} must be a hash")
+            invalid(definition, "#{scope} #{attribute} day time window must be a hash")
           end
         end
 
-        # Validate time windows
+        # Validate time windows days
         # Validates: days
         #
         # @param definition [Hash] sensu definition.
         # @param scope [String] definition scope to validate.
+        # @param attribute [String] definition attribute to validate.
         # @param days [String] time window days to validate.
-        def validate_time_windows_days(definition, scope, days)
+        def validate_time_windows_days(definition, scope, attribute, days)
           valid_days = [:all, :sunday, :monday, :tuesday, :wednesday, :thursday, :friday, :saturday]
           if must_be_either(valid_days, days.keys)
             days.each do |day, conditions|
               if is_an_array?(conditions)
-                conditions.each do |condition|
-                  validate_time_window_condition(definition, scope, condition)
+                if !conditions.empty?
+                  conditions.each do |condition|
+                    validate_time_window_condition(definition, scope, attribute, condition)
+                  end
+                else
+                  invalid(definition, "#{scope} #{attribute} days #{day} must include at least one time window")
                 end
               else
-                invalid(definition, "#{scope} #{day} time windows must be in an array")
+                invalid(definition, "#{scope} #{attribute} days #{day} must be in an array")
               end
             end
           else
-            invalid(definition, "#{scope} days must be valid days of the week or 'all'")
+            invalid(definition, "#{scope} #{attribute} days must be valid days of the week or 'all'")
           end
         end
 
@@ -47,16 +51,21 @@ module Sensu
         #
         # @param definition [Hash] sensu definition.
         # @param scope [String] definition scope to validate.
-        def validate_time_windows(definition, scope)
-          if is_a_hash?(definition[scope])
-            days = definition[scope][:days]
-            must_be_a_hash_if_set(days) ||
-              invalid(definition, "#{scope} days must be a hash")
+        # @param attribute [String] definition attribute to validate.
+        def validate_time_windows(definition, scope, attribute)
+          if is_a_hash?(definition[attribute])
+            days = definition[attribute][:days]
             if is_a_hash?(days)
-              validate_time_windows_days(definition, scope, days)
+              if !days.empty?
+                validate_time_windows_days(definition, scope, attribute, days)
+              else
+                invalid(definition, "#{scope} #{attribute} days must include at least one day of the week or 'all'")
+              end
+            else
+              invalid(definition, "#{scope} #{attribute} days must be a hash")
             end
           else
-            invalid(definition, "#{scope} must be a hash")
+            invalid(definition, "#{scope} #{attribute} must be a hash")
           end
         end
       end

data/sensu-settings.gemspec

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

data/spec/validator_spec.rb

@@ -278,7 +278,7 @@ describe "Sensu::Settings::Validator" do
       :days => {}
     }
     @validator.validate_check(check)
-    expect(@validator.reset).to eq(0)
+    expect(@validator.reset).to eq(1)
     check[:subdue] = {
       :days => {
         :nope => {}
@@ -306,7 +306,7 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.validate_check(check)
-    expect(@validator.reset).to eq(0)
+    expect(@validator.reset).to eq(1)
     check[:subdue] = {
       :days => {
         :all => [true]
@@ -314,6 +314,17 @@ describe "Sensu::Settings::Validator" do
     }
     @validator.validate_check(check)
     expect(@validator.reset).to eq(1)
+    check[:subdue] = {
+      :days => {
+        :all => [
+          {
+            :begin => "5:00 PM"
+          }
+        ]
+      }
+    }
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
     check[:subdue] = {
       :days => {
         :all => [
@@ -392,7 +403,7 @@ describe "Sensu::Settings::Validator" do
       :days => {}
     }
     @validator.validate_filter(filter)
-    expect(@validator.reset).to eq(0)
+    expect(@validator.reset).to eq(1)
     filter[:when] = {
       :days => {
         :nope => {}
@@ -420,7 +431,7 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.validate_filter(filter)
-    expect(@validator.reset).to eq(0)
+    expect(@validator.reset).to eq(1)
     filter[:when] = {
       :days => {
         :all => [true]
@@ -428,6 +439,17 @@ describe "Sensu::Settings::Validator" do
     }
     @validator.validate_filter(filter)
     expect(@validator.reset).to eq(1)
+    filter[:when] = {
+      :days => {
+        :all => [
+          {
+            :begin => "5:00 PM"
+          }
+        ]
+      }
+    }
+    @validator.validate_filter(filter)
+    expect(@validator.reset).to eq(1)
     filter[:when] = {
       :days => {
         :all => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.1.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json