kennel 1.81.2 → 1.82.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9d3050dbb7a4e94cd22e64618142bedffd6fdfc5b5ee8e20b621b90f1d8f27
-  data.tar.gz: 640a86b74e46e27ec7f1b09dd555f0ba8f99e4fc1f687e5230bb00d12636ae1d
+  metadata.gz: 97ae92e1ab137731096bbedde401059fc2b8d411ff667df489056f05a3cf42aa
+  data.tar.gz: c48683c4888e16da817885a44a876638086c32e8e370aaf16553c31b7fde0136
 SHA512:
-  metadata.gz: 80dbfff63550b6f5c3127cb8ecc97db6b3db38876469bcb9d50fce00a7e1b78e2f473dd3c3abaec081cb21037f53be72021d907c4285352b30dd3b6991f6c622
-  data.tar.gz: 02a3122ec70a951dc01f919c4d13877de88c6266048d006770a62adadd19587d74a603e8281699f878be0a20227a7086e37727c751cf5833e815fc795e3f9ee3
+  metadata.gz: 89f7a44c794130ecd4a4238ace5846d050412fd923cc5ae358cb469370c3dd380569bffe991b2251bc80baf4e183bd765591295b043ffc51fd88c5593b723f21
+  data.tar.gz: 4a9eece67d3f0e0cf8dd56a21440ce585397d531c4aa82d1d4c3d43db08169b57dd1e982ba74e68326ae61ed8278ac4d5fed7eefe8f6979dcf5a3c3a3e98ceb0

data/lib/kennel/api.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 module Kennel
+  # encapsulates knowledge around how the api works
   class Api
+    CACHE_FILE = "tmp/cache/details"
+
     def initialize(app_key, api_key)
       @app_key = app_key
       @api_key = api_key
@@ -49,8 +52,27 @@ module Kennel
       request :delete, "/api/v1/#{api_resource}/#{id}", params: { force: "true" }, ignore_404: true
     end
 
+    def fill_details!(api_resource, list)
+      return unless api_resource == "dashboard"
+      details_cache do |cache|
+        Utils.parallel(list) { |a| fill_detail!(api_resource, a, cache) }
+      end
+    end
+
     private
 
+    # Make diff work even though we cannot mass-fetch definitions
+    def fill_detail!(api_resource, a, cache)
+      args = [api_resource, a.fetch(:id)]
+      full = cache.fetch(args, a.fetch(:modified_at)) { show(*args) }
+      a.merge!(full)
+    end
+
+    def details_cache(&block)
+      cache = FileCache.new CACHE_FILE, Kennel::VERSION
+      cache.open(&block)
+    end
+
     def request(method, path, body: nil, params: {}, ignore_404: false)
       params = params.merge(application_key: @app_key, api_key: @api_key)
       query = Faraday::FlatParamsEncoder.encode(params)

data/lib/kennel/models/dashboard.rb

@@ -5,7 +5,6 @@ module Kennel
       include TemplateVariables
       include OptionalValidations
 
-      API_LIST_INCOMPLETE = true
       DASHBOARD_DEFAULTS = { template_variables: [] }.freeze
       READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
         :author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list

data/lib/kennel/models/record.rb

@@ -6,7 +6,6 @@ module Kennel
       READONLY_ATTRIBUTES = [
         :deleted, :id, :created, :created_at, :creator, :org_id, :modified, :modified_at, :api_resource
       ].freeze
-      API_LIST_INCOMPLETE = false
 
       settings :id, :kennel_id
 

data/lib/kennel/syncer.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Kennel
   class Syncer
-    CACHE_FILE = "tmp/cache/details" # keep in sync with .travis.yml caching
     TRACKING_FIELDS = [:message, :description].freeze
     DELETE_ORDER = ["dashboard", "slo", "monitor"].freeze # dashboards references monitors + slos, slos reference monitors
 
@@ -117,10 +116,10 @@ module Kennel
           end
         end
 
-        details_cache do |cache|
-          # fill details of things we need to compare (only do this part in parallel for safety & balancing)
-          Utils.parallel(items.select { |e, _| e && e.class::API_LIST_INCOMPLETE }) { |_, a| fill_details(a, cache) }
-        end
+        # fill details of things we need to compare
+        detailed = Hash.new { |h, k| h[k] = [] }
+        items.each { |e, a| detailed[a[:api_resource]] << a if e }
+        detailed.each { |api_resource, actuals| @api.fill_details! api_resource, actuals }
 
         # pick out things to update or delete
         items.each do |e, a|
@@ -140,21 +139,6 @@ module Kennel
       @delete.sort_by! { |_, _, a| DELETE_ORDER.index a.fetch(:api_resource) }
     end
 
-    # Make diff work even though we cannot mass-fetch definitions
-    def fill_details(a, cache)
-      resource = a.fetch(:api_resource)
-      args = [resource, a.fetch(:id)]
-      full = cache.fetch(args, a[:modified] || a.fetch(:modified_at)) do
-        @api.show(*args)
-      end
-      a.merge!(full)
-    end
-
-    def details_cache(&block)
-      cache = FileCache.new CACHE_FILE, Kennel::VERSION
-      cache.open(&block)
-    end
-
     def download_definitions
       Utils.parallel(Models::Record.subclasses.map(&:api_resource)) do |api_resource|
         results = @api.list(api_resource, with_downtimes: false) # lookup monitors without adding unnecessary downtime information

data/lib/kennel/tasks.rb

@@ -132,8 +132,15 @@ namespace :kennel do
       else
         Kennel::Models::Record.subclasses.map(&:api_resource)
       end
+    api = Kennel.send(:api)
+    list = nil
+
     resources.each do |resource|
-      Kennel.send(:api).list(resource).each do |r|
+      Kennel::Progress.progress("Downloading #{resource}") do
+        list = api.list(resource)
+        api.fill_details!(resource, list)
+      end
+      list.each do |r|
         Kennel.out.puts JSON.pretty_generate(r)
       end
     end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.81.2
+  version: 1.82.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday