kennel 1.91.2 → 1.92.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b7b57805cf2c4730b6a1320342240fe03e9cf786f07380210bb558361b7192
-  data.tar.gz: e56d5211430862f20dc92e4d3538be0befdd630a401bf1605de064b6ab9468b8
+  metadata.gz: 1e94541bcdef70aa7074e902576e22ffff456e11f04c55bed2567f2074273f38
+  data.tar.gz: 2eb1d620e5a4dfe57041e8252d06746ff5bb067aa6d0e375093278218e09662a
 SHA512:
-  metadata.gz: 2631017430f4d33639317f56be0d639d1d60cf33e568f5b0b4f8031a4cc0d981ca2cc793a18864049cdfc7bb3cf9d852a8ca5f90e6a37779faa37a5cafdb3212
-  data.tar.gz: 9fa908dd061892c13b40e5cf1ab1de7d406ec7a99ed6a718c1cadee5ca5ecd17ec72e8c498c3b4bdf977542a51e1871fbb743e2b4296bcc5d0d071be6aba7d3c
+  metadata.gz: 3404e5804b142f2f96b35ceaf9d51f3e7fb5c6e29c2573ef603f090e04653d77cd201081147c272d0648f0fac24f532b3a648d356755faa3973364997193367a
+  data.tar.gz: d8dcc7f3ea50824d6cbff9c3e29b83ecfd59559f25345e2ad7b468dea30f8423703879b9517823bc565d4e15b3a2fbb55f6c88a4727a20b98292f12958a17e3f

data/lib/kennel/github_reporter.rb

@@ -8,13 +8,15 @@ module Kennel
     class << self
       def report(token, &block)
         return yield unless token
-        new(token, Utils.capture_sh("git rev-parse HEAD").strip).report(&block)
+        new(token).report(&block)
       end
     end
 
-    def initialize(token, git_sha)
+    def initialize(token, ref: "HEAD")
       @token = token
-      @git_sha = git_sha
+      commit = Utils.capture_sh("git show #{ref}")
+      @sha = commit[/^Merge: \S+ (\S+)/, 1] || commit[/\Acommit (\S+)/, 1] || raise("Unable to find commit")
+      @pr = commit[/^\s+.*\(#(\d+)\)/, 1] # from squash
       @repo_part = ENV["GITHUB_REPOSITORY"] || begin
         origin = ENV["PROJECT_REPOSITORY"] || Utils.capture_sh("git remote -v").split("\n").first
         origin[%r{github\.com[:/](\S+?)(\.git|$)}, 1] || raise("no origin found in #{origin}")
@@ -37,13 +39,14 @@ module Kennel
         body = body.byteslice(0, MAX_COMMENT_SIZE - TRUNCATED_MSG.bytesize) + TRUNCATED_MSG
       end
 
-      post "commits/#{@git_sha}/comments", body: body
+      path = (@pr ? "/repos/#{@repo_part}/issues/#{@pr}/comments" : "/repos/#{@repo_part}/commits/#{@sha}/comments")
+      post path, body: body
     end
 
     private
 
     def post(path, data)
-      url = "https://api.github.com/repos/#{@repo_part}/#{path}"
+      url = "https://api.github.com#{path}"
       response = Faraday.post(url, data.to_json, authorization: "token #{@token}")
       raise "failed to POST to github:\n#{url} -> #{response.status}\n#{response.body}" unless response.status == 201
     end

data/lib/kennel/importer.rb

@@ -106,10 +106,11 @@ module Kennel
     end
 
     # new api format is very verbose, so use old dry format when possible
+    # dd randomly chooses query0 or query1
     def convert_widget_to_compact_format!(widget)
       (widget.dig(:definition, :requests) || []).each do |request|
         next unless request.is_a?(Hash)
-        next if request[:formulas] && request[:formulas] != [{ formula: "query1" }]
+        next if request[:formulas] && ![[{ formula: "query1" }], [{ formula: "query0" }]].include?(request[:formulas])
         next if request[:queries]&.size != 1
         next if request[:queries].any? { |q| q[:data_source] != "metrics" }
         next if widget.dig(:definition, :type) != request[:response_format]

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)

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.91.2"
+  VERSION = "1.92.2"
 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.91.2
+  version: 1.92.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday