kennel 1.111.1 → 1.113.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a22d2d6a7199c2d5b565ad42834dc9634ec81fff3eaadf0bc1e31cff307c34fa
-  data.tar.gz: 4ccfa084a8118408b8126fb125c24641741274225817d1fefb593ae69dd0f7b6
+  metadata.gz: b199d98b445f146f6e5ac3a2746d715c4286a75da4ddd9cf2268875e41a4f7f4
+  data.tar.gz: cc748229520b855819210413905525b962b7ea21ff13053258a011f59abaf001
 SHA512:
-  metadata.gz: ad4d3c2ea98b94a4a178c95b34b4a30ba0bfb66a96ce07f2bbbef2e184abce14a4e509062fd73894f3204f6509ef1a53c05f64d0e2b97d4e8528372b25c667d1
-  data.tar.gz: 0fd84a01af923c6b57b05ad6ad7f7577a30d695d98f1936e65e470ffb41b0b35cdbe5704b7d9526fa86291b230e2a5855ba028c04d6e51328b8f07baf0078357
+  metadata.gz: a26a733f32e1b0c167d950d4da1c8deb69717306e6428636e2b5ab03b450eb6db6f6797eb3a054a66083b91d351a6ca875703255cea2adec62f6022452d1e90c
+  data.tar.gz: cedb46594f03b8e2ebf89915f4bd8945f0378b51808e36460b5af8c7b44266e1661de771acb6febaffa2ca1226b88a533fccbea870e47e025b30677b7f91f5a4

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/record.rb

@@ -8,6 +8,9 @@ module Kennel
         :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at,
         :klass, :tracking_id # added by syncer.rb
       ].freeze
+      ALLOWED_KENNEL_ID_CHARS = "a-zA-Z_\\d.-"
+      ALLOWED_KENNEL_ID_FULL = "[#{ALLOWED_KENNEL_ID_CHARS}]+:[#{ALLOWED_KENNEL_ID_CHARS}]+"
+      ALLOWED_KENNEL_ID_REGEX = /\A#{ALLOWED_KENNEL_ID_FULL}\z/.freeze
 
       settings :id, :kennel_id
 
@@ -25,7 +28,7 @@ module Kennel
         end
 
         def parse_tracking_id(a)
-          a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (\S+:\S+)/, 1]
+          a[self::TRACKING_FIELD].to_s[/-- Managed by kennel (#{ALLOWED_KENNEL_ID_FULL})/, 1]
         end
 
         # TODO: combine with parse into a single method or a single regex
@@ -76,7 +79,9 @@ module Kennel
       def tracking_id
         @tracking_id ||= begin
           id = "#{project.kennel_id}:#{kennel_id}"
-          raise ValidationError, "#{id} kennel_id cannot include whitespace" if id.match?(/\s/) # <-> parse_tracking_id
+          unless id.match?(ALLOWED_KENNEL_ID_REGEX) # <-> parse_tracking_id
+            raise ValidationError, "#{id} must match #{ALLOWED_KENNEL_ID_REGEX}"
+          end
           id
         end
       end
@@ -104,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/utils.rb

@@ -149,7 +149,7 @@ module Kennel
       # TODO: use awesome-print or similar, but it has too many monkey-patches
       # https://github.com/amazing-print/amazing_print/issues/36
       def pretty_inspect(object)
-        string = object.inspect
+        string = object.inspect.dup
         string.gsub!(/:([a-z_]+)=>/, "\\1: ")
         10.times do
           string.gsub!(/{(\S.*?\S)}/, "{ \\1 }") || break

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.111.1"
+  VERSION = "1.113.0"
 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
@@ -127,6 +129,11 @@ 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
+          # somehow threading helps reduce this ~25%
+          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.111.1
+  version: 1.113.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Keep datadog monitors/dashboards/etc in version control, avoid chaotic management