kennel 1.26.1 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b53e1cf9ac40c2103047f10ba9c8abccbff06fcc21bff9af67e15ea3966193bf
-  data.tar.gz: 52726d8b021ffb2100ad9689d17a129523171e2ca5951a3a2248139f703e4391
+  metadata.gz: 0e5b0226f92f89c176e7591b3f3f1dc5fbccce47c540f28110d5860416b33e17
+  data.tar.gz: 1cdc34e2b90c0e99381d275747742661bc0828a649701f4490673e788d47341b
 SHA512:
-  metadata.gz: e98d4ce043700352cad069feb58217b889a4cf4bca1f12396f20a9cdc812af92eb64871458814775e3bd2f6929e7cf0a7d3150262a0211502937332e587f9b96
-  data.tar.gz: 146d9e9d4cf7b1d0c10d5707f83a2670f5f5d6deb5188c62c0c4e514be68ce950c0981fca2b0225a9fef56e280b3a6168bd07d0120f6aeedb829bfb520dc98fe
+  metadata.gz: 0af7a3063ed49c51634c0fec06e1b6749bc8aa30857f2c2135376c80799a10856ae44acc27fc91ddf21500f1e4069396cdcc886365291c789a35f459236cc0ac
+  data.tar.gz: 249d02adb861130b88ea1ad17e26f5b19ca95fb729c3b3af4ae7f473a5b6e65198faa57431670e54079289aa0f6497eab1917b1fdbbba996bed568bc25b8df01

data/lib/kennel/api.rb

@@ -33,13 +33,18 @@ module Kennel
       params = params.merge(application_key: @app_key, api_key: @api_key)
       query = Faraday::FlatParamsEncoder.encode(params)
       response = nil
+      tries = 2
 
-      2.times do |i|
-        response = @client.send(method, "#{path}?#{query}") do |request|
-          request.body = JSON.generate(body) if body
-          request.headers["Content-type"] = "application/json"
+      tries.times do |i|
+        response = Utils.retry Faraday::ConnectionFailed, times: 2 do
+          @client.send(method, "#{path}?#{query}") do |request|
+            request.body = JSON.generate(body) if body
+            request.headers["Content-type"] = "application/json"
+          end
         end
-        break if i == 1 || method != :get || response.status < 500
+
+        break if i == tries - 1 || method != :get || response.status < 500
+        Kennel.err.puts "Retrying on server error #{response.status} for #{path}"
       end
 
       unless response.success?

data/lib/kennel/models/dash.rb

@@ -70,6 +70,8 @@ module Kennel
       private
 
       def validate_json(data)
+        super
+
         # check for bad variables
         # TODO: do the same check for apm_query and their group_by
         variables = (data[:template_variables] || []).map { |v| "$#{v.fetch(:name)}" }

data/lib/kennel/models/monitor.rb

@@ -151,6 +151,8 @@ module Kennel
       end
 
       def validate_json(data)
+        super
+
         type = data.fetch(:type)
 
         # do not allow deprecated type that will be coverted by datadog and then produce a diff

data/lib/kennel/models/screen.rb

@@ -100,6 +100,8 @@ module Kennel
       private
 
       def validate_json(data)
+        super
+
         # check for fields that are unsettable
         data[:widgets].each do |w|
           COPIED_WIDGET_VALUES.each do |ignored|

data/lib/kennel/optional_validations.rb

@@ -5,5 +5,22 @@ module Kennel
       base.settings :validate
       base.defaults(validate: -> { true })
     end
+
+    # https://stackoverflow.com/questions/20235206/ruby-get-all-keys-in-a-hash-including-sub-keys/53876255#53876255
+    def self.all_keys(items)
+      case items
+      when Hash then items.keys + items.values.flat_map { |v| all_keys(v) }
+      when Array then items.flat_map { |i| all_keys(i) }
+      else []
+      end
+    end
+
+    private
+
+    def validate_json(data)
+      bad = OptionalValidations.all_keys(data).grep_v(Symbol)
+      return if bad.empty?
+      invalid! "only use Symbols to avoid permanent diffs (#{bad.map(&:inspect).join(", ")})"
+    end
   end
 end

data/lib/kennel/utils.rb

@@ -114,6 +114,15 @@ module Kennel
       def natural_order(name)
         name.split(/(\d+)/).each_with_index.map { |x, i| i.odd? ? x.to_i : x }
       end
+
+      def retry(*errors, times:)
+        yield
+      rescue *errors => e
+        times -= 1
+        raise if times < 0
+        Kennel.err.puts "Error #{e}, #{times} retries left"
+        retry
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.27.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday