foreman_remote_execution 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9494abeb23995efb0f837561fd1b1bd84fbd7ef37060081ea573d2dde16bd74b
-  data.tar.gz: afbf23769a88fecbbcb7197249b2261a046b568be38699c35a12210ab6cb13e5
+  metadata.gz: e46050a5990faad87a961e071259349d70484bd1a3a5dc591f2dc2d99a8ed5fd
+  data.tar.gz: 2024c485f96831c771299629dee1eae498fbc078cd9a97fded7db60a66c88b4f
 SHA512:
-  metadata.gz: 28dd96a2c75c9e94f71a6613fac13ecbf7938d46fdfc0d5208833073149a3e60c84de6a7ee357ca22318abae29a7deb85afb77377ff462ee71aade08cf7ec0ca
-  data.tar.gz: 5d012baa162db923230e7d7c0f0dc03a315075ce79f3bc64b8cc1236c328061c2ff839f97c56849157c303fc5e758376ecab15d65137cf206aabe6159d7025cf
+  metadata.gz: fc474783987a76f8fa74304887f7a54aba2d1a4a64619087d891266916cff2f9c4527e2a53fff719bf8736f10d9fbf8542da2d99cd78d87d946f1048965c24a8
+  data.tar.gz: af6e2aa4211743d8e210f2dfc823f81110ff6100ba4cb046b90ab85ca8a13048e6087eaaeebe9d856112cd525b2ae957e5d112a5734d96754fc77013b51b4cd7

data/app/lib/actions/remote_execution/run_hosts_job.rb

@@ -49,6 +49,8 @@ module Actions
         job_invocation.password = job_invocation.key_passphrase = job_invocation.sudo_password = nil
         job_invocation.save!
 
+        Rails.logger.debug "cleaning cache for keys that begin with 'job_invocation_#{job_invocation.id}'"
+        Rails.cache.delete_matched(/\A#{JobInvocation::CACHE_PREFIX}_#{job_invocation.id}/)
         # creating the success notification should be the very last thing this tasks do
         job_invocation.build_notification.deliver!
       end

data/app/models/input_template_renderer.rb

@@ -25,7 +25,7 @@ class InputTemplateRenderer
 
   def render
     @template.validate_unique_inputs!
-    render_safe(@template.template, ::Foreman::Renderer::ALLOWED_HELPERS + [ :input, :render_template, :preview?, :render_error ], :host => @host)
+    render_safe(@template.template, ::Foreman::Renderer::ALLOWED_HELPERS + [ :input, :render_template, :preview?, :render_error, :cached ], :host => @host)
   rescue => e
     self.error_message ||= _('error during rendering: %s') % e.message
     Rails.logger.debug e.to_s + "\n" + e.backtrace.join("\n")
@@ -40,6 +40,13 @@ class InputTemplateRenderer
     @preview = old_preview
   end
 
+  def cached(key, &block)
+    return yield if preview?
+    cache_key = "#{JobInvocation::CACHE_PREFIX}_#{invocation.job_invocation_id}_#{key}"
+    Rails.logger.debug "cache hit for #{cache_key}" if Rails.cache.exist?(cache_key)
+    Rails.cache.fetch(cache_key, &block)
+  end
+
   def input(name)
     return @input_values[name.to_s] if @input_values
     input = find_by_name(@template.template_inputs_with_foreign, name) # rubocop:disable Rails/DynamicFindBy

data/app/models/job_invocation.rb

@@ -1,4 +1,6 @@
 class JobInvocation < ApplicationRecord
+  CACHE_PREFIX = "job_invocation".freeze
+
   audited :except => [:task_id, :targeting_id, :task_group_id, :triggering_id]
 
   include Authorizable

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.5.5'.freeze
+  VERSION = '1.5.6'.freeze
 end

data/test/unit/input_template_renderer_test.rb

@@ -39,6 +39,36 @@ class InputTemplateRendererTest < ActiveSupport::TestCase
           renderer.error_message.wont_be_empty
         end
       end
+
+      describe 'caching helper' do
+        it 'caches the value under given key in real mode' do
+          renderer.stubs(:invocation => OpenStruct.new(:job_invocation_id => 1))
+
+          i = 1
+          result = renderer.cached('some_key') { i }
+          result.must_equal 1
+          i += 1
+          result = renderer.cached('some_key') { i }
+          result.must_equal 1
+          i += 1
+          result = renderer.cached('different_key') { i }
+          result.must_equal 3
+        end
+
+        it 'does not cache the value in preview mode' do
+          renderer.stubs(:invocation => OpenStruct.new(:job_invocation_id => 1), :preview? => true)
+
+          i = 1
+          result = renderer.cached('some_key') { i }
+          result.must_equal 1
+          i += 1
+          result = renderer.cached('some_key') { i }
+          result.must_equal 2
+          i += 1
+          result = renderer.cached('different_key') { i }
+          result.must_equal 3
+        end
+      end
     end
 
     context 'with matching input defined' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface