kennel 1.91.0 → 1.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4072608bea0464722665eacf42705148b1167be7841eed87f062927592ecaa
-  data.tar.gz: 32cbe46724d73f66355241c3c60776285129a94fd4c5a56ec5d70af8a7fa62d5
+  metadata.gz: 9c49a8d3df01c51505bd27350f74dde6f4211fe576a97857e68f27f5d86aae4d
+  data.tar.gz: 72641a908961fe238b70a59d3e952abfccc83bd9522c12757f0d436993f73263
 SHA512:
-  metadata.gz: 90ba6d96631fb40a3576238b2b4e5bb07f630f702e7d04d29d957790fdfd91a6b919391d0c6e0cfec353ce492b83d514146e21a539d7b880c3d20a1e51374e23
-  data.tar.gz: da85a013a71a13da279085656ff767736f5fa317dfb567da609abe91de46d145f204eb51d310e4346ce3561f3aae65af7a26bc7efa407dd152aec2c6dbe3093d
+  metadata.gz: 1789814bea2d153d1428a751ce1b56dbdbd89714cc81608e4a133ae05377a55c724a26809419c995224f5f669387f5116926eb558646307a3415cb0672b10da5
+  data.tar.gz: 69ea27ba49933d745bf5cf362cb4361bee0bdf74cd4934fad6616b5ec9ba52216e4a5e365723550792c64a866d114b328c3c61483cce5b7b5ec0d2b21cdc476b

data/lib/kennel/api.rb

@@ -52,7 +52,12 @@ module Kennel
     #   external dependency on kennel managed resources is their problem, we don't block on it
     #   (?force=true did not work, force for dashboard is not documented but does not blow up)
     def delete(api_resource, id)
-      request :delete, "/api/v1/#{api_resource}/#{id}", params: { force: "true" }, ignore_404: true
+      if api_resource == "synthetics/tests"
+        # https://docs.datadoghq.com/api/latest/synthetics/#delete-tests
+        request :post, "/api/v1/#{api_resource}/delete", body: { public_ids: [id] }, ignore_404: true
+      else
+        request :delete, "/api/v1/#{api_resource}/#{id}", params: { force: "true" }, ignore_404: true
+      end
     end
 
     def fill_details!(api_resource, list)

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/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.0"
+  VERSION = "1.92.0"
 end

metadata

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