foreman_remote_execution 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c69660ec871252ef2e050387571203f0bc88304fa95178ef4c8483f728fd2324
-  data.tar.gz: 42aa074014895c236544f7ae4500214df93cb28f3590faa9a31fd3ac166746aa
+  metadata.gz: 5f8f8c5208313baaca0c289321f6cc4c07c8d27d9f8d97c83e764d58a902f152
+  data.tar.gz: cf6df45271fa254133e0c15e1084f835984e857247b1b8980b61555db9b43ae2
 SHA512:
-  metadata.gz: b207852afa534924b6a029b756492ebb7543ec39064e010a8c66bfd1ab68cd9ff53911bd437736f53308f78b7d55cbee73413e6c267ecbdf14777d78b7380a3c
-  data.tar.gz: 66e6b7ed2f4780c3b33b468691c90ace64fe3cc1f62fad6446c039c119fa7d8193cd6b15cf6566a73c48c90c0ed4199d26eb66190ff3383ccacd5db86fd809df
+  metadata.gz: 8c0ebcfd20e690e37e882e7a1d93be312989252d9b875977852e4587b7b3fe2232bc745f89f7d5d83bce1dc6c6480871ad4daae5d30b482d3f9b7fccf64089fd
+  data.tar.gz: 1fc408ceb6aebaddd2fb83fe91ceb9f7674ae3735bc2eb89c522903dc1f67175f348261557a95ae30d091dc409aa20cfc9a4133426b1f42913c2f6da165c3781

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/lib/foreman_remote_execution/renderer/scope/input.rb

@@ -15,6 +15,14 @@ module ForemanRemoteExecution
           !!@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 render_template(template_name, input_values = {}, options = {})
           options.assert_valid_keys(:with_foreign_input_set)
           with_foreign_input_set = options.fetch(:with_foreign_input_set, true)

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/app/models/remote_execution_feature.rb

@@ -25,7 +25,13 @@ class RemoteExecutionFeature < ApplicationRecord
 
   # rubocop:disable Metrics/PerceivedComplexity
   def self.register(label, name, options = {})
-    return false if Foreman.in_setup_db_rake? || !RemoteExecutionFeature.table_exists?
+    begin
+      return false unless RemoteExecutionFeature.table_exists?
+    rescue ActiveRecord::NoDatabaseError => e
+      # just ignore the problem if DB does not exist yet (rake db:create call)
+      return false
+    end
+
     options.assert_valid_keys(*VALID_OPTIONS)
     options[:host_action_button] = false unless options.key?(:host_action_button)
 

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.6.2'.freeze
+  VERSION = '1.6.3'.freeze
 end

data/test/unit/renderer_scope_input.rb

@@ -0,0 +1,49 @@
+require 'test_plugin_helper'
+
+class RendererScopeInputTest < ActiveSupport::TestCase
+  let(:source) { Foreman::Renderer::Source::String.new(content: '') }
+
+  describe 'caching helper in real mode' do
+    let(:input) do
+      input = ForemanRemoteExecution::Renderer::Scope::Input.new(source: source)
+      input.stubs(:invocation => OpenStruct.new(:job_invocation_id => 1))
+      input
+    end
+
+    it 'caches the value under given key' do
+      i = 1
+      result = input.cached('some_key') { i }
+      result.must_equal 1
+
+      i += 1
+      result = input.cached('some_key') { i }
+      result.must_equal 1
+
+      i += 1
+      result = input.cached('different_key') { i }
+      result.must_equal 3
+    end
+  end
+
+  describe 'caching helper in preview mode' do
+    let(:input) do
+      input = ForemanRemoteExecution::Renderer::Scope::Input.new(source: source)
+      input.stubs(:invocation => OpenStruct.new(:job_invocation_id => 1), :preview? => true)
+      input
+    end
+
+    it 'does not cache the value' do
+      i = 1
+      result = input.cached('some_key') { i }
+      result.must_equal 1
+
+      i += 1
+      result = input.cached('some_key') { i }
+      result.must_equal 2
+
+      i += 1
+      result = input.cached('different_key') { i }
+      result.must_equal 3
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -384,6 +384,7 @@ files:
 - test/unit/job_template_test.rb
 - test/unit/remote_execution_feature_test.rb
 - test/unit/remote_execution_provider_test.rb
+- test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
 - test/unit/template_input_test.rb
 - test/unit/template_invocation_input_value_test.rb
@@ -449,6 +450,7 @@ test_files:
 - test/unit/job_template_test.rb
 - test/unit/remote_execution_feature_test.rb
 - test/unit/remote_execution_provider_test.rb
+- test/unit/renderer_scope_input.rb
 - test/unit/targeting_test.rb
 - test/unit/template_input_test.rb
 - test/unit/template_invocation_input_value_test.rb