foreman_acd 0.6.0 → 0.7.0

data/app/services/foreman_acd/app_deployer.rb

@@ -9,12 +9,18 @@ module ForemanAcd
       @app_instance = app_instance
     end
 
-    def deploy
+    def deploy(safe_deploy)
       output = []
       services = JSON.parse(@app_instance.app_definition.services)
       all_hosts = []
 
-      @app_instance.foreman_hosts.each do |foreman_host|
+      foreman_hosts = if safe_deploy
+                        @app_instance.foreman_hosts.find(safe_deploy)
+                      else
+                        @app_instance.foreman_hosts
+                      end
+
+      foreman_hosts.each do |foreman_host|
         service_data = services.select { |k| k['id'] == foreman_host.service.to_i }.first
         host_params = set_host_params(foreman_host, service_data)
 

data/app/services/foreman_acd/inventory_creator.rb

@@ -36,6 +36,7 @@ module ForemanAcd
 
         # in case there is no ansible_user defined, set "root" as default.
         ansible_vars['ansible_user'] = 'root' unless ansible_vars.key?('ansible_user')
+        ansible_vars['ansible_ssh_private_key_file'] = ansible_or_rex_ssh_private_key(foreman_host.host)
 
         children[ansible_group]['hosts'][foreman_host.host.name] = ansible_vars
       end
@@ -45,6 +46,19 @@ module ForemanAcd
 
     private
 
+    def ansible_or_rex_ssh_private_key(host)
+      ansible_private_file = host_setting(host, 'ansible_ssh_private_key_file')
+      if !ansible_private_file.empty?
+        ansible_private_file
+      else
+        ForemanRemoteExecutionCore.settings[:ssh_identity_key_file]
+      end
+    end
+
+    def host_setting(host, setting)
+      host.params[setting] || Setting[setting]
+    end
+
     def inventory_all_vars
       JSON.parse(@app_instance.ansible_vars_all).map do |a|
         { a['name'] => a['value'] }

data/app/views/foreman_acd/ansible_playbooks/_form.html.erb

@@ -1,3 +1,39 @@
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :foreman_acd %>
+<% end %>
+<% content_for(:stylesheets) do %>
+  <%= webpacked_plugins_css_for :foreman_acd %>
+<% end %>
+
+<%
+    if @ansible_playbook.new_record?
+    json = {
+      "scmTypes": {"directory" => "directory", "git" => "git"},
+      "mode": "newPlaybook",
+      "organization": current_organization,
+      "location": current_location,
+      "path": "",
+      "gitUrl": "",
+      "gitCommit": "",
+      "scmType": "",
+      "appDefinitions": [],
+    }
+
+    else
+      json = {
+      "scmTypes": {"directory" => "directory", "git" => "git"},
+      "mode": "editPlaybook",
+      "organization": current_organization,
+      "location": current_location,
+      "path": @ansible_playbook.path,
+      "gitUrl": @ansible_playbook.git_url,
+      "gitCommit": @ansible_playbook.git_commit,
+      "scmType": @ansible_playbook.scm_type,
+      "appDefinitions": @ansible_playbook.app_definitions
+      }
+    end
+%>
+
 <%= form_for @ansible_playbook, :url => (@ansible_playbook.new_record? ? ansible_playbooks_path : ansible_playbook_path(:id => @ansible_playbook.id)) do |f| %>
   <%= base_errors_for @ansible_playbook %>
 
@@ -13,18 +49,16 @@
 
   <div class="tab-content">
     <div class="tab-pane active" id="primary">
+    
       <%= text_f f, :name %>
       <%= text_f f, :description %>
-      <%= f.hidden_field :scm_type, :value => 'directory' %>
-      <% # TODO:
-         # select_f(f, :scm_type, %w[Directory GIT], :downcase, :to_s)
-      %>
-      <%= text_f f, :path, :required => true %>
+      <div id='ansible_playbook'>
+       <%= react_component('SyncGitRepo', :data => json,)  %>
+      </div>
       <%= text_f f, :playfile, :required => true %>
     </div>
-
+    
     <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @ansible_playbook %>
   </div>
-
   <%= submit_or_cancel f %>
 <% end %>

data/app/views/foreman_acd/app_definitions/_form.html.erb

@@ -44,7 +44,7 @@
       <%= text_f f, :description %>
 
       <div id='app_definition'></div>
-      <%=  mount_react_component('ApplicationDefinition', "#app_definition", json.to_json) %>
+      <%=  react_component('ApplicationDefinition', :data => json) %>
     </div>
 
     <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @app_definition %>

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

@@ -38,7 +38,7 @@
       <%= text_f f, :description %>
 
       <div id='app_instance'></div>
-        <%=  mount_react_component('ApplicationInstance', "#app_instance", json.to_json) %>
+        <%=  react_component('ApplicationInstance', :data => json) %>
       </div>
     </div>
   </div>

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

@@ -89,10 +89,12 @@
             <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 %> -->
+                  <ul>
+                  <li><%= check_box_tag 'delete_hosts'-%><%= _('Delete all hosts before deploying ') %><%= app_instance%></li>
+                  <li><%= check_box_tag 'safe_deploy' -%><%= _('Deploy only new and changed hosts for ') %><%= app_instance%></li>
+                  </ul>
+                <% end %>
             </div>
             <div class="modal-footer">
                <button type="button" class="btn btn-danger" data-dismiss="modal"><%= _('Cancel') %></button>

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

@@ -18,5 +18,5 @@
 %>
 
 <div id='report'></div>
-  <%=  mount_react_component('ApplicationInstanceReport', "#report", json.to_json) %>
+  <%=  react_component('ApplicationInstanceReport', :data => json) %>
 </div

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

@@ -3,7 +3,7 @@ kind: job_template
 name: Run ACD Ansible Playbook - ACD Default
 model: JobTemplate
 job_category: Application Centric Deployment
-description_format: "Run Ansible playbook %{playbook_name} for ACD application %{application_name}"
+description_format: "Run Ansible playbook to configure ACD application %{application_name}"
 feature: run_acd_ansible_playbook
 provider_type: ACD
 template_inputs:

data/config/routes.rb

@@ -5,9 +5,12 @@ Rails.application.routes.draw do
     resources :ansible_playbooks, :controller => 'foreman_acd/ansible_playbooks' do
       collection do
         get 'auto_complete_search'
+        put 'sync_git_repo'
+        post 'sync_git_repo'
       end
 
       member do
+        post 'sync_git_repo'
         get 'import_vars'
       end
     end

data/db/migrate/20210316151145_add_git_commit_to_ansible_playbooks.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add git_commit column to ansible_playbook
+class AddGitCommitToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :acd_ansible_playbooks, :git_commit, :string
+  end
+end

data/db/migrate/20210503122809_add_git_url_to_ansible_playbooks.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Add git_url column to ansible_playbook
+class AddGitUrlToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :acd_ansible_playbooks, :git_url, :string
+  end
+end

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

@@ -4,7 +4,7 @@ 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]
-      template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+      template = JobTemplate.import_raw!(File.read(template), :default => true, :lock => true, :update => sync)
 
       template.organizations << Organization.unscoped.all if template&.organizations&.empty?
       template.locations << Location.unscoped.all if template&.locations&.empty?

data/lib/foreman_acd.rb

@@ -4,4 +4,16 @@ require 'foreman_acd/engine'
 
 # Module required to start the Foreman Rails engine
 module ForemanAcd
+  def self.acd_base_path
+    '/var/lib/foreman/foreman_acd/'
+  end
+
+  def self.ansible_playbook_path
+    File.join(acd_base_path, 'ansible-playbooks')
+  end
+
+  def self.proxy_setting
+    HttpProxy.default_global_content_proxy&.full_url ||
+      Setting[:http_proxy]
+  end
 end

data/lib/foreman_acd/engine.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'foreman_remote_execution'
+require 'git'
 
+# The ForemanAcd module
 module ForemanAcd
   # This engine connects ForemanAcd with Foreman core
   class Engine < ::Rails::Engine
@@ -49,13 +51,33 @@ module ForemanAcd
     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)
+      RemoteExecutionProvider.register(:ACD, AcdProvider)
+      ForemanAcd.register_rex_feature
     end
   end
+
+  def self.with_katello?
+    defined?(::Katello)
+  end
+
+  def self.with_remote_execution?
+    RemoteExecutionFeature
+  rescue StandardError
+    false
+  end
+
+  def self.register_rex_feature
+    return unless ForemanAcd.with_remote_execution?
+    RemoteExecutionFeature.register(
+      :run_acd_ansible_playbook,
+      N_('Run playbook for ACD'),
+      {
+        :description => N_('Run an Ansible playbook to configure ACD application'),
+        :provided_inputs => %w[application_name playbook_name playbook_path inventory_path]
+      }
+    )
+  end
 end

data/lib/foreman_acd/plugin.rb

@@ -160,13 +160,4 @@ Foreman::Plugin.register :foreman_acd do
                                                :acd_foreman_hosts, :view_smart_proxies]
 
   add_all_permissions_to_default_roles
-
-  RemoteExecutionFeature.register(
-    :run_acd_ansible_playbook,
-    N_('Run playbook for ACD'),
-    {
-      :description => N_('Run an Ansible playbook to configure ACD application'),
-      :provided_inputs => %w[application_name playbook_name playbook_path inventory_path]
-    }
-  )
 end

data/lib/foreman_acd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanAcd
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/tasks/foreman_acd_tasks.rake

@@ -1,17 +1,5 @@
 # frozen_string_literal: true
 
-require 'rake/testtask'
-
-# Tasks
-namespace :foreman_acd do
-  namespace :example do
-    desc 'Example Task'
-    task :task => :environment do
-      # Task goes here
-    end
-  end
-end
-
 # Tests
 namespace :test do
   desc 'Test ForemanAcd'

data/package.json

@@ -14,26 +14,26 @@
     "@theforeman/vendor-dev": "^1.7.0",
     "babel-eslint": "^8.2.1",
     "babel-jest": "^23.6.0",
-    "babel-plugin-dynamic-import-node": "^2.0.0",
+    "babel-plugin-dynamic-import-node": "^2.3.3",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
-    "enzyme-to-json": "^3.3.5",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.6",
+    "enzyme-to-json": "^3.6.1",
     "eslint": "^4.18.1",
-    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^21.2.0",
     "eslint-plugin-patternfly-react": "^0.2.1",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-react": "^7.22.0",
     "identity-obj-proxy": "^3.0.0",
-    "lodash": "^4.17.11",
     "jest": "^23.6.0",
     "jest-cli": "^23.6.0",
     "jest-prop-type-error": "^1.1.0",
+    "lodash": "^4.17.21",
     "react-redux-test-utils": "^0.1.1",
     "sortabular": "~1.5.1",
     "table-resolver": "~3.2.0"

data/test/controllers/ansible_playbooks_controller_test.rb

@@ -11,7 +11,7 @@ module ForemanAcd
       @model = ForemanAcd::AnsiblePlaybook.first
     end
 
-    basic_index_test('ansible_playbook')
+    basic_index_test('ansible_playbooks')
     basic_new_test
     basic_edit_test('ansible_playbook')
 

data/test/controllers/app_instances_controller_test.rb

@@ -11,17 +11,22 @@ module ForemanAcd
       @model = ForemanAcd::AppInstance.first
     end
 
+    def set_session_user
+      org_a = Organization.find_by(:name => 'Organization 1')
+      loc_a = Location.find_by(:name => 'Location 1')
+      super.merge(:location_id => loc_a.id, :organization_id => org_a.id)
+    end
+
     basic_index_test('app_instances')
     basic_new_test
-    basic_edit_test('app_instance')
+    # basic_edit_test('app_instance')
 
     test 'should destroy app instance' do
       assert_difference('AppInstance.count', -1) do
-        delete :destroy,
+        delete :destroy_with_hosts,
                :params => { :id => @model.id },
                :session => set_session_user
       end
-      assert_redirected_to app_instances_url
     end
   end
 end

data/test/controllers/ui_acd_controller_test.rb

@@ -19,20 +19,36 @@ class UiAcdControllerTest < ActionController::TestCase
     get :app, :params => { :id => app_def.id }, :session => set_session_user
     assert_response :success
 
+    json_app_services = JSON.parse(app_def.services)
+    json_app_all = JSON.parse(app_def.ansible_vars_all)
+    parsed_services_response = JSON.parse(json_response['app_definition']['services'])
+    parsed_all_response = JSON.parse(json_response['app_definition']['ansible_vars_all'])
+
     assert_equal app_def.name, json_response['app_definition']['name']
-    assert_equal app_def.hostgroup_id, json_response['fdata']['hostgroup_id']
-    assert_equal app_def.hostgroup.domain.name, json_response['fdata']['domains'][0]['name']
-    assert_equal app_def.hostgroup.environment.name, json_response['fdata']['environments'][0]['name']
-    assert_equal app_def.hostgroup.ptable.name, json_response['fdata']['ptables'][0]['name']
+    assert_equal json_app_services.first['name'], parsed_services_response.first['name']
+    assert_equal json_app_services.first['ansibleGroup'], parsed_services_response.first['ansibleGroup']
+    assert_equal json_app_all.first['name'], parsed_all_response.first['name']
   end
 
-  test 'get fdata json' do
+  test 'get foreman data json' do
     hostgroup = FactoryBot.create(:hostgroup, :with_domain, :with_os, :with_environment)
-    get :fdata, :params => { :id => hostgroup.id }, :session => set_session_user
+    get :foreman_data, :params => { :id => hostgroup.id }, :session => set_session_user
     assert_response :success
 
+    assert_equal hostgroup.id, json_response['hostgroup_id']
     assert_equal hostgroup.environment.name, json_response['environments'][0]['name']
     assert_equal hostgroup.domain.name, json_response['domains'][0]['name']
     assert_equal hostgroup.ptable.name, json_response['ptables'][0]['name']
   end
+
+  test 'get ansible data json' do
+    ansible_playbook = FactoryBot.create(:ansible_playbook)
+    get :ansible_data, :params => { :id => ansible_playbook.id }, :session => set_session_user
+    assert_response :success
+
+    json_playbook = JSON.parse(ansible_playbook.vars)
+    assert_equal ansible_playbook.name, json_response['name']
+    assert_equal json_playbook['dbservers']['mysqlservice'], json_response['groups']['dbservers']['mysqlservice']
+    assert_equal json_playbook['all']['repository'], json_response['groups']['all']['repository']
+  end
 end

data/test/factories/foreman_acd_factories.rb

@@ -1,17 +1,31 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
+  factory :ansible_playbook, :class => 'ForemanAcd::AnsiblePlaybook' do
+    sequence(:name) { |n| "ansible_playbook#{n}" }
+    sequence(:description) { |n| "description#{n}" }
+    scm_type { 'directory' }
+    path { '/home/vagrant/acd_examples/ansible-playbook' }
+    playfile { 'site.yml' }
+    vars { '{"dbservers":{"mysqlservice":"mysqld","mysql_port":3306,"dbuser":"webapp","dbname":"ANSAP01","upassword":"Bond@007","masterpassword":"MySQL@007"},"all":{"repository":"https://github.com/bennojoy/mywebapp.git"},"webservers":{"dummy_var":0}}' }
+  end
+
   factory :app_definition, :class => 'ForemanAcd::AppDefinition' do
     sequence(:name) { |n| "app_definition#{n}" }
     sequence(:description) { |n| "description#{n}" }
-    hostgroup { FactoryBot.create(:hostgroup, :with_domain, :with_os, :with_environment) }
-    parameters { '[{"id":0,"name":"Hostname","description":"","type":"hostname","value":"mysqllinux"},{"id":1,"name":"RootPW","description":"","type":"password","value":"sesam12345"},{"id":2,"name":"ansible_root","description":"","type":"hostparam","value":"/root/ansible"}]' }
+    ansible_playbook
+    services do
+      '[{"id":1,"name":"DB","description":"","hostgroup":"1","ansibleGroup":"dbservers","minCount":"","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"mysqlservice","value":"mysqld"},{"id":1,"name":"mysql_port","value":"3306"},{"id":2,"name":"dbuser","value":"webapp"},{"id":3,"name":"dbname","value":"ANSAP01"},{"id":4,"name":"upassword","value":"Bond@007"},{"id":5,"name":"masterpassword","value":"MySQL@007"}]},{"id":2,"name":"Web","description":"","hostgroup":"1","ansibleGroup":"webservers","minCount":"","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"dummy_var","value":"0"}]}]'
+    end
+    ansible_vars_all { '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]' }
   end
 
   factory :app_instance, :class => 'ForemanAcd::AppInstance' do
     sequence(:name) { |n| "app_instance#{n}" }
-    app_definition { FactoryBot.create(:app_definition) }
     sequence(:description) { |n| "description#{n}" }
-    parameters { '[{"id":0,"name":"Hostname","description":"","type":"hostname","value":"mysqllinux"},{"id":1,"name":"RootPW","description":"","type":"password","value":"sesam12345"},{"id":2,"name":"ansible_root","description":"","type":"hostparam","value":"/root/ansible"}]' }
+    app_definition
+    location { Location.find_by(:name => 'Location 1') }
+    organization { Organization.find_by(:name => 'Organization 1') }
+    ansible_vars_all { '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]' }
   end
 end