foreman_acd 0.5.0 → 0.6.0

data/app/views/foreman_acd/app_instances/index.html.erb

@@ -7,29 +7,102 @@
     <th><%= sort :name, :as => s_('AppInstance|Name') %></th>
     <th><%= sort :application, :as => _('Application'), :default => 'DESC' %></th>
     <th><%= _('Description') %></th>
+    <th><%= _('Report') %></th>
     <th></th>
   </tr>
   <% for app_instance in @app_instances %>
     <tr>
-      <td><%=link_to_if_authorized h(app_instance.name), hash_for_edit_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer) %></td>
+      <td><%=link_to_if_authorized h(app_instance.name), hash_for_edit_app_instance_path(:id => app_instance) %></td>
       <td><%= app_instance.app_definition %></td>
       <td><%= app_instance.description %></td>
+      <td><%= link_to_if((authorized_for(:auth_object => app_instance, :authorizer => authorizer, :permission => :report_app_instances) &&
+                         !app_instance.last_deploy_task.nil? && app_instance.last_deploy_task.ended_at?),
+                         _("Show Report"),
+                         hash_for_report_app_instance_path(:id => app_instance),
+                         :method => :get, :title => _("Show last deployment report for application #{app_instance}")) %></td>
       <td>
-        <%= action_buttons(display_link_if_authorized(_("Deploy"), hash_for_deploy_app_instance_path(:id => app_instance), :method => :post,
-                                                        :title => _("Deploy application #{app_instance}")),
-                           display_link_if_authorized(_("Run Playbook"), hash_for_remote_execution_path(:id => app_instance), :method => :post,
-                                                        :title => _("Run ansible playbook for application #{app_instance}")),
-        display_link_if_authorized(_("Run Playbook - customize first"), hash_for_remote_execution_path(:id => app_instance, :customize => true), :method => :post,
-                                                        :title => _("Prepare job to run ansible playbook for application #{app_instance}")),
-                           display_link_if_authorized(_("Report"), hash_for_report_app_instance_path(:id => app_instance), :method => :get,
-                                                        :title => _("Show last deployment report for application #{app_instance}")),
-                           display_delete_if_authorized(hash_for_app_instance_path(:id => app_instance).merge(:auth_object => app_instance, :authorizer => authorizer),
-                                                        :data => { 'confirm': _('Delete %s?') % app_instance.name })) %>
-      </td>
+        <%= action_buttons(
+          display_link_if_authorized(_("Deploy"), { :use_route=>"#",
+                                                    :id => app_instance.id,
+                                                    :action => :deploy,
+                                                    :auth_object => app_instance,
+                                                    :controller => :app_instances },
+                                                  :remote => true, 'data-toggle': "modal", 'data-target': "#deploy#{app_instance.id}",
+                                                  :title => _("Deploy application #{app_instance}")),
+          display_link_if_authorized(_("Run Playbook"),
+                                     hash_for_remote_execution_path(:id => app_instance.id),
+                                     :method => :post,
+                                     :title => _("Run ansible playbook for application #{app_instance}")),
+          display_link_if_authorized(_("Run Playbook - customize first"),
+                                     hash_for_remote_execution_path(:id => app_instance.id, :customize => true),
+                                     :method => :post,
+                                     :title => _("Prepare job to run ansible playbook for application #{app_instance}")),
+          display_link_if_authorized(_("Delete"), { :use_route=>"#",
+                                                    :id => app_instance.id,
+                                                    :action => :destroy,
+                                                    :auth_object => app_instance,
+                                                    :controller => :app_instances },
+                                                  :remote => true, 'data-toggle': "modal", 'data-target': "#delete#{app_instance.id}",
+                                                  :title => _("Delete application #{app_instance}"))
+          ) %>
+    </td>
     </tr>
+    <!-- Delete Modal -->
+      <div class="modal fade" id="delete<%=app_instance.id%>" tabindex="-1" role="dialog" aria-labelledby="deleteLabel" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+              <h4 class="modal-title"><%= _('Confirmation Box')%></h4>
+            </div>
+            <div class="modal-body">
+              <p> <%= _("Confirm to delete ") %> <%= app_instance %></p>
+              <%= form_tag destroy_with_hosts_app_instance_path(:id => app_instance.id), :method => :delete do %>
+                <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
+                  <p><%= _("Select the hosts to delete along with ") %> <%= app_instance %>: </p>
+                <% end %>
+                <% app_instance.foreman_hosts.each do |foreman_host|%>
+                  <% if foreman_host.host_id? %>
+                    <%= check_box_tag 'foreman_host_ids[]', foreman_host.host_id -%>
+                    <%= h foreman_host.host.name -%>
+                    </br>
+                  <% end %>
+                <% end %>
+            </div>
+            <div class="modal-footer">
+               <button type="button" class="btn btn-primary" data-dismiss="modal"><%= _('Cancel') %></button>
+               <%= submit_tag _("Delete"), name: nil, class: "btn btn-danger" %>
+               <% end %>
+            </div>
+          </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+      </div><!-- /.modal -->
+
+      <!-- Deploy Modal -->
+      <div class="modal fade" id="deploy<%=app_instance.id%>" tabindex="-1" role="dialog" aria-labelledby="deployLabel" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+              <h4 class="modal-title"><%= _('Confirmation Box') %></h4>
+            </div>
+            <div class="modal-body">
+              <p><%= _('Confirm to deploy ') %><%= app_instance%></p>
+              <%= form_tag deploy_app_instance_path(:id => app_instance.id), :method => :post do %>
+              <!-- TODO: Add safe-deploy method with delete all hosts option 
+                <% if app_instance.foreman_hosts.where.not(:host_id => [nil, false]).any? %>
+                  <%= check_box_tag 'delete_hosts'-%><%= _('Delete all hosts before deploying ') %><%= app_instance%>
+                <% end %> -->
+            </div>
+            <div class="modal-footer">
+               <button type="button" class="btn btn-danger" data-dismiss="modal"><%= _('Cancel') %></button>
+               <%= submit_tag _("Submit"), name: nil, class: "btn btn-success" %>
+               <% end %>
+            </div>
+          </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+     </div><!-- /.modal -->
   <% end %>
 </table>
-
 <%= page_entries_info @app_instances %>
 <%= will_paginate @app_instances %>
-

data/app/views/foreman_acd/app_instances/report.html.erb

@@ -1,4 +1,4 @@
-<% title _("Deployment Report for Application Instance #{@app_instance}") %>
+<% title _("Provisioning details for application instance #{@app_instance}") %>
 
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_acd %>
@@ -10,7 +10,10 @@
 <%
   json = {
     "mode": 'lastReport',
-    "hosts": @report_hosts
+    "appInstanceName": @app_instance.name,
+    "hosts": @report_hosts,
+    "deployTaskUrl": foreman_tasks_task_path(@app_instance.last_deploy_task),
+    "configureJobUrl": job_invocations_path(search: "description ~ \"ACD application #{@app_instance.name}\"")
   }
 %>
 

data/app/views/templates/job/run_acd_ansible_playbook.erb

@@ -35,7 +35,18 @@ template_inputs:
 - name: verbose
   description: Whether to run the ansible-playbook in verbose mode or not.
   input_type: user
-  options: "false\ntrue"
+  options: "0 - Normal\n1 - Verbose\n2 - More Verbose\n3 - Debug\n4 - Connection Debug"
+  default: "0 - Normal"
+  required: false
+  advanced: true
+- name: tags
+  description: List of playbook tags to specify which tasks to execute.
+  input_type: user
+  required: false
+  advanced: true
+- name: skip_tags
+  description: List of playbook tags to skip certain tasks.
+  input_type: user
   required: false
   advanced: true
 %>
@@ -45,5 +56,7 @@ playbook_id: <%= input('playbook_id') %>
 playbook_file: <%= input('playbook_file') %>
 extra_vars: <%= input('extra_vars') %>
 verbose: <%= input('verbose') %>
+tags: <%= input('tags') %>
+skip_tags: <%= input('skip_tags') %>
 inventory: |
 <%=  indent(2) { input('inventory') } %>

data/app/views/ui_acd/app_definition.json.rabl

@@ -2,4 +2,4 @@
 
 object @app_definition
 
-attributes :id, :name, :description, :services, :ansible_vars_all, :created_at, :updated_at
+attributes :id, :name, :description, :services, :ansible_vars_all, :location_ids, :organization_ids, :created_at, :updated_at

data/config/routes.rb

@@ -10,7 +10,6 @@ Rails.application.routes.draw do
       member do
         get 'import_vars'
       end
-
     end
     resources :app_definitions, :controller => 'foreman_acd/app_definitions' do
       collection do
@@ -21,7 +20,6 @@ Rails.application.routes.draw do
       member do
         get 'export'
       end
-
     end
 
     resources :app_instances, :controller => 'foreman_acd/app_instances' do
@@ -32,6 +30,7 @@ Rails.application.routes.draw do
       member do
         post 'deploy'
         get 'report'
+        delete 'destroy_with_hosts'
       end
     end
 

data/db/migrate/20200917120220_add_ansible_playbook_id.rb

@@ -4,7 +4,7 @@
 class AddAnsiblePlaybookId < ActiveRecord::Migration[5.2]
   def up
     add_column :app_definitions, :acd_ansible_playbook_id, :integer
-    add_foreign_key "app_definitions", "acd_ansible_playbooks", :name => "app_definitions_acd_ansible_playbooks_id_fk"
+    add_foreign_key 'app_definitions', 'acd_ansible_playbooks', :name => 'app_definitions_acd_ansible_playbooks_id_fk'
   end
 
   def down

data/db/migrate/20201016002819_add_ansible_vars_all_to_app_definitions.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Add ansible variables to app definitions
 class AddAnsibleVarsAllToAppDefinitions < ActiveRecord::Migration[5.2]
   def change
     add_column :app_definitions, :ansible_vars_all, :text

data/db/migrate/20201016104338_add_ansible_vars_all_to_app_instances.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Add ansible variables to app instances
 class AddAnsibleVarsAllToAppInstances < ActiveRecord::Migration[5.2]
   def change
     add_column :app_instances, :ansible_vars_all, :text

data/db/migrate/20210112111548_add_organization_to_app_instance.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Add organization to app instance
+class AddOrganizationToAppInstance < ActiveRecord::Migration[6.0]
+  # FakeAppInstance, because of 'validates :location'
+  class AppInstance < ApplicationRecord
+    belongs_to :organization
+  end
+
+  def up
+    add_column :app_instances, :organization_id, :integer, :null => true, :index => true
+    AppInstance.all.each do |a|
+      a.organization = ::Organization.first
+      a.save!
+    end
+    change_column :app_instances, :organization_id, :integer, :null => false, :index => true
+  end
+
+  def down
+    remove_column :app_instances, :organization_id, :integer
+  end
+end

data/db/migrate/20210112113853_add_location_to_app_instance.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add location to app instance
+class AddLocationToAppInstance < ActiveRecord::Migration[6.0]
+  def change
+    add_column :app_instances, :location_id, :integer, :null => true, :index => true
+  end
+end

data/db/migrate/20210202141658_create_foreman_hosts.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Adding acd_foreman_hosts db table
+class CreateForemanHosts < ActiveRecord::Migration[6.0]
+  def up
+    create_table :foreman_hosts do |t|
+      t.string :hostname, :default => '', :null => false, :limit => 255, :unique => true
+      t.column :app_instance_id, :integer, :null => false
+      t.column :host_id, :integer
+      t.string :service
+      t.string :description
+      t.text :foremanParameters
+      t.text :ansibleParameters
+
+      t.timestamps :null => false
+    end
+    add_foreign_key :foreman_hosts, :app_instances
+    add_foreign_key :foreman_hosts, :hosts
+  end
+
+  def down
+    drop_table :foreman_hosts
+  end
+end

data/db/migrate/20210204111306_remove_hosts_from_app_instances.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Remove hosts column from app_instances db table
+class RemoveHostsFromAppInstances < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :app_instances, :hosts, :text
+  end
+end

data/db/migrate/20210209091014_rename_acd_tables.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Adding Rename ACD db tables
+class RenameAcdTables < ActiveRecord::Migration[6.0]
+  def up
+    rename_table :app_definitions, :acd_app_definitions
+    rename_table :app_instances, :acd_app_instances
+    rename_table :foreman_hosts, :acd_foreman_hosts
+  end
+
+  def down
+    rename_table :acd_app_definitions
+    rename_table :acd_app_instances
+    rename_table :acd_foreman_hosts
+  end
+end

data/db/migrate/20210216083522_add_last_progress_report.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add AddLastProgressReport
+class AddLastProgressReport < ActiveRecord::Migration[5.2]
+  def change
+    add_column :acd_foreman_hosts, :last_progress_report, :text
+  end
+end

data/db/migrate/20210216091529_add_last_deploy_task.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add AddLastDeployTask
+class AddLastDeployTask < ActiveRecord::Migration[5.2]
+  def change
+    add_column :acd_app_instances, :last_deploy_task_id, :uuid, :null => true
+  end
+end

data/db/seeds.d/62_acd_proxy_feature.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
 proxy_feature = Feature.where(:name => 'ACD').first_or_create
-if proxy_feature.nil? || proxy_feature.errors.any?
-  raise "Unable to create proxy feature: #{format_errors proxy_feature}"
-end
+raise "Unable to create proxy feature: #{format_errors proxy_feature}" if proxy_feature.nil? || proxy_feature.errors.any?

data/db/seeds.d/75-job_templates.rb

@@ -1,8 +1,13 @@
+# frozen_string_literal: true
+
 User.as_anonymous_admin do
   JobTemplate.without_auditing do
     Dir[File.join("#{ForemanAcd::Engine.root}/app/views/templates/**/*.erb")].each do |template|
       sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-      JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+      template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+
+      template.organizations << Organization.unscoped.all if template&.organizations&.empty?
+      template.locations << Location.unscoped.all if template&.locations&.empty?
     end
   end
 end

data/lib/foreman_acd/engine.rb

@@ -8,11 +8,10 @@ module ForemanAcd
     engine_name 'foreman_acd'
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_acd/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/models"]
+    config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/helpers"]
-    config.autoload_paths += Dir["#{config.root}/app/models/foreman_acd/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/parameters"]
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/lib"]
     config.autoload_paths += Dir["#{config.root}/lib"]
 
@@ -43,8 +42,20 @@ module ForemanAcd
       require 'foreman_acd/plugin'
     end
 
+    initializer 'foreman_acd.register_actions', :before => :finisher_hook do |_app|
+      ForemanTasks.dynflow.require!
+      action_paths = %W[#{ForemanAcd::Engine.root}/app/lib/actions]
+      ForemanTasks.dynflow.config.eager_load_paths.concat(action_paths)
+    end
+
     config.to_prepare do
       RemoteExecutionProvider.register(:ACD, AcdProvider)
+      ::Taxonomy.include ForemanAcd::TaxonomyExtensions
+      ::Host::Managed.prepend ForemanAcd::HostManagedExtensions
+    end
+
+    def self.with_katello?
+      defined?(::Katello)
     end
   end
 end

data/lib/foreman_acd/plugin.rb

@@ -8,16 +8,16 @@ Foreman::Plugin.register :foreman_acd do
   # Menus
   sub_menu :top_menu, :application, :caption => N_('Applications'), :after => :hosts_menu, :icon => 'pficon pficon-integration' do
     menu :top_menu, :ansible_playbooks,
-      :url_hash => { :controller => :'foreman_acd/ansible_playbooks', :action => :index },
-      :caption => 'Ansible Playbooks'
+         :url_hash => { :controller => :'foreman_acd/ansible_playbooks', :action => :index },
+         :caption => 'Ansible Playbooks'
 
     menu :top_menu, :app_definitions,
-      :url_hash => { :controller => :'foreman_acd/app_definitions', :action => :index },
-      :caption => 'App Definitions'
+         :url_hash => { :controller => :'foreman_acd/app_definitions', :action => :index },
+         :caption => 'App Definitions'
 
     menu :top_menu, :app_instances,
-      :url_hash => { :controller => :'foreman_acd/app_instances', :action => :index },
-      :caption => 'App Instances'
+         :url_hash => { :controller => :'foreman_acd/app_instances', :action => :index },
+         :caption => 'App Instances'
   end
 
   # Add permissions
@@ -97,8 +97,8 @@ Foreman::Plugin.register :foreman_acd do
                :resource_type => 'ForemanAcd::AppInstance'
 
     permission :destroy_app_instances,
-               { :'foreman_acd/app_instances' => [:destroy],
-                 :'foreman_acd/api/v2/app_instances' => [:destroy] },
+               { :'foreman_acd/app_instances' => [:destroy, :destroy_with_hosts],
+                 :'foreman_acd/api/v2/app_instances' => [:destroy, :destroy_with_hosts] },
                :resource_type => 'ForemanAcd::AppInstance'
 
     permission :deploy_app_instances,
@@ -106,39 +106,60 @@ Foreman::Plugin.register :foreman_acd do
                  :'foreman_acd/api/v2/app_instances' => [:deploy] },
                :resource_type => 'ForemanAcd::AppInstance'
 
-    permission :configure_app_instances,
-               { :'foreman_acd/app_instances' => [:configure],
-                 :'foreman_acd/api/v2/app_instances' => [:configure] },
-               :resource_type => 'ForemanAcd::AppInstance'
-
     permission :report_app_instances,
                { :'foreman_acd/app_instances' => [:report],
                  :'foreman_acd/api/v2/app_instances' => [:report] },
                :resource_type => 'ForemanAcd::AppInstance'
+
+    permission :new_remote_execution,
+               { :'foreman_acd/remote_execution' => [:new] },
+               :resource_type => 'ForemanAcd::RemoteExecution'
+
+    permission :create_remote_execution,
+               { :'foreman_acd/remote_execution' => [:create] },
+               :resource_type => 'ForemanAcd::RemoteExecution'
+
+    permission :view_ui_acd,
+               { :ui_acd => [:app, :foreman_data, :ansible_data] }
+
+    permission :acd_foreman_hosts,
+               { :'foreman_acd/app_instances' => [:create, :edit, :update, :deploy, :destroy_with_hosts, :destroy] },
+               :resource_type => 'ForemanAcd::ForemanHost'
   end
 
   # Manager Role
-  role 'Application Centric Deployment Manager', [:create_ansible_playbooks,
-                                                  :view_ansible_playbooks,
-                                                  :edit_ansible_playbooks,
+  role 'Application Centric Deployment Manager', [:create_ansible_playbooks, :view_ansible_playbooks, :edit_ansible_playbooks,
                                                   :destroy_ansible_playbooks,
-                                                  :import_vars_ansible_playbooks,
-                                                  :grab_ansible_playbooks,
-                                                  :create_app_definitions,
-                                                  :view_app_definitions,
-                                                  :edit_app_definitions,
+                                                  :import_vars_ansible_playbooks, :grab_ansible_playbooks,
+                                                  :create_app_definitions, :view_app_definitions, :edit_app_definitions,
                                                   :destroy_app_definitions,
-                                                  :export_app_definitions,
-                                                  :import_app_definitions]
+                                                  :export_app_definitions, :import_app_definitions,
+                                                  :create_app_instances, :view_app_instances, :edit_app_instances,
+                                                  :destroy_app_instances,
+                                                  :deploy_app_instances,
+                                                  :new_remote_execution, :create_remote_execution,
+                                                  :report_app_instances,
+                                                  :view_ui_acd,
+                                                  :view_hosts, :build_hosts, :power_hosts, :create_hosts, :edit_hosts, :destroy_hosts, :console_hosts,
+                                                  :view_job_invocations, :cancel_job_invocations, :create_job_invocations, :create_template_invocations,
+                                                  :view_job_templates,
+                                                  :view_foreman_tasks,
+                                                  :acd_foreman_hosts, :view_smart_proxies]
 
   # User Role
-  role 'Application Centric Deployment User', [:create_app_instances,
-                                               :view_app_instances,
-                                               :edit_app_instances,
+  role 'Application Centric Deployment User', [:create_app_instances, :view_app_instances, :edit_app_instances,
                                                :destroy_app_instances,
                                                :deploy_app_instances,
-                                               :configure_app_instances,
-                                               :report_app_instances]
+                                               :new_remote_execution, :create_remote_execution,
+                                               :report_app_instances,
+                                               :view_ui_acd,
+                                               :view_hosts, :build_hosts, :power_hosts, :create_hosts, :edit_hosts, :destroy_hosts, :console_hosts,
+                                               :view_job_invocations, :cancel_job_invocations, :create_job_invocations, :create_template_invocations,
+                                               :view_job_templates,
+                                               :view_foreman_tasks,
+                                               :acd_foreman_hosts, :view_smart_proxies]
+
+  add_all_permissions_to_default_roles
 
   RemoteExecutionFeature.register(
     :run_acd_ansible_playbook,