kennel 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12b86071e1e495725a1f4fe210c0a51ed8503bc8c1f8fdeae9cb3d1703335fd
-  data.tar.gz: cf352fce060f9547781ec6faae4387bb3e8e1486f6499e0f2841fe0b287f6460
+  metadata.gz: 572605900165245c9537fea47b745878290b7a4b7d8dd43bab4ca64734a0a896
+  data.tar.gz: 9c14dd660b67749199624c278e8a2e8560a1d3103cb01c07e96be67a591c7a8a
 SHA512:
-  metadata.gz: 52f1e980cb83c6249c03c455bb72b0d3675ac8d37088cf403a634b21d01546a9cab9ffc530045ef8d847b11bebd744a2234d23ceba84614f2d09ecf3296b1875
-  data.tar.gz: 7429f9056cefd2a83b21b810e8aae07033d10d61daee7d8b141e9c9a838b218ec513889cb4c8727508470ada5a1dab3e4ff07a5fe293773323512bab6a2342c1
+  metadata.gz: 8b7cfe486cad42e6dfe9ff81f4d8f006f84c3778a3c5b9a13f57ec9039120721a2488cc00b7d4de196ed2e5d3e77e32b7f9bc35c74149276bca4a52c2f50e193
+  data.tar.gz: 44a0db2b5dd65255ff5eb030d0a2b21a6ba9e8e7a9c359742a0d71c4a6ba19571295e9c67fa56887f9a12a42ec3bbdd810476f3f731a9af7797406866ec942ae

data/lib/kennel/models/base.rb

@@ -9,6 +9,14 @@ module Kennel
         :deleted, :matching_downtimes, :id, :created, :created_at, :creator, :org_id, :modified,
         :overall_state_modified, :overall_state, :api_resource
       ].freeze
+      REQUEST_DEFAULTS = {
+        style: { width: "normal", palette: "dog_classic", type: "solid" },
+        conditional_formats: [],
+        aggregator: "avg"
+      }.freeze
+
+      class ValidationError < RuntimeError
+      end
 
       class << self
         include SubclassTracking
@@ -55,7 +63,8 @@ module Kennel
           define_singleton_method name, &block
         end
 
-        @invocation_location = caller.detect { |l| l.start_with?(Dir.pwd) }
+        # need expand_path so it works wih rake and when run individually
+        @invocation_location = caller.detect { |l| File.expand_path(l).start_with?(Dir.pwd) }
       end
 
       def kennel_id
@@ -88,6 +97,26 @@ module Kennel
 
       private
 
+      # discard styles/conditional_formats/aggregator if nothing would change when we applied (both are default or nil)
+      def ignore_request_defaults(expected, actual, level1, level2)
+        expected[level1].each_with_index do |e_w, wi|
+          (e_w.dig(level2, :requests) || []).each_with_index do |e_r, ri|
+            next unless a_r = actual.dig(level1, wi, level2, :requests, ri) # skip newly added widgets/requests
+            REQUEST_DEFAULTS.each do |key, default|
+              if [a_r, e_r].all? { |r| r[key].nil? || r[key] == default }
+                a_r.delete(key)
+                e_r.delete(key)
+              end
+            end
+          end
+        end
+      end
+
+      # let users know which project/resource failed when something happens during diffing where the backtrace is hidden
+      def invalid!(message)
+        raise ValidationError, "#{tracking_id} #{message}"
+      end
+
       def validate_options(options)
         unless options.is_a?(Hash)
           raise ArgumentError, "Expected #{self.class.name}.new options to be a Hash, got a #{options.class}"

data/lib/kennel/models/dash.rb

@@ -51,6 +51,7 @@ module Kennel
         actual[:graphs].each do |g|
           g[:definition].delete(:status)
         end
+        ignore_request_defaults as_json, actual, :graphs, :definition
         super
       end
 
@@ -66,13 +67,13 @@ module Kennel
         queries = data[:graphs].flat_map { |g| g[:definition][:requests].map { |r| r.fetch(:q) } }
         bad = queries.grep_v(/(#{variables.map { |v| Regexp.escape(v) }.join("|")})\b/)
         if bad.any?
-          raise "#{tracking_id} queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}"
+          invalid! "queries #{bad.join(", ")} must use the template variables #{variables.join(", ")}"
         end
 
         # check for fields that are unsettable
         data[:graphs].each do |g|
           if g[:definition].key?(:status)
-            raise "#{tracking_id} remove definition status, it is unsettable and will always produce a diff"
+            invalid! "remove definition status, it is unsettable and will always produce a diff"
           end
         end
       end
@@ -99,7 +100,6 @@ module Kennel
         end + graphs
 
         all.each do |g|
-          g[:definition][:requests].each { |r| r[:conditional_formats] ||= [] }
           g[:definition][:autoscale] = true unless g[:definition].key?(:autoscale)
         end
       end

data/lib/kennel/models/monitor.rb

@@ -139,27 +139,27 @@ module Kennel
         type = data.fetch(:type)
 
         if type == "metric alert"
-          raise "#{tracking_id} type 'metric alert' is deprecated, do not set type to use the default 'query alert'"
+          invalid! "type 'metric alert' is deprecated, do not set type to use the default 'query alert'"
         end
 
         if type == "service check" && [ok, warning, critical].compact.map(&:class).uniq != [Integer]
-          raise "#{tracking_id} :ok, :warning and :critical must be integers for service check type"
+          invalid! ":ok, :warning and :critical must be integers for service check type"
         end
 
         if query_value = data.fetch(:query)[/\s*[<>]\s*(\d+(\.\d+)?)\s*$/, 1]
           if Float(query_value) != Float(data.dig(:options, :thresholds, :critical))
-            raise "#{tracking_id} critical and value used in query must match"
+            invalid! "critical and value used in query must match"
           end
         end
 
         unless RENOTIFY_INTERVALS.include? data.dig(:options, :renotify_interval)
-          raise "#{tracking_id} renotify_interval must be one of #{RENOTIFY_INTERVALS.join(", ")}"
+          invalid! "renotify_interval must be one of #{RENOTIFY_INTERVALS.join(", ")}"
         end
 
         if ["metric alert", "query alert"].include?(type)
           interval = data.fetch(:query)[/\(last_(\S+?)\)/, 1]
           unless QUERY_INTERVALS.include?(interval)
-            raise "#{tracking_id} query interval was #{interval}, but must be one of #{QUERY_INTERVALS.join(", ")}"
+            invalid! "query interval was #{interval}, but must be one of #{QUERY_INTERVALS.join(", ")}"
           end
         end
       end

data/lib/kennel/models/screen.rb

@@ -6,11 +6,6 @@ module Kennel
       include OptionalValidations
 
       API_LIST_INCOMPLETE = true
-      REQUEST_DEFAULTS = {
-        style: { width: "normal", palette: "dog_classic", type: "solid" },
-        conditional_formats: [],
-        aggregator: "avg"
-      }.freeze
 
       settings :id, :board_title, :description, :widgets, :kennel_id
 
@@ -70,18 +65,7 @@ module Kennel
           w.delete :isShared # copied value, can ignore
         end
 
-        # discard styles/conditional_formats/aggregator if nothing would change when we applied (both are default or nil)
-        as_json[:widgets].each_with_index do |e_w, wi|
-          (e_w.dig(:tile_def, :requests) || []).each_with_index do |e_r, ri|
-            next unless a_r = actual.dig(:widgets, wi, :tile_def, :requests, ri) # skip newly added widgets/requests
-            REQUEST_DEFAULTS.each do |key, default|
-              if [a_r, e_r].all? { |r| r[key].nil? || r[key] == default }
-                a_r.delete(key)
-                e_r.delete(key)
-              end
-            end
-          end
-        end
+        ignore_request_defaults as_json, actual, :widgets, :tile_def
 
         super
       end
@@ -97,7 +81,7 @@ module Kennel
         data[:widgets].each do |w|
           [:isShared, :board_id].each do |ignored|
             if w.key?(ignored)
-              raise "#{tracking_id} remove definition #{ignored}, it is unsettable and will always produce a diff"
+              invalid! "remove definition #{ignored}, it is unsettable and will always produce a diff"
             end
           end
         end

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday