kennel 2.18.0 → 2.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5be659ce41cece2b8c4ace52fc05c600fab7f4e528cacdf25d60521d4518ce
-  data.tar.gz: e8419e2a2b1acf30a67aba25d8d9d690e24f3474e9f37ed6710f20263f2dc1cb
+  metadata.gz: 3a3078b16009b136fcbc16ea73f8840db57aeb16e63c38faf3778207865693ea
+  data.tar.gz: 7f12c25f2388e145dd66fe59c808a97371248ad3848760152562b7637c07bb14
 SHA512:
-  metadata.gz: 3d4d47b8a727b91e1f407a1a775d5059b642eb70b50eb08654b01eff50abda2c9d0c5477f232f470be762f7c211b95a47d413c8ee13b1f1c9c59148f3497a2ef
-  data.tar.gz: c97e0cbc0aa26dc81d98d1a5bc0c39fc80831a9daa4a34745b203a277ef0d596382a7af4627ce01446ea855e50e78f5ccc964117928bc8964f7c19f1b3cc8e37
+  metadata.gz: 391adb884ea9df702d30af303787e4ec9a674ed37b4f4ff968f4e3fec286410d48cca6b12e45a25c493a63b22153628ac2c0233adf59f3f3c66323fe08e62a5e
+  data.tar.gz: 968dd89cc955d25bf46ce53310331ce280e7a24f98f100c51cc1b0d20607ab3884733d091c0b9865f7f3208e44a4e4290fdfc006a59b8f2be4c7898af628d409

data/Readme.md

@@ -487,6 +487,7 @@ rake kennel:tracking_id ID=123 RESOURCE=monitor
 | `KENNEL_API_CACHE_FILE` | Path to the API cache file for dashboard details. | `tmp/cache/details` |
 | `KENNEL_NO_GENERATE` | When set, skip generating files during `plan` or `update_datadog`. Useful when generated files are already up to date. | - |
 | `NO_IGNORED_ERRORS` | When set, show all validation errors including ones suppressed via `ignored_errors`. | - |
+| `SHOW_UNCACHED_FILL_DETAILS` | When set, print the number of uncached dashboard `show` requests made to fill details during diffing. | - |
 
 ### Integration testing
 ```Bash

data/lib/kennel/api.rb

@@ -74,7 +74,7 @@ module Kennel
     # fill the resource with the full response from the `show` if `list` does not return it
     def fill_details!(api_resource, list)
       details_cache do |cache|
-        Utils.parallel(list) { |a| fill_detail!(api_resource, a, cache) }
+        Utils.parallel(list) { |a| fill_detail!(api_resource, a, cache) }.sum
       end
     end
 
@@ -97,9 +97,14 @@ module Kennel
 
     # Make diff work even though we cannot mass-fetch definitions
     def fill_detail!(api_resource, a, cache)
+      uncached = 0
       args = [api_resource, a.fetch(:id)]
-      full = cache.fetch(args, a.fetch(:modified_at)) { show(*args) }
+      full = cache.fetch(args, a.fetch(:modified_at)) do
+        uncached += 1
+        show(*args)
+      end
       a.merge!(full)
+      uncached
     end
 
     def details_cache(&block)

data/lib/kennel/models/monitor.rb

@@ -357,7 +357,7 @@ module Kennel
         message = data.fetch(:message)
 
         used =
-          message.scan(/{{\s*(?:[#^]is(?:_exact)?_match)\s*"([^\s}]+)"/) + # {{#is_match "environment.name" "production"}}
+          message.scan(/{{\s*(?:[#^]is(?:_exact)?_match)\s*['"]([^\s}]+)['"]/) + # {{#is_match "environment.name" "production"}}
           message.scan(/{{\s*([^}]+\.name)\s*}}/) # Pod {{pod.name}} failed
         return if used.empty?
         used.flatten!(1)

data/lib/kennel/syncer.rb

@@ -93,7 +93,8 @@ module Kennel
         convert_replace_into_update!(matching, unmatched_actual, unmatched_expected)
 
         validate_expected_id_not_missing unmatched_expected
-        fill_details! matching # need details to diff later
+        uncached = fill_details! matching # need details to diff later
+        Kennel.out.puts "Uncached dashboard gets to fill details: #{uncached}" if ENV["SHOW_UNCACHED_FILL_DETAILS"]
 
         # update matching if needed
         updates = matching.map do |e, a|

data/lib/kennel/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.18.2
 platform: ruby
 authors:
 - Michael Grosser