kennel 1.116.0 → 1.117.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 593a47b9f5fd48c679f9980ce91e3c70e0255e6431412882b502b646ac68a6bb
-  data.tar.gz: f4db29cc39cfea1f06d7e46db25f41c164ee7396a9739765750d4172adb8e7b0
+  metadata.gz: 83531b8281e71f8a5f8e307320c81f2ecf4c320da617c27777b08325f1394ed1
+  data.tar.gz: 1d3bce11c52a35f07a48546d37147213a8ca407e7e30710a8efaedc59be8dcd5
 SHA512:
-  metadata.gz: 89183dd1763b2387b67f82b08e99433fdaf237a30dd89795dd97e338a17a7fc5109bac860b2ade4e0839b4f9a058d772e489fee670202b564ee1e883999b648e
-  data.tar.gz: 91da9b2df7e862bd7926cca5e7db1e97ffe02ad334e888b3ba51ee31ac41370c10934d2d4e1b5223e4f0f6d9e71ee1ba655f51b10fdfba4b02f677fc8fafd445
+  metadata.gz: fddea7652c95c90fb529520ab1422f8a8dca9d27f3fd05dd6d3abb0892e831c1fb91af4455b77eba748cd635f86537d19b473eacd2004721ce0717e342efc25d
+  data.tar.gz: 537d25042eb17f6a86a65edba83e57001f1da160eacad93478062aec665cdad2798040a946b21bab53818fec2bed6089d1f15b22ca5fddc15e85fc5f1aa0d036

data/lib/kennel/file_cache.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "tempfile"
+
 # cache that reads everything from a single file
 # - avoids doing multiple disk reads while iterating all definitions
 # - has a global expiry to not keep deleted resources forever
@@ -44,7 +46,11 @@ module Kennel
     def persist
       dir = File.dirname(@file)
       FileUtils.mkdir_p(dir) unless File.directory?(dir)
-      File.write(@file, Marshal.dump(@data))
+
+      Tempfile.create do |tmp|
+        Marshal.dump @data, tmp
+        File.rename tmp.path, @file
+      end
     end
 
     # keep the cache small to make loading it fast (5MB ~= 100ms)

data/lib/kennel/syncer.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+
+require "diff/lcs"
+
 module Kennel
   class Syncer
     DELETE_ORDER = ["dashboard", "slo", "monitor", "synthetics/tests"].freeze # dashboards references monitors + slos, slos reference monitors
@@ -196,16 +199,22 @@ module Kennel
 
     def print_diff(diff)
       diff.each do |type, field, old, new|
+        use_diff = false
         if type == "+"
           temp = Utils.pretty_inspect(new)
           new = Utils.pretty_inspect(old)
           old = temp
+        elsif old.is_a?(String) && new.is_a?(String) && (old.include?("\n") || new.include?("\n"))
+          use_diff = true
         else # ~ and -
           old = Utils.pretty_inspect(old)
           new = Utils.pretty_inspect(new)
         end
 
-        if (old + new).size > 100
+        if use_diff
+          Kennel.out.puts "  #{type}#{field}"
+          Kennel.out.puts(diff(old, new).map { |l| "    #{l}" })
+        elsif (old + new).size > 100
           Kennel.out.puts "  #{type}#{field}"
           Kennel.out.puts "    #{old} ->"
           Kennel.out.puts "    #{new}"
@@ -215,6 +224,26 @@ module Kennel
       end
     end
 
+    # display diff for multi-line strings
+    # must stay readable when color is off too
+    def diff(old, new)
+      Diff::LCS.sdiff(old.split("\n", -1), new.split("\n", -1)).flat_map do |diff|
+        case diff.action
+        when "-"
+          Utils.color(:red, "- #{diff.old_element}")
+        when "+"
+          Utils.color(:green, "+ #{diff.new_element}")
+        when "!"
+          [
+            Utils.color(:red, "- #{diff.old_element}"),
+            Utils.color(:green, "+ #{diff.new_element}")
+          ]
+        else
+          "  #{diff.old_element}"
+        end
+      end
+    end
+
     # We've already validated the desired objects ('generated') in isolation.
     # Now that we have made the plan, we can perform some more validation.
     def validate_plan

data/lib/kennel/utils.rb

@@ -113,7 +113,7 @@ module Kennel
               done[i] =
                 begin
                   yield item
-                rescue StandardError => e
+                rescue Exception => e # rubocop:disable Lint/RescueException
                   work.clear
                   e
                 end
@@ -121,7 +121,7 @@ module Kennel
           end
         end
         workers.each(&:join)
-        done.each { |d| raise d if d.is_a?(StandardError) }
+        done.each { |d| raise d if d.is_a?(Exception) }
       end
 
       def natural_order(name)

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -138,8 +138,12 @@ module Kennel
     end
 
     def project_filter
-      raise "either use PROJECT= or TRACKING_ID=" if ENV["PROJECT"] && ENV["TRACKING_ID"]
-      ENV["PROJECT"]&.split(",") || tracking_id_filter&.map { |id| id.split(":", 2).first }
+      projects = ENV["PROJECT"]&.split(",")
+      tracking_projects = tracking_id_filter&.map { |id| id.split(":", 2).first }
+      if projects && tracking_projects && projects != tracking_projects
+        raise "do not set PROJECT= when using TRACKING_ID="
+      end
+      projects || tracking_projects
     end
 
     def tracking_id_filter
@@ -164,6 +168,7 @@ module Kennel
       Dir.exist?("teams") && loader.push_dir("teams", namespace: Teams)
       Dir.exist?("parts") && loader.push_dir("parts")
       loader.setup
+      loader.eager_load # TODO: this should not be needed but we see hanging CI processes when it's not added
 
       # TODO: also auto-load projects and update expected path too
       ["projects"].each do |folder|

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.116.0
+  version: 1.117.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement