kennel 1.112.1 → 1.113.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4afd2070d0b8c2097b1e67b0ad6b1f72928058370066d463da37f4b3340d903a
-  data.tar.gz: b11721c83b65f8af2749faef9a967691fafe235e85214fa15163b4341b00d928
+  metadata.gz: adf4f9d7bbb7ca7762d12c2dfc2f77faf2ad22dd5ea0179130ac793d56d66b06
+  data.tar.gz: 6346728be4090edba0d00b8830517ac8e9ca3df4c16255638520b4133fcaff14
 SHA512:
-  metadata.gz: 8d75553fdb2b17fc63e4cac6f7b56290d25756848109b4bc015125e1369cfbb624c270d46f108f502c2dca6c55de64bc2d63c606d8b259f3f97fe7bba7b7700f
-  data.tar.gz: f63b3f9d0a4d273f189ae55d50e4e477bf7a7ca4a88474a97771592ede2080b6a4ab3aa815a76def48951d43b092db5eb880dd64acce0de69bcb51aa1c1d0e32
+  metadata.gz: 7fc4b90e41dcaafa071fe13b2a7324f9fa0d2ea5d5041d75e6d8e2afbd5b8ab85106ed715964b717282beefe4fa6aeb442ff7721fde5d727343aba1702b85e39
+  data.tar.gz: 948288a0179b596477b7034ee03341d34ff1d8fd0f3be5f53a9fdb6a8c9a3892d10e50aa1b2aab843f77e1449066c0192e178cd3cb5b0083d6f9f4a0dddfe248

data/Readme.md

@@ -307,7 +307,8 @@ https://foo.datadog.com/monitor/123
 ## Development
 
 ### Benchmarking
-Setting `FORCE_GET_CACHE=true` will cache all get requests, which makes benchmarking improvements more reliable.
+- Setting `FORCE_GET_CACHE=true` will cache all get requests, which makes benchmarking improvements more reliable.
+- Setting `STORE=false` will make `rake plan` not update the files on disk and save a bit of time
 
 ### Integration testing
 ```Bash

data/lib/kennel/models/monitor.rb

@@ -131,12 +131,15 @@ module Kennel
           as_json[:query] = as_json[:query].gsub(/%{(.*?)}/) do
             resolve($1, type, id_map, **args) || $&
           end
+        else # do nothing
         end
       end
 
       def validate_update!(_actuals, diffs)
-        if bad_diff = diffs.find { |diff| diff[1] == "type" }
-          invalid! "Datadog does not allow update of #{bad_diff[1]} (#{bad_diff[2].inspect} -> #{bad_diff[3].inspect})"
+        # 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! "Datadog does not allow update of #{path} (#{from.inspect} -> #{to.inspect})"
         end
       end
 
@@ -145,7 +148,7 @@ module Kennel
       end
 
       def self.url(id)
-        Utils.path_to_url "/monitors##{id}/edit"
+        Utils.path_to_url "/monitors/#{id}/edit"
       end
 
       def self.parse_url(url)

data/lib/kennel/models/record.rb

@@ -109,11 +109,8 @@ module Kennel
       private
 
       def resolve(value, type, id_map, force:)
-        if tracking_id?(value)
-          return resolve_link(value, type, id_map, force: force)
-        end
-
-        value
+        return value unless tracking_id?(value)
+        resolve_link(value, type, id_map, force: force)
       end
 
       def tracking_id?(id)

data/lib/kennel/models/slo.rb

@@ -68,8 +68,8 @@ module Kennel
       end
 
       def resolve_linked_tracking_ids!(id_map, **args)
-        return unless as_json[:monitor_ids] # ignore_default can remove it
-        as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
+        return unless ids = as_json[:monitor_ids] # ignore_default can remove it
+        as_json[:monitor_ids] = ids.map do |id|
           resolve(id, :monitor, id_map, **args) || id
         end
       end

data/lib/kennel/syncer.rb

@@ -7,7 +7,7 @@ module Kennel
     def initialize(api, expected, project_filter: nil)
       @api = api
       @project_filter = project_filter
-      @expected = expected
+      @expected = Set.new expected # need set to speed up deletion
       calculate_diff
       validate_plan
       prevent_irreversible_partial_updates
@@ -110,9 +110,10 @@ module Kennel
 
         @expected.each(&:add_tracking_id) # avoid diff with actual
 
+        lookup_map = matching_expected_lookup_map
         items = actual.map do |a|
-          e = matching_expected(a)
-          if e && @expected.delete(e)
+          e = matching_expected(a, lookup_map)
+          if e && @expected.delete?(e)
             [e, a]
           else
             [nil, a]
@@ -127,7 +128,7 @@ module Kennel
         items.each do |e, a|
           id = a.fetch(:id)
           if e
-            diff = e.diff(a)
+            diff = e.diff(a) # slow ...
             @update << [id, e, a, diff] if diff.any?
           elsif a.fetch(:tracking_id) # was previously managed
             @delete << [id, nil, a]
@@ -166,9 +167,9 @@ module Kennel
       end
     end
 
-    def matching_expected(a)
-      # index list by all the thing we look up by: tracking id and actual id
-      @lookup_map ||= @expected.each_with_object({}) do |e, all|
+    # index list by all the thing we look up by: tracking id and actual id
+    def matching_expected_lookup_map
+      @expected.each_with_object({}) do |e, all|
         keys = [e.tracking_id]
         keys << "#{e.class.api_resource}:#{e.id}" if e.id
         keys.compact.each do |key|
@@ -176,9 +177,11 @@ module Kennel
           all[key] = e
         end
       end
+    end
 
+    def matching_expected(a, map)
       klass = a.fetch(:klass)
-      @lookup_map["#{klass.api_resource}:#{a.fetch(:id)}"] || @lookup_map[a.fetch(:tracking_id)]
+      map["#{klass.api_resource}:#{a.fetch(:id)}"] || map[a.fetch(:tracking_id)]
     end
 
     def print_plan(step, list, color)

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -47,7 +47,9 @@ module Kennel
     attr_accessor :out, :err, :strict_imports
 
     def generate
-      store generated
+      out = generated
+      store out if ENV["STORE"] != "false" # quicker when debugging
+      out
     end
 
     def plan
@@ -106,7 +108,7 @@ module Kennel
           known = []
           filter = project_filter
 
-          parts = Models::Project.recursive_subclasses.flat_map do |project_class|
+          parts = Utils.parallel(Models::Project.recursive_subclasses) do |project_class|
             project = project_class.new
             kennel_id = project.kennel_id
             if filter
@@ -114,7 +116,7 @@ module Kennel
               next [] unless filter.include?(kennel_id)
             end
             project.validated_parts
-          end
+          end.flatten(1)
 
           if filter && parts.empty?
             raise "#{filter.join(", ")} does not match any projects, try any of these:\n#{known.uniq.sort.join("\n")}"
@@ -127,6 +129,10 @@ module Kennel
               use a different `kennel_id` when defining multiple projects/monitors/dashboards to avoid this conflict
             ERROR
           end
+
+          # trigger json caching here so it counts into generating
+          Utils.parallel(parts, &:as_json)
+
           parts
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.112.1
+  version: 1.113.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday