kennel 1.116.1 → 1.117.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49677de3c690744756d70810dbe71c49cb0313014c5c325af21aa161463738bc
-  data.tar.gz: c52c465238c8043ba7a735712dcaf73edd589875b680b7f45f235477c696cff2
+  metadata.gz: 0cb7a96d8fed145f6db8ab76ee7cac6287f24af57ee8bc785707830548e07a76
+  data.tar.gz: '076522890c0d40993b8f6a676e106da15b145df4e3361e851f7bc70d38ed096c'
 SHA512:
-  metadata.gz: 50968ff4039145263ea380d790ebd8d757afb96bd2966a8b7dddf5a58373dbf3fd2e13f0576ad44bf42ceecd7086095865d4edc7c85bc5df1b1f9cc7b9757638
-  data.tar.gz: 7facba1805b0d2690b4081e18d46d314161544326a8e2e772bd17284c9065d7a8d50431690ca7562425510b9a12db70726453e3a4296aac6cbfd00d3e6954172
+  metadata.gz: 18c8879eaa8aff627087b164156127ac6358060985e1adb79d1a8fe9994b23647d17fe629bdd99fb8c2410f8685c17500e4a890611dd5d028f43185caef1e0e8
+  data.tar.gz: 1ab7202e9152b7e71aee2d40b42b3fdf91ea2c2af5290152f147254895e79c83b40da015efef7e5b8855b72fe49cde96c0c4e127ba80108a388966ccae4dbe39

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 "kennel-file-cache", dir 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/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.116.1"
+  VERSION = "1.117.1"
 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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.116.1
+  version: 1.117.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-30 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