foreman_remote_execution 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aba9a7fccd6e4e3833bd7b102ea464e7266947d2b661ed23665588b969ce848
-  data.tar.gz: 037e1902f40fa780a090aca7f0141be58e0a10805afef0ca0ae5ebc3f7675e2a
+  metadata.gz: 539d13cffc47ca8655fbb368020cd86f5305ed97da5825acc49ce1e671badfc2
+  data.tar.gz: e5798eee85ad923d0e17fdf87e663ca2b64eac28df3c44aab4c8ae670f2d92f6
 SHA512:
-  metadata.gz: a79d209933c9b81a4f0276e20602241147e442f4060d62afd0eab6ccc1d22a65c5b8e95025abfcb0be013ac5d7857f4ccc3cddbea2abf7b67bc2174d6a572406
-  data.tar.gz: 19e249a6a63c909a36fb89e7f614d0db5224d4c14b6dbff92fc078a5259eba9f9cf8d6d9e852f81bb73e32cd9a773dff5b95c48b21223406a6040e4474639802
+  metadata.gz: b59f442d45cc2e8868fc503baaec204bcf9d6caaa297ad54c09d7c130c34ea0f74379d31d585e280d5503021748b9fe7eaae2562b916eb24f5aa18a407e0c5a8
+  data.tar.gz: 7518ada3ae3501683b39a4afeb08748574dbd323db1c40e1ea1f1b6d58200cb9454f4589023246324a12f2f96e11a3122129a7a4fb84478c0da57fc6aa5d7d1d

data/app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb

@@ -23,7 +23,7 @@ module ForemanRemoteExecution
     def web_console_button(host, *args)
       return unless authorized_for(permission: 'cockpit_hosts', auth_object: host)
       url = SSHExecutionProvider.cockpit_url_for_host(host.name)
-      url ? link_to(_('Web Console'), url, :class => 'btn btn-default') : nil
+      url ? link_to(_('Web Console'), url, :class => 'btn btn-default', :id => :'web-console-button') : nil
     end
 
     def host_title_actions(*args)

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -50,7 +50,8 @@ module ForemanRemoteExecution
       keys = remote_execution_ssh_keys
       source = 'global'
       if keys.present?
-        params['remote_execution_ssh_keys'] = {:value => keys, :safe_value => keys, :source => source}
+        value, safe_value = params.fetch('remote_execution_ssh_keys', {}).values_at(:value, :safe_value).map { |v| v || [] }
+        params['remote_execution_ssh_keys'] = {:value => value + keys, :safe_value => safe_value + keys, :source => source}
       end
       [:remote_execution_ssh_user, :remote_execution_effective_user_method,
        :remote_execution_connect_by_ip].each do |key|

data/app/views/job_invocations/_form.html.erb

@@ -33,7 +33,7 @@
       <% end %>
     </span>
     <%= selectable_f targeting_fields, :bookmark_id, @composer.available_bookmarks.map { |b| [b.name, b.id] }, :selected => @composer.targeting.bookmark_id, :include_blank => true %>
-    <%= autocomplete_f targeting_fields, :search_query, :search_query => @composer.displayed_search_query, :full_path => auto_complete_search_hosts_path %>
+    <%= textarea_f targeting_fields, :search_query, :value => @composer.displayed_search_query, :rows => 5, :class => 'autocomplete-input form-control', :'data-url' => auto_complete_search_hosts_path %>
 
     <div class="form-group ">
       <label class="col-md-2 control-label"><%= _('Resolves to') %></label>

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '2.0.5'.freeze
+  VERSION = '2.0.6'.freeze
 end

data/test/unit/concerns/host_extensions_test.rb

@@ -41,6 +41,13 @@ class ForemanRemoteExecutionHostExtensionsTest < ActiveSupport::TestCase
       host.remote_execution_ssh_keys.must_include sshkey
     end
 
+    it 'merges ssh keys from host parameters and proxies' do
+      key = 'ssh-rsa not-even-a-key something@somewhere.com'
+      host.host_parameters << FactoryBot.create(:host_parameter, :host => host, :name => 'remote_execution_ssh_keys', :value => [key])
+      host.host_param('remote_execution_ssh_keys').must_include key
+      host.host_param('remote_execution_ssh_keys').must_include sshkey
+    end
+
     it 'has ssh keys in the parameters even when no user specified' do
       # this is a case, when using the helper in provisioning templates
       FactoryBot.create(:smart_proxy, :ssh)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface