kennel 1.129.0 → 1.130.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7690d961a150ea0ba0649edcab513c22ec828988fec2ab631636497274305c7
-  data.tar.gz: c5bc7244c4168466f5167e5c322f3a2cdb8e6b9b8ec23a2d12fb343a7648ae06
+  metadata.gz: d6ee3df09b69dd5a7af7285c219f4415c4e94ce2ab4f6533c5fff03be848e9c4
+  data.tar.gz: d7f923b69ad9b63774141ac0e9c6c04de7a26a67abd732c41c5f19d478704656
 SHA512:
-  metadata.gz: 51b47377a8cf688dafd17600b543cc1734eb8511a6ed1b627d8b1180bf70fc66c86f9d4a8e4b2a3ff5e7223edf366e5483d983d9465c5907aaa07f5b9c36ef46
-  data.tar.gz: 698c23a4de558382467342b90e7d3eac143a0279653efe9f1b711b3e114a37d8d72f4a9c5d97e652a6646007298f5e93f296c1125caaa4c498195089b0cac730
+  metadata.gz: 7c967bf54743cc757a0c0c911e981701d4b5b393f6ebac66538432541c7c6dfecef2cd8c1c0e5389f90c7d0b91a54e79a29e0e1abf9d16fd67adad4bcd6209fe
+  data.tar.gz: 297239ea9305e4eadbe40a363160b0ca2aaf70dad237f95a448b00b30d3db9ed9f707b2736b2596ef73e8981d333b600af87da40978f5d1c9fc8e0dee3d7f9ea

data/lib/kennel/api.rb

@@ -5,6 +5,14 @@ module Kennel
   class Api
     CACHE_FILE = "tmp/cache/details"
 
+    def self.tag(api_resource, reply)
+      klass = Models::Record.api_resource_map[api_resource]
+      reply.merge(
+        klass: klass,
+        tracking_id: klass.parse_tracking_id(reply)
+      )
+    end
+
     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")
@@ -16,7 +24,7 @@ module Kennel
       response = request :get, "/api/v1/#{api_resource}/#{id}", params: params
       response = response.fetch(:data) if api_resource == "slo"
       response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
-      response
+      self.class.tag(api_resource, response)
     end
 
     def list(api_resource, params = {})
@@ -32,7 +40,7 @@ module Kennel
         # ignore monitor synthetics create and that inherit the kennel_id, we do not directly manage them
         response.reject! { |m| m[:type] == "synthetics alert" } if api_resource == "monitor"
 
-        response
+        response.map { |r| self.class.tag(api_resource, r) }
       end
     end
 
@@ -40,13 +48,13 @@ module Kennel
       response = request :post, "/api/v1/#{api_resource}", body: attributes
       response = response.fetch(:data).first if api_resource == "slo"
       response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
-      response
+      self.class.tag(api_resource, response)
     end
 
     def update(api_resource, id, attributes)
       response = request :put, "/api/v1/#{api_resource}/#{id}", body: attributes
       response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
-      response
+      self.class.tag(api_resource, response)
     end
 
     # - force=true to not dead-lock on dependent monitors+slos

data/lib/kennel/attribute_differ.rb

@@ -46,13 +46,13 @@ module Kennel
       Diff::LCS.sdiff(old.split("\n", -1), new.split("\n", -1)).flat_map do |diff|
         case diff.action
         when "-"
-          Utils.color(:red, "- #{diff.old_element}")
+          Console.color(:red, "- #{diff.old_element}")
         when "+"
-          Utils.color(:green, "+ #{diff.new_element}")
+          Console.color(:green, "+ #{diff.new_element}")
         when "!"
           [
-            Utils.color(:red, "- #{diff.old_element}"),
-            Utils.color(:green, "+ #{diff.new_element}")
+            Console.color(:red, "- #{diff.old_element}"),
+            Console.color(:green, "+ #{diff.new_element}")
           ]
         else
           "  #{diff.old_element}"
@@ -61,12 +61,12 @@ module Kennel
     end
 
     def truncate(message)
-      warning = Utils.color(
+      warning = Console.color(
         :magenta,
         "  (Diff for this item truncated after #{@max_diff_lines} lines. " \
         "Rerun with MAX_DIFF_LINES=#{@max_diff_lines * 2} to see more)"
       )
-      Utils.truncate_lines(message, to: @max_diff_lines, warning: warning)
+      StringUtils.truncate_lines(message, to: @max_diff_lines, warning: warning)
     end
 
     # TODO: use awesome-print or similar, but it has too many monkey-patches

data/lib/kennel/console.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+module Kennel
+  module Console
+    COLORS = { red: 31, green: 32, yellow: 33, cyan: 36, magenta: 35, default: 0 }.freeze
+
+    class TeeIO < IO
+      def initialize(ios)
+        super(0) # called with fake file descriptor 0, so we can call super and get a proper class
+        @ios = ios
+      end
+
+      def write(string)
+        @ios.each { |io| io.write string }
+      end
+    end
+
+    class << self
+      def ask?(question)
+        Kennel.err.printf color(:red, "#{question} -  press 'y' to continue: ", force: true)
+        begin
+          STDIN.gets.chomp == "y"
+        rescue Interrupt # do not show a backtrace if user decides to Ctrl+C here
+          Kennel.err.print "\n"
+          exit 1
+        end
+      end
+
+      def color(color, text, force: false)
+        return text unless force || Kennel.out.tty?
+
+        "\e[#{COLORS.fetch(color)}m#{text}\e[0m"
+      end
+
+      def capture_stdout
+        old = Kennel.out
+        Kennel.out = StringIO.new
+        yield
+        Kennel.out.string
+      ensure
+        Kennel.out = old
+      end
+
+      def capture_stderr
+        old = Kennel.err
+        Kennel.err = StringIO.new
+        yield
+        Kennel.err.string
+      ensure
+        Kennel.err = old
+      end
+
+      def tee_output
+        old_stdout = Kennel.out
+        old_stderr = Kennel.err
+        capture = StringIO.new
+        Kennel.out = TeeIO.new([capture, Kennel.out])
+        Kennel.err = TeeIO.new([capture, Kennel.err])
+        yield
+        capture.string
+      ensure
+        Kennel.out = old_stdout
+        Kennel.err = old_stderr
+      end
+    end
+  end
+end

data/lib/kennel/github_reporter.rb

@@ -24,7 +24,7 @@ module Kennel
     end
 
     def report(&block)
-      output = Utils.tee_output(&block).strip
+      output = Console.tee_output(&block).strip
     rescue StandardError
       output = "Error:\n#{$ERROR_INFO.message}"
       raise

data/lib/kennel/importer.rb

@@ -33,7 +33,7 @@ module Kennel
           model.remove_tracking_id(data)
           tracking_id.split(":").last
         else
-          Kennel::Utils.parameterize(title)
+          Kennel::StringUtils.parameterize(title)
         end
 
       case resource

data/lib/kennel/models/base.rb

@@ -10,7 +10,7 @@ module Kennel
       SETTING_OVERRIDABLE_METHODS = [:name, :kennel_id].freeze
 
       def kennel_id
-        @kennel_id ||= Utils.snake_case kennel_id_base
+        @kennel_id ||= StringUtils.snake_case kennel_id_base
       end
 
       def name

data/lib/kennel/string_utils.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module Kennel
+  module StringUtils
+    class << self
+      def snake_case(string)
+        string
+          .gsub(/::/, "_") # Foo::Bar -> foo_bar
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2') # FOOBar -> foo_bar
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2') # fooBar -> foo_bar
+          .tr("-", "_") # foo-bar -> foo_bar
+          .downcase
+      end
+
+      # for child projects, not used internally
+      def title_case(string)
+        string.split(/[\s_]/).map(&:capitalize) * " "
+      end
+
+      # simplified version of https://apidock.com/rails/ActiveSupport/Inflector/parameterize
+      def parameterize(string)
+        string
+          .downcase
+          .gsub(/[^a-z0-9\-_]+/, "-") # remove unsupported
+          .gsub(/-{2,}/, "-") # remove duplicates
+          .gsub(/^-|-$/, "") # remove leading/trailing
+      end
+
+      def truncate_lines(text, to:, warning:)
+        lines = text.split(/\n/, to + 1)
+        lines[-1] = warning if lines.size > to
+        lines.join("\n")
+      end
+    end
+  end
+end

data/lib/kennel/syncer.rb

@@ -22,7 +22,7 @@ module Kennel
       validate_changes
       prevent_irreversible_partial_updates
 
-      @warnings.each { |message| Kennel.out.puts Utils.color(:yellow, "Warning: #{message}") }
+      @warnings.each { |message| Kennel.out.puts Console.color(:yellow, "Warning: #{message}") }
     end
 
     def plan
@@ -37,7 +37,7 @@ module Kennel
     def print_plan
       Kennel.out.puts "Plan:"
       if noop?
-        Kennel.out.puts Utils.color(:green, "Nothing to do")
+        Kennel.out.puts Console.color(:green, "Nothing to do")
       else
         print_changes "Create", @create, :green
         print_changes "Update", @update, :yellow
@@ -48,7 +48,7 @@ module Kennel
     def confirm
       return false if noop?
       return true if ENV["CI"] || !STDIN.tty? || !Kennel.err.tty?
-      Utils.ask("Execute Plan ?")
+      Console.ask?("Execute Plan ?")
     end
 
     def update
@@ -58,7 +58,6 @@ module Kennel
         message = "#{e.class.api_resource} #{e.tracking_id}"
         Kennel.out.puts "Creating #{message}"
         reply = @api.create e.class.api_resource, e.as_json
-        Utils.inline_resource_metadata reply, e.class
         id = reply.fetch(:id)
         changes << Change.new(:create, e.class.api_resource, e.tracking_id, id)
         populate_id_map [], [reply] # allow resolving ids we could previously no resolve
@@ -211,7 +210,7 @@ module Kennel
       return if list.empty?
       list.each do |_, e, a, diff|
         klass = (e ? e.class : a.fetch(:klass))
-        Kennel.out.puts Utils.color(color, "#{step} #{klass.api_resource} #{e&.tracking_id || a.fetch(:tracking_id)}")
+        Kennel.out.puts Console.color(color, "#{step} #{klass.api_resource} #{e&.tracking_id || a.fetch(:tracking_id)}")
         diff&.each { |args| Kennel.out.puts @attribute_differ.format(*args) } # only for update
       end
     end
@@ -270,7 +269,7 @@ module Kennel
           (!@tracking_id_filter || @tracking_id_filter.include?(tracking_id))
 
         @id_map.set(api_resource, tracking_id, a.fetch(:id))
-        if a[:klass].api_resource == "synthetics/tests"
+        if a.fetch(:klass).api_resource == "synthetics/tests"
           @id_map.set(Kennel::Models::Monitor.api_resource, tracking_id, a.fetch(:monitor_id))
         end
       end

data/lib/kennel/unmuted_alerts.rb

@@ -22,7 +22,7 @@ module Kennel
             m[:state][:groups].each do |g|
               color = COLORS[g[:status]] || :default
               since = "\t#{time_since(g[:last_triggered_ts])}"
-              Kennel.out.puts "#{Kennel::Utils.color(color, g[:status])}\t#{g[:name]}#{since}"
+              Kennel.out.puts "#{Kennel::Console.color(color, g[:status])}\t#{g[:name]}#{since}"
             end
             Kennel.out.puts
           end

data/lib/kennel/utils.rb

@@ -1,100 +1,11 @@
 # frozen_string_literal: true
 module Kennel
   module Utils
-    COLORS = { red: 31, green: 32, yellow: 33, cyan: 36, magenta: 35, default: 0 }.freeze
-
-    class TeeIO < IO
-      def initialize(ios)
-        super(0) # called with fake file descriptor 0, so we can call super and get a proper class
-        @ios = ios
-      end
-
-      def write(string)
-        @ios.each { |io| io.write string }
-      end
-    end
-
     class << self
-      def snake_case(string)
-        string
-          .gsub(/::/, "_") # Foo::Bar -> foo_bar
-          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2') # FOOBar -> foo_bar
-          .gsub(/([a-z\d])([A-Z])/, '\1_\2') # fooBar -> foo_bar
-          .tr("-", "_") # foo-bar -> foo_bar
-          .downcase
-      end
-
-      # for child projects, not used internally
-      def title_case(string)
-        string.split(/[\s_]/).map(&:capitalize) * " "
-      end
-
-      # simplified version of https://apidock.com/rails/ActiveSupport/Inflector/parameterize
-      def parameterize(string)
-        string
-          .downcase
-          .gsub(/[^a-z0-9\-_]+/, "-") # remove unsupported
-          .gsub(/-{2,}/, "-") # remove duplicates
-          .gsub(/^-|-$/, "") # remove leading/trailing
-      end
-
       def presence(value)
         value.nil? || value.empty? ? nil : value
       end
 
-      def ask(question)
-        Kennel.err.printf color(:red, "#{question} -  press 'y' to continue: ", force: true)
-        begin
-          STDIN.gets.chomp == "y"
-        rescue Interrupt # do not show a backtrace if user decides to Ctrl+C here
-          Kennel.err.print "\n"
-          exit 1
-        end
-      end
-
-      def color(color, text, force: false)
-        return text unless force || Kennel.out.tty?
-
-        "\e[#{COLORS.fetch(color)}m#{text}\e[0m"
-      end
-
-      def truncate_lines(text, to:, warning:)
-        lines = text.split(/\n/, to + 1)
-        lines[-1] = warning if lines.size > to
-        lines.join("\n")
-      end
-
-      def capture_stdout
-        old = Kennel.out
-        Kennel.out = StringIO.new
-        yield
-        Kennel.out.string
-      ensure
-        Kennel.out = old
-      end
-
-      def capture_stderr
-        old = Kennel.err
-        Kennel.err = StringIO.new
-        yield
-        Kennel.err.string
-      ensure
-        Kennel.err = old
-      end
-
-      def tee_output
-        old_stdout = Kennel.out
-        old_stderr = Kennel.err
-        capture = StringIO.new
-        Kennel.out = TeeIO.new([capture, Kennel.out])
-        Kennel.err = TeeIO.new([capture, Kennel.err])
-        yield
-        capture.string
-      ensure
-        Kennel.out = old_stdout
-        Kennel.err = old_stderr
-      end
-
       def capture_sh(command)
         result = `#{command} 2>&1`
         raise "Command failed:\n#{command}\n#{result}" unless $CHILD_STATUS.success?
@@ -150,11 +61,6 @@ module Kennel
         else []
         end
       end
-
-      def inline_resource_metadata(resource, klass)
-        resource[:klass] = klass
-        resource[:tracking_id] = klass.parse_tracking_id(resource)
-      end
     end
   end
 end

data/lib/kennel/version.rb

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

data/lib/kennel.rb

@@ -5,6 +5,8 @@ require "zeitwerk"
 require "English"
 
 require "kennel/version"
+require "kennel/console"
+require "kennel/string_utils"
 require "kennel/utils"
 require "kennel/progress"
 require "kennel/filter"
@@ -133,8 +135,7 @@ module Kennel
     def definitions(**kwargs)
       @definitions ||= Progress.progress("Downloading definitions", **kwargs) do
         Utils.parallel(Models::Record.subclasses) do |klass|
-          results = api.list(klass.api_resource, with_downtimes: false) # lookup monitors without adding unnecessary downtime information
-          results.each { |a| Utils.inline_resource_metadata(a, klass) }
+          api.list(klass.api_resource, with_downtimes: false) # lookup monitors without adding unnecessary downtime information
         end.flatten(1)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.129.0
+  version: 1.130.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -90,6 +90,7 @@ files:
 - lib/kennel.rb
 - lib/kennel/api.rb
 - lib/kennel/attribute_differ.rb
+- lib/kennel/console.rb
 - lib/kennel/file_cache.rb
 - lib/kennel/filter.rb
 - lib/kennel/github_reporter.rb
@@ -108,6 +109,7 @@ files:
 - lib/kennel/progress.rb
 - lib/kennel/projects_provider.rb
 - lib/kennel/settings_as_methods.rb
+- lib/kennel/string_utils.rb
 - lib/kennel/subclass_tracking.rb
 - lib/kennel/syncer.rb
 - lib/kennel/tasks.rb