kennel 1.92.1 → 1.93.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25dc1229c8a5638ae303b4abc140bd5b1d3c734416161e1b431dbff9ba40b980
-  data.tar.gz: 4e87ad53e75fd11e258cf82a36c95bcde7e0ff0aa90918fc282a1177d8e48839
+  metadata.gz: d8f4d45717fa5e2f6913760a8b627b279e7ad4a09bd035c82b98897839f7a19e
+  data.tar.gz: 5b194c6871ee6e8ff5708f4530dd2ffbc5d65ac2243a16c33ecf3f360558dd22
 SHA512:
-  metadata.gz: 17a8ec0d1697ba73d498d0f86f53e81e48a0ce92b0589f4a0a44f8e8735af98bd133e3270d4147d08d7e1a1d896093c4db0d3607441e7b911398de47a21b494b
-  data.tar.gz: aa1b95aab43b1fb0e7db8b50f3a6869bd620e815e7f7c3aaf10daad85cfd1309f926b713eec1a3ce33bf9a9f3e09b9df43f6ba280a1720bd1247dbac823db590
+  metadata.gz: 1f2e4b91c48fbb9bc25552cfbac91f78d3f970acf2b7d7a56569103959eba5f84de9061f82f153fd7981607a16ed4bc9f08fa277c55e5de5cbc28e1eb5c5ccbf
+  data.tar.gz: 50a39e8b033b3afc854844e3c565eea8c83a7b644f3d1ffc213d52a829ba57fbe679c94292bcf9808a6e1fb8b9a86faace328e7769fc7eea52fefd9dd311140f

data/lib/kennel/models/dashboard.rb

@@ -6,7 +6,7 @@ module Kennel
       include OptionalValidations
 
       READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [
-        :author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list
+        :author_handle, :author_name, :modified_at, :url, :is_read_only, :notify_list, :restricted_roles
       ]
       TRACKING_FIELD = :description
       REQUEST_DEFAULTS = {

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.1"
+  VERSION = "1.93.1"
 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.1
+  version: 1.93.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday