kennel 1.91.1 → 1.92.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f3417e3f9c4f8b950c89047ed25c5f44a0da8e8c7f28667f33b549b2d6fadc3
-  data.tar.gz: 9fec0221be92d34d7ade923a9f92bee18e9f602d719c041e21fc274fb6d10c9f
+  metadata.gz: 25dc1229c8a5638ae303b4abc140bd5b1d3c734416161e1b431dbff9ba40b980
+  data.tar.gz: 4e87ad53e75fd11e258cf82a36c95bcde7e0ff0aa90918fc282a1177d8e48839
 SHA512:
-  metadata.gz: b31a95230656072e45d260aa549010ad5add9313af68f2490ac3d3c2220b9fe525ee6af144a3ca988103503af7f4a15cdbeb52601e1ff0427a5809714807be73
-  data.tar.gz: 6754253f9cc10a00b663947860527a596308856e3beca48538eef1f19f9e02aa11c98ce981b5f7f7815bb177f4b329e971decf0dd8326ccc6a767d163c2970de
+  metadata.gz: 17a8ec0d1697ba73d498d0f86f53e81e48a0ce92b0589f4a0a44f8e8735af98bd133e3270d4147d08d7e1a1d896093c4db0d3607441e7b911398de47a21b494b
+  data.tar.gz: aa1b95aab43b1fb0e7db8b50f3a6869bd620e815e7f7c3aaf10daad85cfd1309f926b713eec1a3ce33bf9a9f3e09b9df43f6ba280a1720bd1247dbac823db590

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

@@ -24,7 +24,14 @@ module Kennel
     end
 
     def confirm
-      ENV["CI"] || !STDIN.tty? || Utils.ask("Execute Plan ?") unless noop?
+      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
+      Utils.ask("Execute Plan ?")
     end
 
     def update

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.91.1
+  version: 1.92.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday