foreman_remote_execution 0.1.2 → 0.2.1

data/app/views/job_templates/_custom_tabs.html.erb

@@ -1,18 +1,22 @@
 <div class="tab-pane" id="template_job">
 
-  <%= field(f, :job_name) do %>
-    <%= auto_complete_search(:job_name,
-                             f.object.job_name,
-                             :placeholder => _("Job name") + ' ...',
-                             :name => 'job_template[job_name]',
-                             :id => 'search') %>
+  <%= field(f, :job_category, :label => _('Job category')) do %>
+    <%= auto_complete_search(:job_category,
+                             f.object.job_category,
+                             :placeholder => _("Job category") + ' ...',
+                             :name => 'job_template[job_category]',
+                             :id => 'search',
+                             :disabled => @template.locked?) %>
   <% end %>
 
   <%= text_f f, :description_format,
-             :help_inline => popover(_('Explanation'), _('Description template determines the job name once it is submitted. Input values can become part of the name
-                         if they are specified using interpolation syntax, e.g. %{fqdn} where fqdn is the name of interpolated input.')) %>
+             :disabled => @template.locked?,
+             :help_inline => popover(_('Explanation'), _('This template is used to generate the description.
+                                                          Input values can be used using the syntax %{package}.
+                                                          You may also include the job category and template
+                                                          name using %{job_category} and %{template_name}.')) %>
 
-  <%= select_f f, :provider_type, providers_options, :first, :last %>
+  <%= select_f f, :provider_type, providers_options, :first, :last, :disabled => @template.locked? %>
 
   <div class="children_fields">
     <%= new_child_fields_template(f, :template_inputs, { :partial => "template_inputs/form" }) %>
@@ -21,16 +25,23 @@
         <%= render 'template_inputs/form', :f => ff %>
       </div>
     <% end %>
-    <%= add_child_link '+ ' + _("Add Input"), :template_inputs, { :title => _('add a input for this template')} %>
+    <%= add_child_link '+ ' + _("Add Input"), :template_inputs, { :title => _('add a input for this template')} unless @template.locked? %>
+    <%= new_child_fields_template(f, :foreign_input_sets, { :partial => "template_inputs/foreign_input_set_form" }) %>
+    <%= f.fields_for :foreign_input_sets do |ff| %>
+      <div class="template_input_form fields">
+        <%= render 'template_inputs/foreign_input_set_form', :f => ff %>
+      </div>
+    <% end %>
+    <%= add_child_link '+ ' + _("Add Foreign Input Set"), :foreign_input_sets, { :title => _('add an input set for this template to reference a different template inputs') } unless @template.locked? %>
   </div>
 
   <div class="children_fields">
     <%= field_set_tag _("Effective user") do %>
       <%= f.fields_for :effective_user, @template.effective_user do |ff| %>
         <div class="effective_user_form fields">
-          <%= text_f ff, :value %>
-          <%= checkbox_f ff, :current_user %>
-          <%= checkbox_f ff, :overridable %>
+          <%= text_f ff, :value, :disabled => @template.locked? %>
+          <%= checkbox_f ff, :current_user, :disabled => @template.locked? %>
+          <%= checkbox_f ff, :overridable, :disabled => @template.locked? %>
         </div>
       <% end %>
     <% end %>
@@ -38,7 +49,6 @@
 
 </div>
 
-
 <div class="tab-pane" id="template_type">
   <%= checkbox_f f, :snippet, :onchange => "snippet_changed(this)", :label=>_('Snippet'), :disabled => @template.locked? %>
 </div>

data/app/views/job_templates/index.html.erb

@@ -3,7 +3,9 @@
 <%= javascript 'template_input' %>
 
 <% title _("Job Templates") %>
-<% title_actions display_link_if_authorized(_("New Job Template"), hash_for_new_job_template_path) %>
+<% title_actions(documentation_button_rex('3.1JobTemplates'),
+                 display_link_if_authorized(_("New Job Template"),
+                                            hash_for_new_job_template_path)) %>
 
 <table class="table table-bordered table-striped table-two-pane">
   <thead>

data/app/views/template_inputs/_foreign_input_set_form.html.erb

@@ -0,0 +1,12 @@
+<div class="fields">
+  <div class="form-group">
+    <%= field_set_tag _("Foreign input set").html_safe +
+                          ' ' +
+                          remove_child_link('x', f, {:rel => 'twipsy', "data-title" => _('remove template input set'), :'data-placement' => 'left', :class => 'fr badge badge-danger'}).html_safe do %>
+      <%= selectable_f f, :target_template_id, JobTemplate.all.map { |t| [ t.name, t.id ] }, {}, :class => 'input_type_selector without_select2' %>
+      <%= checkbox_f f, :include_all, :disabled => @template.locked?, :onchange => 'update_foreign_input_set_include(this)' %>
+      <%= text_f f, :include, :class => 'foreign_input_set_include', :disabled => (@template.locked? || f.object.include_all?), :help_inline => _("A comma separated list of input names to be included from the foreign template.") %>
+      <%= text_f f, :exclude, :disabled => @template.locked?, :help_inline => _("A comma separated list of input names to be excluded from the foreign template.") %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,25 +1,24 @@
 <div class="fields">
   <div class="form-group">
-    <%= field_set_tag _("Template input").html_safe +
-                              ' ' +
-                              remove_child_link('x', f, {:rel => 'twipsy', "data-title" => _('remove template input'), :'data-placement' => 'left', :class => 'fr badge badge-danger'}).html_safe do %>
-      <%= text_f f, :name %>
-      <%= checkbox_f f, :required %>
-      <%= selectable_f f, :input_type, template_input_types_options, {}, :class => 'input_type_selector without_select2' %>
+    <%= field_set_tag template_input_header(f, @template) do  %>
+      <%= text_f f, :name, :disabled => @template.locked? %>
+      <%= checkbox_f f, :required, :disabled => @template.locked? %>
+      <%= selectable_f f, :input_type, template_input_types_options, {}, :class => 'input_type_selector without_select2', :disabled => @template.locked? %>
       <div class="fact_input_type custom_input_type_fields" style="<%= f.object.fact_template_input? ? '' : 'display:none' %>">
-        <%= text_f f, :fact_name, :class => 'fact_input_type', :required => true %>
+        <%= text_f f, :fact_name, :class => 'fact_input_type', :required => true, :disabled => @template.locked? %>
       </div>
       <div class="variable_input_type custom_input_type_fields" style="<%= f.object.variable_template_input? ? '' : 'display:none' %>">
-        <%= text_f f, :variable_name, :class => 'variable_input_type', :required => true %>
+        <%= text_f f, :variable_name, :class => 'variable_input_type', :required => true, :disabled => @template.locked? %>
       </div>
       <div class="puppet_parameter_input_type custom_input_type_fields" style="<%= f.object.puppet_parameter_template_input? ? '' : 'display:none' %>">
-        <%= text_f f, :puppet_class_name, :class => 'puppet_parameter_input_type', :required => true %>
-        <%= text_f f, :puppet_parameter_name, :class => 'puppet_parameter_input_type', :required => true %>
+        <%= text_f f, :puppet_class_name, :class => 'puppet_parameter_input_type', :required => true, :disabled => @template.locked? %>
+        <%= text_f f, :puppet_parameter_name, :class => 'puppet_parameter_input_type', :required => true, :disabled => @template.locked? %>
       </div>
       <div class="user_input_type custom_input_type_fields" style="<%= (f.object.user_template_input? || f.object.new_record?) ? '' : 'display:none' %>">
-        <%= textarea_f f, :options, :rows => 3, :class => 'user_input_type', :help_inline => _("A list of options the user can select from. If not provided, the user will be given a free-form field") %>
+        <%= textarea_f f, :options, :rows => 3, :class => 'user_input_type', :help_inline => _("A list of options the user can select from. If not provided, the user will be given a free-form field"),
+                                    :disabled => @template.locked? %>
       </div>
-      <%= textarea_f f, :description, :rows => 3 %>
+      <%= textarea_f f, :description, :rows => 3, :disabled => @template.locked? %>
     <% end %>
   </div>
 </div>

data/app/views/template_invocations/show.html.erb

@@ -1,4 +1,4 @@
-<% title _('Detail of %s run') % @template_invocation.job_invocation.job_name %>
+<% title _('Detail of %s run') % @template_invocation.job_invocation.job_category %>
 <% stylesheet 'template_invocation' %>
 <% javascript 'template_invocation' %>
 
@@ -19,7 +19,7 @@
   <%= preview_box(@template_invocation, @host) %>
 </div>
 
-<div class="terminal" data-refresh-url="<%= template_invocation_path(@template_invocation_task) %>">
+<div class="terminal" data-refresh-url="<%= template_invocation_path(@template_invocation) %>">
   <% if @error %>
     <div class="line error"><%= @error %></div>
   <% else %>

data/app/views/templates/package_action.erb

@@ -1,9 +1,9 @@
 <%#
 kind: job_template
 name: Package Action - SSH Default
-job_name: Package Action
+job_category: Packages
 description_format: "%{action} package(s) %{package}"
-provider_type: Ssh
+provider_type: SSH
 template_inputs:
 - name: pre_script
   description: A script to run prior to the package action

data/app/views/templates/puppet_run_once.erb

@@ -1,9 +1,9 @@
 <%#
 kind: job_template
 name: Puppet Run Once - SSH Default
-job_name: Puppet Run Once
-description_format: '%{job_name} with "%{puppet_options}"'
-provider_type: Ssh
+job_category: Puppet
+description_format: '%{job_category} with "%{puppet_options}"'
+provider_type: SSH
 template_inputs:
 - name: puppet_options
   description: Additional options to pass to puppet

data/app/views/templates/run_command.erb

@@ -1,9 +1,9 @@
 <%#
 kind: job_template
 name: Run Command - SSH Default
-job_name: Run Command
-description_format: "%{job_name} %{command}"
-provider_type: Ssh
+job_category: Commands
+description_format: "Run %{command}"
+provider_type: SSH
 template_inputs:
 - name: command
   description: Command to run on the host

data/app/views/templates/service_action.erb

@@ -1,9 +1,9 @@
 <%#
 kind: job_template
 name: Service Action - SSH Default
-job_name: Service Action
+job_category: Services
 description_format: '%{action} service %{service}'
-provider_type: Ssh
+provider_type: SSH
 template_inputs:
 - name: action
   description: Action to perform on the service

data/app/views/unattended/snippets/_remote_execution_ssh_keys.erb

@@ -3,7 +3,7 @@
   name: remote_execution_ssh_keys
 %>
 
-<% if @host.params['remote_execution_ssh_keys'].present? %>
+<% if !@host.params['remote_execution_ssh_keys'].blank? %>
 <% ssh_user = @host.params['remote_execution_ssh_user'] || 'root' %>
 <% ssh_path = "~#{ssh_user}/.ssh" %>
 

data/config/routes.rb

@@ -7,9 +7,10 @@ Rails.application.routes.draw do
       post 'preview'
     end
     collection do
+      post 'preview'
       get 'revision'
       get 'auto_complete_search'
-      get 'auto_complete_job_name'
+      get 'auto_complete_job_category'
     end
   end
 
@@ -32,7 +33,7 @@ Rails.application.routes.draw do
   end
 
   namespace :api, :defaults => {:format => 'json'} do
-    scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
+    scope '(:apiv)', :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       resources :job_invocations, :except => [:new, :edit, :update, :destroy] do
         resources :hosts, :only => :none do
           get '/', :to => 'job_invocations#output'
@@ -49,7 +50,8 @@ Rails.application.routes.draw do
       end
 
       resources :templates, :only => :none do
-        resources :template_inputs, :only => [:index, :show, :create, :new, :destroy, :update]
+        resources :template_inputs, :only => [:index, :show, :create, :destroy, :update]
+        resources :foreign_input_sets, :only => [:index, :show, :create, :destroy, :update]
       end
     end
   end

data/db/migrate/20150616080015_create_template_input.rb

@@ -14,6 +14,6 @@ class CreateTemplateInput < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_foreign_key :template_inputs, :templates, :name => "templates_template_id_fk", :column => 'template_id'
+    add_foreign_key :template_inputs, :templates, :name => 'templates_template_id_fk', :column => 'template_id'
   end
 end

data/db/migrate/20150708133241_add_targeting.rb

@@ -8,18 +8,18 @@ class AddTargeting < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :targetings, [:bookmark_id], :name => "targetings_bookmark_id"
-    add_index :targetings, [:user_id], :name => "targetings_user_id"
-    add_foreign_key :targetings, :bookmarks, :name => "targetings_bookmark_id", :column => 'bookmark_id'
-    add_foreign_key :targetings, :users, :name => "targetings_user_id", :column => 'user_id'
+    add_index :targetings, [:bookmark_id], :name => 'targetings_bookmark_id'
+    add_index :targetings, [:user_id], :name => 'targetings_user_id'
+    add_foreign_key :targetings, :bookmarks, :name => 'targetings_bookmark_id', :column => 'bookmark_id'
+    add_foreign_key :targetings, :users, :name => 'targetings_user_id', :column => 'user_id'
 
     create_table :targeting_hosts do |t|
       t.references :host, :null => false
       t.references :targeting, :null => false
     end
 
-    add_index :targeting_hosts, [:host_id, :targeting_id], :name => "targeting_hosts_host_targeting_ids"
-    add_foreign_key :targeting_hosts, :hosts, :name => "targeting_hosts_host_id", :column => 'host_id'
-    add_foreign_key :targeting_hosts, :targetings, :name => "targeting_hosts_targeting_id", :column => 'targeting_id'
+    add_index :targeting_hosts, [:host_id, :targeting_id], :name => 'targeting_hosts_host_targeting_ids'
+    add_foreign_key :targeting_hosts, :hosts, :name => 'targeting_hosts_host_id', :column => 'host_id'
+    add_foreign_key :targeting_hosts, :targetings, :name => 'targeting_hosts_targeting_id', :column => 'targeting_id'
   end
 end

data/db/migrate/20150708133242_add_invocation.rb

@@ -5,7 +5,7 @@ class AddInvocation< ActiveRecord::Migration
       t.string :job_name, :null => false
     end
 
-    add_index :job_invocations, [:targeting_id], :name => "job_invocations_targeting_id"
-    add_foreign_key :job_invocations, :targetings, :name => "job_invocation_targeting_id", :column => 'targeting_id'
+    add_index :job_invocations, [:targeting_id], :name => 'job_invocations_targeting_id'
+    add_foreign_key :job_invocations, :targetings, :name => 'job_invocation_targeting_id', :column => 'targeting_id'
   end
 end

data/db/migrate/20150708133305_add_template_invocation.rb

@@ -5,9 +5,9 @@ class AddTemplateInvocation < ActiveRecord::Migration
       t.references :job_invocation, :null => false
     end
 
-    add_index :template_invocations, [:template_id, :job_invocation_id], :name => "targeting_invocation_template_ji_ids"
-    add_foreign_key :template_invocations, :templates, :name => "template_invoc_template_id", :column => 'template_id'
-    add_foreign_key :template_invocations, :job_invocations, :name => "template_invoc_job_invocation_id", :column => 'job_invocation_id'
+    add_index :template_invocations, [:template_id, :job_invocation_id], :name => 'targeting_invocation_template_ji_ids'
+    add_foreign_key :template_invocations, :templates, :name => 'template_invoc_template_id', :column => 'template_id'
+    add_foreign_key :template_invocations, :job_invocations, :name => 'template_invoc_job_invocation_id', :column => 'job_invocation_id'
 
     create_table :template_invocation_input_values do |t|
       t.references :template_invocation, :null => false
@@ -15,8 +15,8 @@ class AddTemplateInvocation < ActiveRecord::Migration
       t.string :value, :null => false
     end
 
-    add_index :template_invocation_input_values, [:template_invocation_id, :template_input_id], :name => "template_invocation_input_values_ti_ti_ids"
-    add_foreign_key :template_invocation_input_values, :template_invocations, :name => "template_invoc_input_values_template_invoc_id", :column => 'template_invocation_id'
-    add_foreign_key :template_invocation_input_values, :template_inputs, :name => "template_invoc_input_values_template_input_id", :column => 'template_input_id'
+    add_index :template_invocation_input_values, [:template_invocation_id, :template_input_id], :name => 'template_invocation_input_values_ti_ti_ids'
+    add_foreign_key :template_invocation_input_values, :template_invocations, :name => 'template_invoc_input_values_template_invoc_id', :column => 'template_invocation_id'
+    add_foreign_key :template_invocation_input_values, :template_inputs, :name => 'template_invoc_input_values_template_input_id', :column => 'template_input_id'
   end
 end

data/db/migrate/20151215114631_add_host_id_to_template_invocation.rb

@@ -1,11 +1,11 @@
 class AddHostIdToTemplateInvocation < ActiveRecord::Migration
   class FakeTemplateInvocation < ActiveRecord::Base
-    set_table_name 'template_invocations'
+    self.table_name = 'template_invocations'
   end
 
   def up
     add_column :template_invocations, :host_id, :integer
-    add_foreign_key "template_invocations", "hosts", :name => "template_invocations_hosts_id_fk", :column => 'host_id'
+    add_foreign_key 'template_invocations', 'hosts', :name => 'template_invocations_hosts_id_fk', :column => 'host_id'
     FakeTemplateInvocation.reset_column_information
 
     say 'Migrating existing execution locks to explicit relations, this may take a while'
@@ -23,7 +23,7 @@ class AddHostIdToTemplateInvocation < ActiveRecord::Migration
   end
 
   def down
-    remove_foreign_key "template_invocations", :name => "template_invocations_hosts_id_fk"
+    remove_foreign_key 'template_invocations', :name => 'template_invocations_hosts_id_fk'
     remove_column :template_invocations, :host_id
   end
 end

data/db/migrate/20151217092555_migrate_to_task_groups.rb

@@ -1,6 +1,6 @@
 class MigrateToTaskGroups < ActiveRecord::Migration
   class FakeJobInvocation < ActiveRecord::Base
-    set_table_name 'job_invocations'
+    self.table_name = 'job_invocations'
   end
 
   def up

data/db/migrate/20160108134600_create_template_input_sets.rb

@@ -0,0 +1,16 @@
+class CreateTemplateInputSets < ActiveRecord::Migration
+  def change
+    create_table :foreign_input_sets do |t|
+      t.integer :template_id, :null => false
+      t.integer :target_template_id, :null => false
+      t.boolean :include_all, :null => false, :default => true
+      t.text :include
+      t.text :exclude
+    end
+    add_index :foreign_input_sets, :template_id
+    add_foreign_key :foreign_input_sets, :templates
+
+    add_index :foreign_input_sets, :target_template_id
+    add_foreign_key :foreign_input_sets, :templates, :column => :target_template_id
+  end
+end

data/db/migrate/20160108141144_make_job_name_default_to_something.rb

@@ -0,0 +1,9 @@
+class MakeJobNameDefaultToSomething < ActiveRecord::Migration
+  def up
+    change_column :templates, :job_name, :string, :default => 'Miscellaneous'
+  end
+
+  def down
+    change_column :templates, :job_name, :string, :default => nil
+  end
+end

data/db/migrate/20160111113032_upcase_ssh_feature.rb

@@ -0,0 +1,19 @@
+class UpcaseSshFeature < ActiveRecord::Migration
+  class FakeFeature < ActiveRecord::Base
+    self.table_name = 'features'
+  end
+
+  def up
+    f = FakeFeature.where(:name => 'Ssh').first
+    f.update_attribute :name, 'SSH' if f.present?
+
+    JobTemplate.where(:provider_type => 'Ssh').update_all("provider_type = 'SSH'")
+  end
+
+  def down
+    f = FakeFeature.where(:name => 'SSH').first
+    f.update_attribute :name, 'Ssh' if f.present?
+
+    JobTemplate.where(:provider_type => 'SSH').update_all("provider_type = 'Ssh'")
+  end
+end

data/db/migrate/20160113161916_add_run_host_job_task_id_to_template_invocation.rb

@@ -0,0 +1,6 @@
+class AddRunHostJobTaskIdToTemplateInvocation < ActiveRecord::Migration
+  def change
+    add_column :template_invocations, :run_host_job_task_id, :string
+    add_index :template_invocations, [:run_host_job_task_id], :name => 'template_invocations_run_host_job_task_id'
+  end
+end

data/db/migrate/20160113162007_expand_all_template_invocations.rb

@@ -0,0 +1,45 @@
+class ExpandAllTemplateInvocations < ActiveRecord::Migration
+  class FakeTemplateInvocation < ActiveRecord::Base
+    self.table_name = 'template_invocations'
+
+    has_many :input_values, :class_name => 'FakeInputValue', :foreign_key => 'template_invocation_id'
+  end
+
+  class FakeInputValue < ActiveRecord::Base
+    self.table_name = 'template_invocation_input_values'
+  end
+
+  def up
+    # make all template invocations pattern
+    FakeTemplateInvocation.update_all 'host_id = NULL'
+
+    # expand all pattern template invocations and link RunHostJob
+    JobInvocation.joins(:targeting).where("#{Targeting.table_name}.resolved_at IS NOT NULL").includes([ :pattern_template_invocations, :targeting, :sub_tasks => :locks ]).each do |job_invocation|
+      job_invocation.pattern_template_invocations.each do |pattern_template_invocation|
+        job_invocation.targeting.hosts.each do |host|
+          task = job_invocation.sub_tasks.find do |sub_task|
+            sub_task.locks.find { |lock| lock.resource_type == 'Host::Managed' && lock.resource_id == host.id && lock.name == 'link_resource'}.present?
+          end
+          next if task.nil? # job invocations with static targeting that failed too early
+
+          expanded_template_invocation = FakeTemplateInvocation.new
+          expanded_template_invocation.attributes = pattern_template_invocation.dup.attributes
+          pattern_template_invocation.input_values.each do |input_value|
+            input_value = input_value.dup
+            expanded_template_invocation.input_values.build(input_value.attributes.except('template_invocation_id'))
+          end
+          expanded_template_invocation.host_id = host.id
+          expanded_template_invocation.run_host_job_task_id = task.id
+          expanded_template_invocation.save!
+        end
+      end
+    end
+  end
+
+  def down
+    # we can't determine the last host for pattern, but keeping template invocations as pattern is safe
+    JobInvocation.joins(:targeting).where("#{Targeting.table_name}.resolved_at IS NOT NULL").includes(:template_invocations).each do |job_invocation|
+      job_invocation.template_invocations.delete_all
+    end
+  end
+end