smart_proxy_reports 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a87c1e46cdc27bbfa0c00b76c30da881d87ca699457395ba471318139a8e6e07
-  data.tar.gz: efca59c56a9b292aec6e8e72cc5b05d4db959d18651f8ac4848e0b1a79fece02
+  metadata.gz: d912cb5621772d9d65e57b9a35bc6a9b6bba176b5a4e6b13ba92e925af516138
+  data.tar.gz: 21cd931923c1035e34d74a997a2b21db7a3e18763fcbb577ef627d335a17c968
 SHA512:
-  metadata.gz: a7acce03922c7e3c893e438206a1ac3482aabd7c44010655ae4bbbab4cc88146d4c8bf02329c789d551a9badccb267bfbeae42fec58460d7165aec4b1d47c29b
-  data.tar.gz: c6540c75cc3076883f2fd6f76e65795ab2bbd1e2c2699576fc01b2eacae24b1b88d354135116704fa673fd27a43ea5bed6c7e004b148345601be294a0ec8f847
+  metadata.gz: 75c240ad37535a5b5b27ba7d6591e3ab4e32b2c94530adbfc5bd034a44382dbeda7eef49a8d298e2f59b931392d69ec54f0457fdffdce89eccd45ebccf726da9
+  data.tar.gz: b6c8b3ffc7af5f2971699fe60f7d31406f52733b8f5c238a7889bfdd17ccdf00d2cad8e6d93b1d35b438e3ef5aff0e178bb74dd5de0fe0397d7c4ac451e212e8

data/lib/smart_proxy_reports/ansible_processor.rb

@@ -1,3 +1,5 @@
+require_relative "friendly_message"
+
 # frozen_string_literal: true
 
 module Proxy::Reports
@@ -20,9 +22,12 @@ module Proxy::Reports
 
     def process_results
       @data["results"]&.each do |result|
+        raise("Report do not contain required 'results/result' element") unless result["result"]
+        raise("Report do not contain required 'results/task' element") unless result["task"]
         process_facts(result)
         process_level(result)
-        process_message(result)
+        friendly_message = FriendlyMessage.new(result)
+        result["friendly_message"] = friendly_message.generate_message
         process_keywords(result)
       end
       @data["results"]
@@ -99,41 +104,6 @@ module Proxy::Reports
       end
     end
 
-    def process_message(result)
-      msg = "N/A"
-      return result["friendly_message"] = msg if result["task"].nil? || result["task"]["action"].nil?
-      return result["friendly_message"] = result["result"]["msg"] if result["failed"]
-      result_tree = result["result"]
-      task_tree = result["task"]
-      raise("Report do not contain required 'results/result' element") unless result_tree
-      raise("Report do not contain required 'results/task' element") unless task_tree
-      module_args_tree = result_tree.dig("invocation", "module_args")
-
-      case task_tree["action"]
-      when "ansible.builtin.package", "package"
-        detail = result_tree["results"] || result_tree["msg"] || "No details"
-        msg = "Package(s) #{module_args_tree["name"].join(",")} are #{module_args_tree["state"]}: #{detail}"
-      when "ansible.builtin.template", "template"
-        msg = "Render template #{module_args_tree["_original_basename"]} to #{result_tree["dest"]}"
-      when "ansible.builtin.service", "service"
-        msg = "Service #{result_tree["name"]} is #{result_tree["state"]} and enabled: #{result_tree["enabled"]}"
-      when "ansible.builtin.group", "group"
-        msg = "User group #{result_tree["name"]} is #{result_tree["state"]} with gid: #{result_tree["gid"]}"
-      when "ansible.builtin.user", "user"
-        msg = "User #{result_tree["name"]} is #{result_tree["state"]} with uid: #{result_tree["uid"]}"
-      when "ansible.builtin.cron", "cron"
-        msg = "Cron job: #{module_args_tree["minute"]} #{module_args_tree["hour"]} #{module_args_tree["day"]} #{module_args_tree["month"]} #{module_args_tree["weekday"]} #{module_args_tree["job"]} and disabled: #{module_args_tree["disabled"]}"
-      when "ansible.builtin.copy", "copy"
-        msg = "Copy #{module_args_tree["_original_basename"]} to #{result_tree["dest"]}"
-      when "ansible.builtin.command", "ansible.builtin.shell", "command", "shell"
-        msg = result_tree["stdout_lines"]
-      end
-    rescue StandardError => e
-      logger.debug "Unable to parse result (#{e.message}): #{result.inspect}"
-    ensure
-      result["friendly_message"] = msg
-    end
-
     def process_statuses
       {
         "applied" => @body["status"]["applied"],

data/lib/smart_proxy_reports/friendly_message.rb

@@ -0,0 +1,66 @@
+class FriendlyMessage
+  def initialize(result)
+    @result = result
+    @result_tree = @result["result"]
+    @task_tree = @result["task"]
+    @module_args_tree = @result_tree.dig("invocation", "module_args")
+  end
+
+  def generate_message
+    msg = "N/A"
+    return msg if @task_tree.nil? || @task_tree["action"].nil?
+    return @result_tree["msg"] if @result["failed"]
+
+    case @task_tree["action"]
+    when "ansible.builtin.package", "package" then msg = package_message
+    when "ansible.builtin.template", "template" then msg = template_message
+    when "ansible.builtin.service", "service" then msg = service_message
+    when "ansible.builtin.group", "group" then msg = group_message
+    when "ansible.builtin.user", "user" then msg = user_message
+    when "ansible.builtin.cron", "cron" then msg = cron_message
+    when "ansible.builtin.copy", "copy" then msg = copy_message
+    when "ansible.builtin.command", "ansible.builtin.shell", "command", "shell" then msg = @result_tree["stdout_lines"]
+    end
+    msg
+  rescue StandardError => e
+    logger.debug "Unable to parse result (#{e.message}): #{@result.inspect}"
+    msg
+  end
+
+  def human_readable_array(array, length = 10)
+    return array if array.nil?
+    return array.slice(0, length).join(", ") + " and more" if array.length > length
+    array.join(", ")
+  end
+
+  def package_message
+    packages = human_readable_array(@module_args_tree["name"])
+    state = "present"
+    state = @module_args_tree["state"] unless @module_args_tree["state"].nil?
+    "Package(s) #{packages} are #{state}"
+  end
+
+  def template_message
+    "Render template #{@module_args_tree["_original_basename"]} to #{@result_tree["dest"]}"
+  end
+
+  def service_message
+    "Service #{@result_tree["name"]} is #{@result_tree["state"]} and enabled: #{@result_tree["enabled"]}"
+  end
+
+  def group_message
+    "User group #{@result_tree["name"]} is #{@result_tree["state"]} with gid: #{@result_tree["gid"]}"
+  end
+
+  def user_message
+    "User #{@result_tree["name"]} is #{@result_tree["state"]} with uid: #{@result_tree["uid"]}"
+  end
+
+  def cron_message
+    "Cron job: #{@module_args_tree["minute"]} #{@module_args_tree["hour"]} #{@module_args_tree["day"]} #{@module_args_tree["month"]} #{@module_args_tree["weekday"]} #{@module_args_tree["job"]} and disabled: #{@module_args_tree["disabled"]}"
+  end
+
+  def copy_message
+    "Copy #{@module_args_tree["_original_basename"]} to #{@result_tree["dest"]}"
+  end
+end

data/lib/smart_proxy_reports/puppet_processor.rb

@@ -59,6 +59,8 @@ module Proxy::Reports
         add_keywords("PuppetHasSkips") if value["skipped"]
         # corrective changes
         add_keywords("PuppetHasCorrectiveChange") if value["corrective_change"]
+        # others
+        add_keywords("PuppetEnvironment:#{@data["environment"]}") if @data["environment"]
       end
       statuses
     rescue StandardError => e

data/lib/smart_proxy_reports/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Reports
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_reports
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,7 @@ files:
 - bundler.d/reports.rb
 - lib/smart_proxy_reports.rb
 - lib/smart_proxy_reports/ansible_processor.rb
+- lib/smart_proxy_reports/friendly_message.rb
 - lib/smart_proxy_reports/processor.rb
 - lib/smart_proxy_reports/puppet_processor.rb
 - lib/smart_proxy_reports/reports.rb
@@ -62,7 +63,8 @@ files:
 homepage: http://github.com/theforeman/smart_proxy_reports
 licenses:
 - GPL-3.0-or-later
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: