kennel 1.147.0 → 1.149.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa3215e281ade43456180bbdbe048939052d0238b1303705842cad7145b5457
-  data.tar.gz: ae9ec09767652ff2839da017731f7f7487e237cbea81d9cebb89f39351bd7cca
+  metadata.gz: dca468d8f965e5b3ed1e1bb74610a1f5fd9b66bca5269286f5edb48dbc7d552d
+  data.tar.gz: 91d9a7a9c1e0e9aefa052e3673fb1239d2a61bf3387c10c4c323094ba91faca0
 SHA512:
-  metadata.gz: 0064bfa8723de2680d8a7dfd2d050018a040015efa8e57646039cbb825fb3278bbdf29ea8f60de4dc617d61b0ddc69bac4fa050fc125c10be413d1900eca7556
-  data.tar.gz: 5a1dc95851d870c5d00ab6d2b17c357572b44ab058ae87d486e6b4786797211fede1e6ef7dc935fc2e743f0ada6a942556f8222a4dc4b931047ffb7dbb07dc74
+  metadata.gz: 7b72426c08a25c1c7fd86a7193420a5b1ca5f8fca102087d021f1944b688d8d9fdd58fe1f3feb23355ddf8eed9196b8b4a96b5284942e9755d01b3ce0d9bb201
+  data.tar.gz: 374585d70647bed669a87039cc96c01db509ceb5d953b526e47da8b1883a5f5e1ced444a289e73f1e602ba2f64f95984a1088c5f0f35ca35299fe993a42f8244

data/lib/kennel/api.rb

@@ -5,6 +5,8 @@ module Kennel
   class Api
     CACHE_FILE = ENV.fetch("KENNEL_API_CACHE_FILE", "tmp/cache/details")
 
+    RateLimitParams = Data.define(:limit, :period, :remaining, :reset, :name)
+
     def self.tag(api_resource, reply)
       klass = Models::Record.api_resource_map[api_resource]
       return reply unless klass # do not blow up on unknown models
@@ -18,7 +20,7 @@ module Kennel
     def initialize(app_key = nil, api_key = nil)
       @app_key = app_key || ENV.fetch("DATADOG_APP_KEY")
       @api_key = api_key || ENV.fetch("DATADOG_API_KEY")
-      url = Utils.path_to_url("", subdomain: "app")
+      url = Utils.path_to_url("")
       @client = Faraday.new(url: url) { |c| c.adapter :net_http_persistent }
     end
 
@@ -122,6 +124,23 @@ module Kennel
             end
           end
 
+          rate_limit = RateLimitParams.new(
+            limit: response.headers["x-ratelimit-limit"],
+            period: response.headers["x-ratelimit-period"],
+            remaining: response.headers["x-ratelimit-remaining"],
+            reset: response.headers["x-ratelimit-reset"],
+            name: response.headers["x-ratelimit-name"]
+          )
+
+          if response.status == 429
+            message = "Datadog rate limit #{rate_limit.name.inspect} hit"
+            message += " (#{rate_limit.limit} requests per #{rate_limit.period} seconds)"
+            message += "; sleeping #{rate_limit.reset} seconds before trying again"
+            Kennel.err.puts message
+            sleep rate_limit.reset.to_f
+            redo
+          end
+
           break if i == tries - 1 || method != :get || response.status < 500
           Kennel.err.puts "Retrying on server error #{response.status} for #{path}"
         end

data/lib/kennel/models/record.rb

@@ -96,7 +96,9 @@ module Kennel
         # strict: ignore Integer vs Float
         # similarity: show diff when not 100% similar
         # use_lcs: saner output
-        Hashdiff.diff(actual, expected, use_lcs: false, strict: false, similarity: 1)
+        result = Hashdiff.diff(actual, expected, use_lcs: false, strict: false, similarity: 1)
+        raise "Empty diff detected: guard condition failed" if result.empty?
+        result
       end
 
       def tracking_id

data/lib/kennel/syncer/plan_printer.rb

@@ -22,11 +22,19 @@ module Kennel
 
       def print_changes(step, list, color)
         return if list.empty?
+
+        use_groups = ENV.key?("GITHUB_STEP_SUMMARY")
+
         list.each do |item|
+          # No trailing newline
+          Kennel.out.print "::group::" if item.class::TYPE == :update && use_groups
+
           Kennel.out.puts Console.color(color, "#{step} #{item.api_resource} #{item.tracking_id}")
           if item.class::TYPE == :update
             item.diff.each { |args| Kennel.out.puts @attribute_differ.format(*args) } # only for update
           end
+
+          Kennel.out.puts "::endgroup::" if item.class::TYPE == :update && use_groups
         end
       end
     end

data/lib/kennel/tasks.rb

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

data/lib/kennel/utils.rb

@@ -12,8 +12,8 @@ module Kennel
         result
       end
 
-      def path_to_url(path, subdomain: nil)
-        subdomain ||= (ENV["DATADOG_SUBDOMAIN"] || "app")
+      def path_to_url(path)
+        subdomain = (ENV["DATADOG_SUBDOMAIN"] || "app")
         "https://#{subdomain}.datadoghq.com#{path}"
       end
 

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.147.0
+  version: 1.149.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs