smart_proxy_ansible 3.7.3 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62663eb451dc821e58bc13d80bea37a9d83ad9965f2bdb976066d8d4b2df46c4
-  data.tar.gz: 802d91dd6016c9dfe9608548ad4117ba47f31087d0dd094f339c00ca37422163
+  metadata.gz: e3532929de90e5fc55c68612c2115c850b9d9dba54d77eef074b4d5ce87f503d
+  data.tar.gz: 469ce14c343fbde417806c34790c6bca56d6ed616bf1c32fe5c7333b9b55c28e
 SHA512:
-  metadata.gz: 72adab05fd62603bb7f5d32130262b1e012363390958ab4e2e82805d5e02735f7fe5f902afc8880cb03d8e90bf8ac4a09860480dc7ebb8eca61a8956f8489cd7
-  data.tar.gz: a4788c693e227db30e8c6ab21bc31d1d583e07b999043cc5eb812bfc9cf501bf2efa5459b1f5bc85c670f3be7314744e4be1fc038975ad132eee21ae6cc7c234
+  metadata.gz: 27d36fc8771eb3d48cd12d381677cd37c8feca4ea13c2bad657f9ce40d202e473096e6720b24708b2d4d87173840cde54d25a4cd626b0d25d3cb59853df8caa6
+  data.tar.gz: 6710e37886af0b5f2954e72683bd182b30c8eebba66a6145a495d4eb0720bb578926cbb55fcc5cb53d706d55077b4ad8f61622b89d015f4ebb30fd6664d285db

data/lib/smart_proxy_ansible/artifacts_reader.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Proxy::Ansible
+  class ArtifactsReader
+    Artifact = Struct.new(:path, :content, :keyword_init => true)
+
+    def initialize(root)
+      @root = root
+      @counter = 1
+    end
+
+    def new_artifacts
+      files = new_event_files
+      return [] if files.empty?
+
+      artifacts = files.map do |path, _number|
+        Artifact.new(:path => path, :content => File.read(path))
+      end
+      @counter = files.last.last + 1
+      artifacts
+    end
+
+    private
+
+    def new_event_files
+      event_directory = event_directory_path
+      return [] unless event_directory
+
+      files = Dir[File.join(event_directory, '*.json')].each_with_object([]) do |path, result|
+        basename = File.basename(path)
+        match = basename.match(/\A(\d+)/)
+        next if basename.include?('partial') || !match
+
+        result << [path, match[1].to_i]
+      end
+      files.select { |_path, number| number >= @counter }.sort_by(&:last)
+    end
+
+    def event_directory_path
+      unless @uuid
+        artifact_directory = Dir[File.join(@root, 'artifacts', '*')].first
+        @uuid = File.basename(artifact_directory) if artifact_directory
+      end
+      File.join(@root, 'artifacts', @uuid, 'job_events') if @uuid
+    end
+  end
+end

data/lib/smart_proxy_ansible/runner/ansible_runner.rb

@@ -4,6 +4,7 @@ require 'yaml'
 require 'smart_proxy_dynflow/runner/process_manager_command'
 require 'smart_proxy_dynflow/runner/base'
 require 'smart_proxy_dynflow/runner/parent'
+require 'smart_proxy_ansible/artifacts_reader'
 module Proxy::Ansible
   module Runner
     class AnsibleRunner < ::Proxy::Dynflow::Runner::Parent
@@ -90,29 +91,17 @@ module Proxy::Ansible
       private
 
       def process_artifacts
-        @counter ||= 1
-        @uuid ||= if (f = Dir["#{@root}/artifacts/*"].first)
-                    File.basename(f)
-                  end
-        return unless @uuid
-        job_event_dir = File.join(@root, 'artifacts', @uuid, 'job_events')
-        loop do
-          files = Dir["#{job_event_dir}/*.json"].map do |file|
-            num = File.basename(file)[/\A\d+/].to_i unless file.include?('partial')
-            [file, num]
-          end
-          files_with_nums = files.select { |(_, num)| num && num >= @counter }.sort_by(&:last)
-          break if files_with_nums.empty?
-          logger.debug("[foreman_ansible] - processing event files: #{files_with_nums.map(&:first).inspect}}")
-          files_with_nums.map(&:first).each { |event_file| handle_event_file(event_file) }
-          @counter = files_with_nums.last.last + 1
+        @artifacts_reader ||= ArtifactsReader.new(@root)
+        until (artifacts = @artifacts_reader.new_artifacts).empty?
+          logger.debug("[foreman_ansible] - processing event files: #{artifacts.map(&:path).inspect}")
+          artifacts.each { |artifact| handle_event_file(artifact) }
         end
       end
 
-      def handle_event_file(event_file)
-        logger.debug("[foreman_ansible] - parsing event file #{event_file}")
+      def handle_event_file(artifact)
+        logger.debug("[foreman_ansible] - parsing event file #{artifact.path}")
         begin
-          event = JSON.parse(File.read(event_file))
+          event = JSON.parse(artifact.content)
           if (hostname = hostname_for_event(event))
             handle_host_event(hostname, event)
           else
@@ -120,7 +109,7 @@ module Proxy::Ansible
           end
           true
         rescue JSON::ParserError => e
-          logger.error("[foreman_ansible] - Error parsing runner event at #{event_file}: #{e.class}: #{e.message}")
+          logger.error("[foreman_ansible] - Error parsing runner event at #{artifact.path}: #{e.class}: #{e.message}")
           logger.debug(e.backtrace.join("\n"))
         end
       end

data/lib/smart_proxy_ansible/version.rb

@@ -2,6 +2,6 @@ module Proxy
   # Version, this allows the proxy and other plugins know
   # what version of the Ansible plugin is running
   module Ansible
-    VERSION = '3.7.3'
+    VERSION = '3.7.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.4
 platform: ruby
 authors:
 - Ivan Nečas
@@ -81,6 +81,7 @@ files:
 - bundler.d/ansible.rb
 - lib/smart_proxy_ansible.rb
 - lib/smart_proxy_ansible/api.rb
+- lib/smart_proxy_ansible/artifacts_reader.rb
 - lib/smart_proxy_ansible/configuration_loader.rb
 - lib/smart_proxy_ansible/exception.rb
 - lib/smart_proxy_ansible/http_config.ru