kennel 1.73.0 → 1.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99d149867f4ae8fefb711537a756a1d450ae396f5ac371b48f7db555b81d880
-  data.tar.gz: 6faa7915de915d57051a3722ba76eef833e464340dd14e211aedd6075ef13a9a
+  metadata.gz: 769ede5638522cc0c56394f0fde86207b88aad4ade1ff05e0360018972e52a55
+  data.tar.gz: 467dfab6d84ec29c1efbba1f7ab1df2fad3fd5767521a677c88b38c8bb8f2e19
 SHA512:
-  metadata.gz: aa4907af5eb82756b646cd4e89f6ff6b69832c6cd7ce20ceb18d2cf9da57913866c5237293916e6299baaa35a84254d941cf2dbd7a89ca7e2364f06b6b7e197f
-  data.tar.gz: f8beb5d100df9b205d7759e8f338fb5d01a267f5f22ab312f0793085aff78c0b1e51546cde2555f1f2cda34c62978ba0e60953ac21a87461411892cd52674806
+  metadata.gz: 64f8dbae6ba9ea0d51be0c20a955a261ca026c760e77cf05e945b0a2514e6ef99527f8a00a9dc39abc053235fd76474435fb13d610e6e1ed1ce4e92d99e81ea9
+  data.tar.gz: 695f7f97b7355291d66b72423ac3c1adcadf804ced559aa35222c431c92198beca00fa625ebbad70ab105173ec8ca0b11eb4ec13a3dd19c04945fa9709821552

data/lib/kennel.rb

@@ -29,7 +29,6 @@ require "kennel/models/project"
 require "kennel/models/team"
 
 module Kennel
-  MISSING_ID = 1
   class ValidationError < RuntimeError
   end
 

data/lib/kennel/importer.rb

@@ -40,7 +40,8 @@ module Kennel
           Kennel::Utils.parameterize(title)
         end
 
-      if resource == "monitor"
+      case resource
+      when "monitor"
         # flatten monitor options so they are all on the base
         data.merge!(data.delete(:options))
         data.merge!(data.delete(:thresholds) || {})
@@ -55,7 +56,7 @@ module Kennel
         end
 
         data[:type] = "query alert" if data[:type] == "metric alert"
-      elsif resource == "dashboard"
+      when "dashboard"
         widgets = data[:widgets]&.flat_map { |widget| widget.dig(:definition, :widgets) || [widget] }
         widgets&.each { |widget| dry_up_query!(widget) }
       end

data/lib/kennel/models/dashboard.rb

@@ -132,7 +132,7 @@ module Kennel
         url[/\/dashboard\/([a-z\d-]+)/, 1]
       end
 
-      def resolve_linked_tracking_ids(id_map)
+      def resolve_linked_tracking_ids!(id_map, **args)
         widgets = as_json[:widgets].flat_map { |w| [w, *w.dig(:definition, :widgets) || []] }
         widgets.each do |widget|
           next unless definition = widget[:definition]
@@ -140,16 +140,16 @@ module Kennel
           when "uptime"
             if ids = definition[:monitor_ids]
               definition[:monitor_ids] = ids.map do |id|
-                tracking_id?(id) ? resolve_link(id, :monitor, id_map) : id
+                tracking_id?(id) ? resolve_link(id, :monitor, id_map, **args) : id
               end
             end
           when "alert_graph"
             if (id = definition[:alert_id]) && tracking_id?(id)
-              definition[:alert_id] = resolve_link(id, :monitor, id_map).to_s
+              definition[:alert_id] = resolve_link(id, :monitor, id_map, **args).to_s
             end
           when "slo"
             if (id = definition[:slo_id]) && tracking_id?(id)
-              definition[:slo_id] = resolve_link(id, :slo, id_map).to_s
+              definition[:slo_id] = resolve_link(id, :slo, id_map, **args).to_s
             end
           end
         end

data/lib/kennel/models/monitor.rb

@@ -103,11 +103,10 @@ module Kennel
         @as_json = data
       end
 
-      def resolve_linked_tracking_ids(id_map)
+      def resolve_linked_tracking_ids!(id_map, **args)
         if as_json[:type] == "composite"
           as_json[:query] = as_json[:query].gsub(/%\{(.*?)\}/) do
-            # need force here since it validates the id exists
-            resolve_link($1, :monitor, id_map, force: true)
+            resolve_link($1, :monitor, id_map, **args)
           end
         end
       end
@@ -202,7 +201,7 @@ module Kennel
           # verify is_match uses available variables
           message = data.fetch(:message)
           used = message.scan(/{{\s*#is_match\s*"([a-zA-Z\d_.-]+).name"/).flatten.uniq
-          allowed = data.fetch(:query)[/by\s*[\({]([^\}\)]+)[}\)]/, 1].to_s.gsub(/["']/, "").split(/\s*,\s*/)
+          allowed = data.fetch(:query)[/by\s*[({]([^})]+)[})]/, 1].to_s.gsub(/["']/, "").split(/\s*,\s*/)
           unsupported = used - allowed
           if unsupported.any?
             invalid! "is_match used with #{unsupported}, but metric is only grouped by #{allowed}"

data/lib/kennel/models/record.rb

@@ -60,23 +60,22 @@ module Kennel
         "#{project.kennel_id}:#{kennel_id}"
       end
 
-      def resolve_linked_tracking_ids(*)
+      def resolve_linked_tracking_ids!(*)
       end
 
       private
 
-      def resolve_link(id, type, id_map, force: false)
-        found = id_map[id]
-        return found if found && found != :new
-        api_resource = self.class.api_resource
-
-        if found == :new
+      def resolve_link(id, type, id_map, force:)
+        value = id_map[id]
+        if value == :new
           if force
-            invalid! "#{api_resource.capitalize} #{id} will be created in the current run and can only be used after that"
+            # TODO: remove the need for this by sorting monitors by missing resolutions
+            invalid! "#{id} needs to already exist, try again"
           else
-            Kennel.err.puts "#{api_resource.capitalize} #{id} will be created in the current run, the next run will link it properly"
-            Kennel::MISSING_ID
+            id # will be re-resolved by syncer after the linked object was created
           end
+        elsif value
+          value
         else
           invalid! "Unable to find #{type} #{id} (does not exist and is not being created by the current run)"
         end

data/lib/kennel/models/slo.rb

@@ -66,9 +66,9 @@ module Kennel
         url[/\/slo\?slo_id=([a-z\d]+)/, 1]
       end
 
-      def resolve_linked_tracking_ids(id_map)
+      def resolve_linked_tracking_ids!(id_map, **args)
         as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
-          id.is_a?(String) ? resolve_link(id, :monitor, id_map) : id
+          id.is_a?(String) ? resolve_link(id, :monitor, id_map, **args) : id
         end
       end
 

data/lib/kennel/syncer.rb

@@ -38,12 +38,23 @@ module Kennel
     end
 
     def update
+      changed = (@create + @update).map { |_, e| e } unless @create.empty?
+
       @create.each do |_, e|
+        e.resolve_linked_tracking_ids!({}, force: true)
+
         reply = @api.create e.class.api_resource, e.as_json
-        Kennel.out.puts "Created #{e.class.api_resource} #{tracking_id(e.as_json)} #{e.url(reply.fetch(:id))}"
+        id = reply.fetch(:id)
+
+        # resolve ids we could previously no resolve
+        changed.delete e
+        resolve_linked_tracking_ids! from: [reply], to: changed
+
+        Kennel.out.puts "Created #{e.class.api_resource} #{tracking_id(e.as_json)} #{e.url(id)}"
       end
 
       @update.each do |id, e|
+        e.resolve_linked_tracking_ids!({}, force: true)
         @api.update e.class.api_resource, id, e.as_json
         Kennel.out.puts "Updated #{e.class.api_resource} #{tracking_id(e.as_json)} #{e.url(id)}"
       end
@@ -65,12 +76,10 @@ module Kennel
       @delete = []
 
       actual = Progress.progress("Downloading definitions") { download_definitions }
-
-      resolve_linked_tracking_ids actual
+      resolve_linked_tracking_ids! from: actual, to: @expected
+      filter_by_project! actual
 
       Progress.progress "Diffing" do
-        filter_by_project! actual
-
         items = actual.map do |a|
           e = matching_expected(a)
           if e && @expected.delete(e)
@@ -98,6 +107,7 @@ module Kennel
 
         ensure_all_ids_found
         @create = @expected.map { |e| [nil, e] }
+        @create.sort_by! { |_, e| -DELETE_ORDER.index(e.class.api_resource) }
       end
 
       @delete.sort_by! { |_, _, a| DELETE_ORDER.index a.fetch(:api_resource) }
@@ -178,7 +188,7 @@ module Kennel
     end
 
     # Do not add tracking-id when working with existing ids on a branch,
-    # so resource do not get deleted from merges to master.
+    # so resource do not get deleted fr:om merges to master.
     # Also make sure the diff still makes sense, by kicking out the now noop-update.
     #
     # Note: ideally we'd never add tracking in the first place, but at that point we do not know the diff yet
@@ -203,10 +213,10 @@ module Kennel
       end
     end
 
-    def resolve_linked_tracking_ids(actual)
-      map = actual.each_with_object({}) { |a, lookup| lookup[tracking_id(a)] = a.fetch(:id) }
-      @expected.each { |e| map[e.tracking_id] ||= :new }
-      @expected.each { |e| e.resolve_linked_tracking_ids(map) }
+    def resolve_linked_tracking_ids!(from:, to:)
+      map = from.each_with_object({}) { |a, lookup| lookup[tracking_id(a)] = a.fetch(:id) }
+      to.each { |e| map[e.tracking_id] ||= :new }
+      to.each { |e| e.resolve_linked_tracking_ids!(map, force: false) }
     end
 
     def filter_by_project!(definitions)

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.73.0
+  version: 1.74.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday