kennel 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb95ceae817bc98d083407c5a6b19483e12e1932a98209c13fd097cd9bcf7ebd
-  data.tar.gz: 1a0c92f146ab14ffe80bccc86cb12f1561e8d874faefbe7f48f550a4c108cb6e
+  metadata.gz: fb759ae2d81d962a137b9ff0485135f0995cf4e31542f0ab4f284eef9ea1c109
+  data.tar.gz: d1fafb3a5d44c746280967f752e4eb124510a823c7ac2bd51ca2e935517afbb6
 SHA512:
-  metadata.gz: 2b43e7160e79a8174ae60d929d998322cfda2730116500ce8e6ddbfd4114c2217b0d75c5f326ffafbc94c5976155810a858f6d43423430223fa9325207373a75
-  data.tar.gz: b9c53626a278cea303b617ec12f792f89b5a5ca858a20dd75f244367a38065ed436e5309184b04e8c5ba5f7060a5c5dab472837b2729c2313ab6cb730d6f0bef
+  metadata.gz: bf576a0739a2cb98e7098c71bbf222d202766dbb479f9fd3c7b13bc0561b3f699cd1396faf4ef070c34be3bbed102aa8f8ca153d6c8c2c43e4767d945fe8df13
+  data.tar.gz: 2f2de90e0ad97900b86d92b168c1065f0128c15a0039eec3f4e611364e650a9faff20c4f6890b375fa15b3321c3e399d4a7a76fd648bcf56083675599ecb9c14

data/lib/kennel/models/dashboard.rb

@@ -208,9 +208,10 @@ module Kennel
         end
       end
 
-      def validate_update!(diffs)
-        _, path, from, to = diffs.find { |diff| diff[1] == "layout_type" }
-        invalid_update!(path, from, to) if path
+      def allowed_update_error(actual)
+        actual_type = actual[:layout_type]
+        return if actual_type == layout_type
+        "cannot update layout_type from #{actual_type} to #{layout_type}"
       end
 
       private

data/lib/kennel/models/monitor.rb

@@ -180,12 +180,11 @@ module Kennel
         end
       end
 
-      def validate_update!(diffs)
-        # ensure type does not change, but not if it's metric->query which is supported and used by importer.rb
-        _, path, from, to = diffs.detect { |_, path, _, _| path == "type" }
-        if path && !(from == "metric alert" && to == "query alert")
-          invalid_update!(path, from, to)
-        end
+      # ensure type does not change, but not if it's metric->query which is supported and used by importer.rb
+      def allowed_update_error(actual)
+        actual_type = actual[:type]
+        return if actual_type == type || (actual_type == "metric alert" && type == "query alert")
+        "cannot update type from #{actual_type} to #{type}"
       end
 
       def self.api_resource

data/lib/kennel/models/record.rb

@@ -142,12 +142,8 @@ module Kennel
         @as_json
       end
 
-      # Can raise DisallowedUpdateError
-      def validate_update!(_diffs)
-      end
-
-      def invalid_update!(field, old_value, new_value)
-        raise DisallowedUpdateError, "#{safe_tracking_id} Datadog does not allow update of #{field} (#{old_value.inspect} -> #{new_value.inspect})"
+      def allowed_update_error(_a)
+        nil
       end
 
       # For use during error handling

data/lib/kennel/syncer/matched_expected.rb

@@ -36,7 +36,13 @@ module Kennel
 
         def matching_expected(a, map)
           klass = a.fetch(:klass)
-          map["#{klass.api_resource}:#{a.fetch(:id)}"] || map[a.fetch(:tracking_id)]
+          full_id = "#{klass.api_resource}:#{a.fetch(:id)}"
+          if (e = map[full_id]) # we try to update and the user has set the id
+            return e unless (error = e.allowed_update_error(a))
+            raise DisallowedUpdateError, "#{full_id} Datadog does not allow update: #{error}"
+          elsif (e = map[a.fetch(:tracking_id)])
+            e.allowed_update_error(a) ? nil : e # force a re-create if we can't update
+          end
         end
       end
     end

data/lib/kennel/syncer/plan_printer.rb

@@ -12,9 +12,9 @@ module Kennel
         if plan.empty?
           Kennel.out.puts Console.color(:green, "Nothing to do")
         else
+          print_changes "Delete", plan.deletes, :red
           print_changes "Create", plan.creates, :green
           print_changes "Update", plan.updates, :yellow
-          print_changes "Delete", plan.deletes, :red
         end
       end
 

data/lib/kennel/syncer.rb

@@ -20,7 +20,6 @@ module Kennel
 
       @resolver = Resolver.new(expected: expected, filter: filter)
       @plan = Plan.new(*calculate_changes(expected: expected, actual: actual))
-      validate_changes
     end
 
     def print_plan
@@ -126,27 +125,19 @@ module Kennel
     # if there is a new item that has the same name or title as an "to be deleted" item,
     # update it instead to avoid old urls from becoming invalid
     # - careful with unmatched_actual being huge since it has all api resources
-    # - don't do it when a monitor type is changing since that would block the update
-    # - don't do it when a dashboard layout_type is changing since that would block the update
-    # - when using a filter and updating the kennel_id of an existing item, old and new must be in the filter
+    # - don't do it when update is not allowed
+    # - when using a filter and updating the kennel_id of an existing item, old and new must be in the filter (PROJECT= works, but not TRACKING_ID)
     def convert_replace_into_update!(matching, unmatched_actual, unmatched_expected)
       unmatched_expected.reject! do |e|
-        e_field, e_value = Kennel::Models::Record::TITLE_FIELDS.detect do |field|
-          next unless (value = e.as_json[field])
-          break [field, value]
-        end
-        raise unless e_field #  uncovered: should never happen ...
-        # TODO: ideally reuse invalid_update! logic and just put the fields somewhere
-        e_monitor_type = e.as_json[:type]
-        e_dashboard_layout_type = e.as_json[:layout_type]
-
+        # find actual by title
+        e_field, e_value = title_field_and_value(e)
         actual = unmatched_actual.detect do |a|
           a[:klass].api_resource == e.class.api_resource &&
-            a[e_field] == e_value &&
-            a[:type] == e_monitor_type &&
-            a[:layout_type] == e_dashboard_layout_type
+            a[e_field] == e_value
         end
-        next false unless actual # keep in unmatched
+
+        # keep unmatched if we could not find or can't update
+        next false if !actual || e.allowed_update_error(actual)
 
         # add as update and remove from unmatched
         unmatched_actual.delete(actual)
@@ -156,6 +147,14 @@ module Kennel
       end
     end
 
+    def title_field_and_value(e)
+      Kennel::Models::Record::TITLE_FIELDS.detect do |field|
+        next unless (value = e.as_json[field])
+        return [field, value]
+      end
+      raise # uncovered: should never happen ...
+    end
+
     # fill details of things we need to compare
     def fill_details!(details_needed)
       details_needed = details_needed.map { |e, a| a if e && e.class.api_resource == "dashboard" }.compact
@@ -175,14 +174,6 @@ module Kennel
       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_changes
-      @plan.updates.each do |item|
-        item.expected.validate_update!(item.diff)
-      end
-    end
-
     def filter_actual!(actual)
       return unless filter.filtering? # minor optimization
 

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -143,7 +143,10 @@ module Kennel
     def definitions(**kwargs)
       @definitions ||= Progress.progress("Downloading definitions", **kwargs) do
         Utils.parallel(Models::Record.subclasses) do |klass|
-          api.list(klass.api_resource, with_downtimes: false) # lookup monitors without adding unnecessary downtime information
+          # lookup monitors without adding unnecessary downtime information
+          params = (klass.api_resource == "monitor" ? { with_downtimes: false } : {})
+
+          api.list(klass.api_resource, params)
         end.flatten(1)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs