kennel 1.58.4 → 1.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7f29450cced9fd421dd64c7dacf109d3e3fe93245f19bfcec695b98491f559
-  data.tar.gz: d1db2105b3f6566f74b71476e089d9691ad9f8f5b3ff08e27801668d172dd6ac
+  metadata.gz: c20add02263916021ed0498253e11e79193b5bf603651c28cbacbf614b02287c
+  data.tar.gz: ec8ff5e6fa15c10b2f3113feb7f3459f48b9520259952ab91786f56001192f53
 SHA512:
-  metadata.gz: b147725c2c13a0ef72771380a9e55518983d2876b6d90a94af2917ca9fe59ef297123ed4ec8d52b2c9cf41f51536b4b3ce0541321e91d8f8649c140de7a031d5
-  data.tar.gz: dbaaa1cd7d9d57cd1d78be0e50e21b27723da7b35f6993cfea5c61b882564abb44c1027461ea4fd7f4794ad3b72f11e068cdb0a50cd6904d01f9badcfa8e76af
+  metadata.gz: b69a0f24eeca1fb532c4b46f18f398e5df1630ae5f8da96b3ea7a263e68e3a211b31e4762f979ff022290ec5fc54a011ba3177a3ee9156ee4ee20541385b48e8
+  data.tar.gz: 30e5d810b9351afb83ec40f29c17d9828bd85d41ecea39c3e273011f3ed32ffa2c1729d495aeaad1668bb958e4b407f696916dd57eb3992da08588cf4bf8576e

data/lib/kennel.rb

@@ -29,6 +29,10 @@ require "kennel/models/project"
 require "kennel/models/team"
 
 module Kennel
+  MISSING_ID = 1
+  class ValidationError < RuntimeError
+  end
+
   @out = $stdout
   @err = $stderr
 
@@ -68,7 +72,7 @@ module Kennel
         Progress.progress "Generating" do
           load_all
           parts = Models::Project.recursive_subclasses.flat_map do |project_class|
-            project_class.new.parts
+            project_class.new.validated_parts
           end
           parts.map(&:tracking_id).group_by { |id| id }.select do |id, same|
             raise "#{id} is defined #{same.size} times" if same.size != 1

data/lib/kennel/models/dashboard.rb

@@ -101,16 +101,16 @@ module Kennel
           when "uptime"
             if ids = definition[:monitor_ids]
               definition[:monitor_ids] = ids.map do |id|
-                tracking_id?(id) ? resolve_link(id, id_map, force: false) : id
+                tracking_id?(id) ? resolve_link(id, id_map) : id
               end
             end
           when "alert_graph"
             if (id = definition[:alert_id]) && tracking_id?(id)
-              definition[:alert_id] = resolve_link(id, id_map, force: false).to_s
+              definition[:alert_id] = resolve_link(id, id_map).to_s
             end
           when "slo"
             if (id = definition[:slo_id]) && tracking_id?(id)
-              definition[:slo_id] = resolve_link(id, id_map, force: false).to_s
+              definition[:slo_id] = resolve_link(id, id_map).to_s
             end
           end
         end

data/lib/kennel/models/monitor.rb

@@ -105,6 +105,7 @@ module Kennel
       def resolve_linked_tracking_ids(id_map)
         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, id_map, force: true)
           end
         end

data/lib/kennel/models/project.rb

@@ -14,6 +14,18 @@ module Kennel
           instance_method(method_in_file).source_location.first.sub("#{Bundler.root}/", "")
         end
       end
+
+      def validated_parts
+        all = parts
+        validate_parts(all)
+        all
+      end
+
+      private
+
+      # hook for users to add custom validations via `prepend`
+      def validate_parts(parts)
+      end
     end
   end
 end

data/lib/kennel/models/record.rb

@@ -13,9 +13,6 @@ module Kennel
       }.freeze
       API_LIST_INCOMPLETE = false
 
-      class ValidationError < RuntimeError
-      end
-
       settings :id, :kennel_id
 
       class << self
@@ -81,10 +78,19 @@ module Kennel
 
       private
 
-      def resolve_link(id, id_map, force:)
-        id_map[id] || begin
-          message = "Unable to find #{id} in existing monitors (they need to be created first to link them)"
-          force ? invalid!(message) : Kennel.err.puts(message)
+      def resolve_link(id, id_map, force: false)
+        found = id_map[id]
+        return found if found && found != :new
+
+        if found == :new
+          if force
+            invalid! "Monitor #{id} will be created in the current run and can only be used after that"
+          else
+            Kennel.err.puts "Monitor #{id} will be created in the current run, the next run will link it properly"
+            Kennel::MISSING_ID
+          end
+        else
+          invalid! "Unable to find monitor #{id} (does not exist and is not being created by the current run)"
         end
       end
 

data/lib/kennel/models/slo.rb

@@ -55,7 +55,7 @@ module Kennel
 
       def resolve_linked_tracking_ids(id_map)
         as_json[:monitor_ids] = as_json[:monitor_ids].map do |id|
-          id.is_a?(String) ? resolve_link(id, id_map, force: false) || 1 : id
+          id.is_a?(String) ? resolve_link(id, id_map) : id
         end
       end
 

data/lib/kennel/syncer.rb

@@ -195,6 +195,7 @@ module Kennel
 
     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) }
     end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.58.4
+  version: 1.59.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday