kennel 1.126.0 → 1.127.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8254e03670c1874a6f9b85da5fe453200cdcd9aabe2f82dafc424a6301d8416
-  data.tar.gz: 2d1c0b444762941f79fcba893f5cddc9d0119138c5cf0fc04d6fc871f2caf7a8
+  metadata.gz: ec72f834db1c82d19ba21eabd482e5f46a540b0c9a3e0e51ecc20a80c192a6d7
+  data.tar.gz: c5b549fb934ce3e274d88149df509b4dcf16e1adc6be3271e94b3101dbee1ad7
 SHA512:
-  metadata.gz: 32c9cbe7957e0f0652180d9b743e4498f3624231e96907f2aaafe5889b9d2f5cfcac98b21dce058c7e06cd6b719ae21b91d01b478eb21028a333b6e0383732a1
-  data.tar.gz: '068566cb8e89e9c9d993ed451cd174a301ce3976c2240aa8c12c1ebf20b602b9cf245b0eb28267dc9263930ad4659163cb75fee67af1d9c1094a649129fb7e17'
+  metadata.gz: e0bff1a22428c19da30025f79e8e7904675ea27d79eb2cfdf1a6cf0638a33efbdee44c10f898480b9e7d91d73296368e3bab58ce495282beb43cb13c975c9153
+  data.tar.gz: 445cf62d6e525c42808a42ba80e941829cab5c679ef74f71590799ec46e93f3d41ff8162bed775342510c042249a2acfaf10dea06507a2b5f7a7b0c8a450fb3c

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, plain: false, &block)
-      return progress_no_tty(name, &block) if plain || !Kennel.err.tty?
+    def self.progress(name, interval: 0.2, &block)
+      return progress_no_tty(name, &block) unless Kennel.err.tty?
 
       Kennel.err.print "#{name} ... "
 

data/lib/kennel/syncer.rb

@@ -10,13 +10,12 @@ module Kennel
     Plan = Struct.new(:changes, keyword_init: true)
     Change = Struct.new(:type, :api_resource, :tracking_id, :id)
 
-    def initialize(api, expected, actual, kennel:, project_filter: nil, tracking_id_filter: nil)
+    def initialize(api, expected, 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
@@ -54,7 +53,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
-        Utils.inline_resource_metadata reply, e.class
+        cache_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
@@ -126,15 +125,17 @@ 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]
@@ -167,6 +168,19 @@ 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

@@ -102,9 +102,8 @@ namespace :kennel do
 
   # also generate parts so users see and commit updated generated automatically
   desc "show planned datadog changes (scope with PROJECT=name)"
-  task plan: :environment do
+  task plan: :generate do
     Kennel::Tasks.kennel.plan
-    Kennel::Tasks.kennel.generate
   end
 
   desc "update datadog (scope with PROJECT=name)"

data/lib/kennel/utils.rb

@@ -160,11 +160,6 @@ 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.126.0"
+  VERSION = "1.127.0"
 end

data/lib/kennel.rb

@@ -59,7 +59,7 @@ module Kennel
     attr_accessor :strict_imports
 
     def generate
-      parts = generated(plain: false)
+      parts = generated
       parts_serializer.write(parts) if ENV["STORE"] != "false" # quicker when debugging
       parts
     end
@@ -75,24 +75,12 @@ module Kennel
 
     private
 
-    def download_definitions
-      Progress.progress("Downloading definitions", plain: true) 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
-
     def filter
       @filter ||= Filter.new
     end
 
     def syncer
-      @syncer ||= begin
-        expected, actual = Utils.parallel([:generated, :download_definitions]) { |m| send m }
-        Syncer.new(api, expected, actual, kennel: self, project_filter: filter.project_filter, tracking_id_filter: filter.tracking_id_filter)
-      end
+      @syncer ||= Syncer.new(api, generated, kennel: self, project_filter: filter.project_filter, tracking_id_filter: filter.tracking_id_filter)
     end
 
     def api
@@ -107,9 +95,9 @@ module Kennel
       @parts_serializer ||= PartsSerializer.new(filter: filter)
     end
 
-    def generated(plain: true)
+    def generated
       @generated ||= begin
-        parts = Progress.progress "Finding parts", plain: plain do
+        parts = Progress.progress "Finding parts" do
           projects = projects_provider.projects
           projects = filter.filter_projects projects
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.126.0
+  version: 1.127.0
 platform: ruby
 authors:
 - Michael Grosser