foreman_ansible 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4d5259c34f569a52fce421e5fea3256094bb90c70ca595c0b4aa483ec3374666
-  data.tar.gz: efa7a4f4b6525b9f3a95e8656139d398971eb181ead180c9e73c51ff335c0fdf
+SHA1:
+  metadata.gz: b0cd4bd58b8e727da0bd49c2a4a2aca162ba6124
+  data.tar.gz: 93ea80ff3e3a63e6262cf04d5c3c5b6fb2b502b8
 SHA512:
-  metadata.gz: 6efb74bceb03772f6882aee0231e5dc1b7a5d8f8806b4b60c5918aa0dbc26108a01de3eb3fab9d8c34cafd6d8448590ee7d361234d772bd21c3530798de83099
-  data.tar.gz: '08596fb8fb3847f2c744cc5aa08552fd25769199d9ef1c202a9e38d24c06c10e014522c00346bb83b8dfd7bc125793f91ae106a5900f5b57c07dd5fcf9156d4e'
+  metadata.gz: '0931b7ef4cc32e27de919675706c88a3cb1c47b0b27b7807a74a25ecd42448ce3959c13b51bfa48686bd92728ff1cf4ff858bb1e1837e5184a3312340f33dbc9'
+  data.tar.gz: 2ab415d517f3c0f10f9916f24952925e5c66a5561546325fb9e8ac334afea9f8db1e05c642b0f1c96cc6891787df04378f184404199283786b2363ecbceab6b9

data/app/controllers/ansible_roles_controller.rb

@@ -25,7 +25,7 @@ class AnsibleRolesController < ::ApplicationController
   def import
     changed = @importer.import!
     if changed.values.all?(&:empty?)
-      success no_changed_roles_message
+      notice no_changed_roles_message
       redirect_to ansible_roles_path
     else
       render :locals => { :changed => changed }
@@ -33,8 +33,8 @@ class AnsibleRolesController < ::ApplicationController
   end
 
   def confirm_import
-    @importer.finish_import(params[:changed].to_unsafe_h)
-    success _('Import of roles successfully finished.')
+    @importer.finish_import(params[:changed])
+    notice _('Import of roles successfully finished.')
     redirect_to ansible_roles_path
   end
 

data/app/services/foreman_ansible/renderer_methods.rb

@@ -4,17 +4,22 @@ module ForemanAnsible
     extend ActiveSupport::Concern
 
     def insights_remediation(plan_id, organization_id = Organization.current.id)
-      insights_plan = ForemanAnsible::InsightsPlanRunner.new(
-        Organization.find(organization_id),
-        plan_id
-      )
-      rules = insights_plan.playbook
-      disclaimer = insights_plan.parse_disclaimer
-      hostname_rules_relation = insights_plan.hostname_rules(rules)
-      global_rules = insights_plan.rules_to_hash(rules)
-      host_playbooks = individual_host_playbooks(hostname_rules_relation,
-                                                 global_rules)
-      "#{disclaimer}\n#{host_playbooks.to_yaml}"
+      return "$INSIGHTS_REMEDIATION[#{plan_id}, #{organization_id}]" if preview?
+
+      cached("insights_#{plan_id}_#{organization_id}") do
+        Rails.logger.debug 'cache miss for insights plan fetching'
+        insights_plan = ForemanAnsible::InsightsPlanRunner.new(
+          Organization.find(organization_id),
+          plan_id
+        )
+        rules = insights_plan.playbook
+        disclaimer = insights_plan.parse_disclaimer
+        hostname_rules_relation = insights_plan.hostname_rules(rules)
+        global_rules = insights_plan.rules_to_hash(rules)
+        host_playbooks = individual_host_playbooks(hostname_rules_relation,
+                                                   global_rules)
+        "#{disclaimer}\n#{host_playbooks.to_yaml}"
+      end
     end
 
     private

data/lib/foreman_ansible/version.rb

@@ -2,5 +2,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '2.2.6'.freeze
+  VERSION = '2.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -265,43 +265,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
-- test/fixtures/report.json
-- test/fixtures/sample_facts.json
-- test/fixtures/insights_playbook.yaml
+- test/unit/host_ansible_role_test.rb
+- test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/ansible_role_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
-- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
-- test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/inventory_creator_test.rb
-- test/unit/services/api_roles_importer_test.rb
-- test/unit/services/fact_parser_test.rb
-- test/unit/services/roles_importer_test.rb
-- test/unit/services/fact_sparser_test.rb
-- test/unit/services/structured_fact_importer_test.rb
-- test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/insights_plan_runner_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/roles_reader_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
-- test/unit/host_ansible_role_test.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/ansible_provider_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
+- test/unit/services/fact_importer_test.rb
+- test/unit/services/ui_roles_importer_test.rb
+- test/unit/services/inventory_creator_test.rb
+- test/unit/services/roles_importer_test.rb
+- test/unit/services/insights_plan_runner_test.rb
+- test/unit/services/fact_parser_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/structured_fact_importer_test.rb
+- test/unit/services/fact_sparser_test.rb
+- test/unit/services/ansible_report_importer_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
 - test/unit/actions/run_ansible_job_test.rb
-- test/unit/ansible_provider_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/helpers/ansible_reports_helper_test.rb
+- test/test_plugin_helper.rb
+- test/functional/hosts_controller_test.rb
+- test/functional/api/v2/hosts_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
-- test/functional/api/v2/hosts_controller_test.rb
 - test/functional/ansible_roles_controller_test.rb
-- test/functional/hosts_controller_test.rb
 - test/factories/ansible_roles.rb
 - test/factories/ansible_proxy.rb
-- test/test_plugin_helper.rb
+- test/fixtures/report.json
+- test/fixtures/sample_facts.json
+- test/fixtures/insights_playbook.yaml