kennel 1.92.0 → 1.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c49a8d3df01c51505bd27350f74dde6f4211fe576a97857e68f27f5d86aae4d
-  data.tar.gz: 72641a908961fe238b70a59d3e952abfccc83bd9522c12757f0d436993f73263
+  metadata.gz: f5c90741d459ffe101d85e766085ac9d2687eefa66039bf8956fb87d9ea6856f
+  data.tar.gz: 7c1b63c19b108fa86220de5bb6dc96ce05dc4902335a4a8f653448d3c6adeca3
 SHA512:
-  metadata.gz: 1789814bea2d153d1428a751ce1b56dbdbd89714cc81608e4a133ae05377a55c724a26809419c995224f5f669387f5116926eb558646307a3415cb0672b10da5
-  data.tar.gz: 69ea27ba49933d745bf5cf362cb4361bee0bdf74cd4934fad6616b5ec9ba52216e4a5e365723550792c64a866d114b328c3c61483cce5b7b5ec0d2b21cdc476b
+  metadata.gz: a015c03ac9583762088c11609f4f321effdab3789cb4f6f4f1b49409da8802db79c1f0c6ac781f524184aef4426fcdd10db3028d7423bced9f787cea9d697fe1
+  data.tar.gz: 16385c8f90d7ce325931ddbfaea64e7238d9c33805ed934678f95789839460a3b1c851a5e2b9586173083d72c48eca2df59a67a8759d224de8f97db83cd78b95

data/lib/kennel/models/dashboard.rb

@@ -46,7 +46,6 @@ module Kennel
           font_size: "14"
         },
         "query_value" => {
-          autoscale: true,
           time: {},
           title_align: "left",
           title_size: "16"

data/lib/kennel/syncer.rb

@@ -3,6 +3,7 @@ module Kennel
   class Syncer
     DELETE_ORDER = ["dashboard", "slo", "monitor", "synthetics/tests"].freeze # dashboards references monitors + slos, slos reference monitors
     LINE_UP = "\e[1A\033[K" # go up and clear
+    DEFAULT_BRANCH = "master"
 
     def initialize(api, expected, project: nil)
       @api = api
@@ -26,11 +27,7 @@ module Kennel
     def confirm
       return false if noop?
       return true if ENV["CI"] || !STDIN.tty?
-      if @delete.any? && @project_filter
-        Kennel.out.puts(
-          Utils.color(:red, "WARNING: deleting resources that had `id: -> { ...` breaks master branch")
-        )
-      end
+      warn_about_deleting_resources_with_id if @project_filter
       Utils.ask("Execute Plan ?")
     end
 
@@ -63,6 +60,30 @@ module Kennel
 
     private
 
+    # this is brittle/hacky since it relies on knowledge from the generation + git + branch knowledge
+    def warn_about_deleting_resources_with_id
+      @delete.each do |_, _, a|
+        tracking_id = a.fetch(:tracking_id)
+        api_resource = a.fetch(:klass).api_resource
+
+        file = "generated/#{tracking_id.sub(":", "/")}.json"
+        old = `true && git show #{DEFAULT_BRANCH}:#{file.shellescape} 2>&1` # true && to not crash on missing git
+
+        next unless $?.success?
+        old =
+          begin
+            JSON.parse(old)
+          rescue StandardError
+            false
+          end
+        next if !old || !old["id"]
+
+        Kennel.out.puts(
+          Utils.color(:red, "WARNING: deleting #{api_resource} #{tracking_id} will break #{DEFAULT_BRANCH} branch")
+        )
+      end
+    end
+
     # loop over items until everything is resolved or crash when we get stuck
     # this solves cases like composite monitors depending on each other or monitor->monitor slo->slo monitor chains
     def each_resolved(list)
@@ -139,6 +160,7 @@ module Kennel
         ensure_all_ids_found
         @create = @expected.map { |e| [nil, e] }
         @delete.sort_by! { |_, _, a| DELETE_ORDER.index a.fetch(:klass).api_resource }
+        @update.sort_by! { |_, e, _| DELETE_ORDER.index e.class.api_resource } # slo needs to come before slo alert
       end
     end
 

data/lib/kennel/tasks.rb

@@ -48,7 +48,7 @@ namespace :kennel do
       url = Kennel::Utils.path_to_url "/account/settings"
       puts "Invalid mentions found, either ignore them by adding to `KNOWN` env var or add them via #{url}"
       bad.each { |f, v| puts "Invalid mention #{v} in monitor message of #{f}" }
-      Kennel::Tasks.abort
+      Kennel::Tasks.abort ENV["KNOWN_WARNING"]
     end
   end
 

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "faraday"
 require "json"
+require "shellwords"
 require "English"
 
 require "kennel/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.92.0
+  version: 1.93.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday