kennel 1.127.0 → 1.128.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec72f834db1c82d19ba21eabd482e5f46a540b0c9a3e0e51ecc20a80c192a6d7
-  data.tar.gz: c5b549fb934ce3e274d88149df509b4dcf16e1adc6be3271e94b3101dbee1ad7
+  metadata.gz: d27f0b47987630640f1d58181bc98360714dc4b39827ea7282d1445496e3d315
+  data.tar.gz: a2dbe1c762943b8859134772f39e3f0af0f4e7e2c5c1a60c2de980574de84714
 SHA512:
-  metadata.gz: e0bff1a22428c19da30025f79e8e7904675ea27d79eb2cfdf1a6cf0638a33efbdee44c10f898480b9e7d91d73296368e3bab58ce495282beb43cb13c975c9153
-  data.tar.gz: 445cf62d6e525c42808a42ba80e941829cab5c679ef74f71590799ec46e93f3d41ff8162bed775342510c042249a2acfaf10dea06507a2b5f7a7b0c8a450fb3c
+  metadata.gz: 6c16b16c0914e6c436424c431eec9b5b0ff5dcb92195096973e1807c75375e34f16094c4935c28de6a0797ebb8d5cc5a8e86a9c38f4a778df65598ede58ad348
+  data.tar.gz: d885678eb185f3fa404d8c42c64f3c7f22250da1537ecec556d5f9728fe9a6aa7d7fb889f9c8d637c4f29787864f05ec5a51c5abb90023fde1c71a0110a24dd5

data/lib/kennel/progress.rb

@@ -4,8 +4,8 @@ require "benchmark"
 module Kennel
   class Progress
     # print what we are doing and a spinner until it is done ... then show how long it took
-    def self.progress(name, interval: 0.2, &block)
-      return progress_no_tty(name, &block) unless Kennel.err.tty?
+    def self.progress(name, interval: 0.2, plain: false, &block)
+      return progress_no_tty(name, &block) if plain || !Kennel.err.tty?
 
       Kennel.err.print "#{name} ... "
 

data/lib/kennel/syncer.rb

@@ -10,12 +10,13 @@ module Kennel
     Plan = Struct.new(:changes, keyword_init: true)
     Change = Struct.new(:type, :api_resource, :tracking_id, :id)
 
-    def initialize(api, expected, kennel:, project_filter: nil, tracking_id_filter: nil)
+    def initialize(api, expected, actual, kennel:, project_filter: nil, tracking_id_filter: nil)
       @api = api
       @kennel = kennel
       @project_filter = project_filter
       @tracking_id_filter = tracking_id_filter
       @expected = Set.new expected # need set to speed up deletion
+      @actual = actual
       calculate_diff
       validate_plan
       prevent_irreversible_partial_updates
@@ -53,7 +54,7 @@ module Kennel
         message = "#{e.class.api_resource} #{e.tracking_id}"
         Kennel.out.puts "Creating #{message}"
         reply = @api.create e.class.api_resource, e.as_json
-        cache_metadata reply, e.class
+        Utils.inline_resource_metadata reply, e.class
         id = reply.fetch(:id)
         changes << Change.new(:create, e.class.api_resource, e.tracking_id, id)
         populate_id_map [], [reply] # allow resolving ids we could previously no resolve
@@ -125,17 +126,15 @@ module Kennel
       @delete = []
       @id_map = IdMap.new
 
-      actual = Progress.progress("Downloading definitions") { download_definitions }
-
       Progress.progress "Diffing" do
-        populate_id_map @expected, actual
-        filter_actual! actual
+        populate_id_map @expected, @actual
+        filter_actual! @actual
         resolve_linked_tracking_ids! @expected # resolve dependencies to avoid diff
 
         @expected.each(&:add_tracking_id) # avoid diff with actual
 
         lookup_map = matching_expected_lookup_map
-        items = actual.map do |a|
+        items = @actual.map do |a|
           e = matching_expected(a, lookup_map)
           if e && @expected.delete?(e)
             [e, a]
@@ -168,19 +167,6 @@ module Kennel
       end
     end
 
-    def download_definitions
-      Utils.parallel(Models::Record.subclasses) do |klass|
-        results = @api.list(klass.api_resource, with_downtimes: false) # lookup monitors without adding unnecessary downtime information
-        results = results[results.keys.first] if results.is_a?(Hash) # dashboards are nested in {dashboards: []}
-        results.each { |a| cache_metadata(a, klass) }
-      end.flatten(1)
-    end
-
-    def cache_metadata(a, klass)
-      a[:klass] = klass
-      a[:tracking_id] = a.fetch(:klass).parse_tracking_id(a)
-    end
-
     def ensure_all_ids_found
       @expected.each do |e|
         next unless id = e.id

data/lib/kennel/tasks.rb

@@ -101,8 +101,11 @@ namespace :kennel do
   end
 
   # also generate parts so users see and commit updated generated automatically
+  # (generate must run after plan to enable parallel .download+.generate inside of .plan)
   desc "show planned datadog changes (scope with PROJECT=name)"
-  task plan: :generate do
+  task plan: :environment do
+    Kennel::Tasks.kennel.preload
+    Kennel::Tasks.kennel.generate
     Kennel::Tasks.kennel.plan
   end
 

data/lib/kennel/utils.rb

@@ -160,6 +160,11 @@ module Kennel
         end
         string
       end
+
+      def inline_resource_metadata(resource, klass)
+        resource[:klass] = klass
+        resource[:tracking_id] = klass.parse_tracking_id(resource)
+      end
     end
   end
 end

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -58,6 +58,11 @@ module Kennel
 
     attr_accessor :strict_imports
 
+    # start generation and download in parallel to make planning faster
+    def preload
+      Utils.parallel([:generated, :definitions]) { |m| send m, plain: true }
+    end
+
     def generate
       parts = generated
       parts_serializer.write(parts) if ENV["STORE"] != "false" # quicker when debugging
@@ -80,7 +85,10 @@ module Kennel
     end
 
     def syncer
-      @syncer ||= Syncer.new(api, generated, kennel: self, project_filter: filter.project_filter, tracking_id_filter: filter.tracking_id_filter)
+      @syncer ||= begin
+        preload
+        Syncer.new(api, generated, definitions, kennel: self, project_filter: filter.project_filter, tracking_id_filter: filter.tracking_id_filter)
+      end
     end
 
     def api
@@ -95,9 +103,9 @@ module Kennel
       @parts_serializer ||= PartsSerializer.new(filter: filter)
     end
 
-    def generated
+    def generated(**kwargs)
       @generated ||= begin
-        parts = Progress.progress "Finding parts" do
+        parts = Progress.progress "Finding parts", **kwargs do
           projects = projects_provider.projects
           projects = filter.filter_projects projects
 
@@ -123,5 +131,14 @@ module Kennel
         parts
       end
     end
+
+    def definitions(**kwargs)
+      @definitions ||= Progress.progress("Downloading definitions", **kwargs) do
+        Utils.parallel(Models::Record.subclasses) do |klass|
+          results = api.list(klass.api_resource, with_downtimes: false) # lookup monitors without adding unnecessary downtime information
+          results.each { |a| Utils.inline_resource_metadata(a, klass) }
+        end.flatten(1)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.127.0
+  version: 1.128.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs