foreman_chef 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 86ad6b2ae0637ad38d20096b96e2019571999bd3
-  data.tar.gz: 9701a8976c16c4ccf4612512d79e6bd11620d4e4
+SHA256:
+  metadata.gz: 3fedb5a89f5be407411bf40c5ce91252c61051bece15e3f3b4388fb794672ade
+  data.tar.gz: c9b41183e4474675c612ccb79e3cb94e207c1ecb3f14afd3150dc14853688ee8
 SHA512:
-  metadata.gz: 269e56756c4ccb0be46a9809849dc7db1fe579bc5cfd8c3a1ebfe778085462b7fc7ae4685f662d8ad9f9490c5c58128577c0378c800d64c8106e412b2ab2adaf
-  data.tar.gz: 294d12364166c3ff5257f0c93faf72f72dd4848682502b364e280908e54f1ff1bca6cc6cbaff66343f443f1a4c5df4b287dfbb86f0917a6ad7b2d60038418d36
+  metadata.gz: 73aa559fd56934944e8eafc4827337d4e25e26d6fd9a1201f5d21b063a8ab963bf3cdedc0144f1ae952d8967857d9181021be22f571ff68b661c9ab05129a3fd
+  data.tar.gz: 33b4941d7907d7c460b9646f1b9e7e74f5368e155ac77c0f3c222bf29c6f4710001aa0f46ae73192e3a72ac06045d849f5b190b35af347ba942f34a7bb34c2b2

data/app/controllers/foreman_chef/concerns/hosts_controller_extensions.rb

@@ -0,0 +1,24 @@
+module ForemanChef
+  module Concerns
+    module HostsControllerExtensions
+      extend ActiveSupport::Concern
+      include ForemanTasks::Triggers
+
+      module Overrides
+        def destroy
+          super
+          ::ForemanTasks.sync_task ::Actions::ForemanChef::Host::Destroy, @host
+        end
+
+        def update
+          super
+          ::ForemanTasks.sync_task ::Actions::ForemanChef::Host::Update, @host
+        end
+      end
+
+      included do
+        prepend Overrides
+      end
+    end
+  end
+end

data/app/controllers/foreman_chef/environments_controller.rb

@@ -12,19 +12,18 @@ module ForemanChef
       @importer = ChefServerImporter.new(opts)
       @changed = @importer.changes
       if @changed.values.all?(&:empty?)
-        notice _("Nothing to synchronize")
-        redirect_to foreman_chef_environments_path
+        process_success :success_redirect => foreman_chef_environments_path, :success_msg => _("Nothing to synchronize")
       end
     end
 
     def synchronize
       proxy = SmartProxy.authorized(:view_smart_proxies).find(params[:proxy])
       if (errors = ChefServerImporter.new(:chef_proxy => proxy).obsolete_and_new(params[:changed])).empty?
-        notice _("Successfully updated environments")
+        process_success :success_redirect => foreman_chef_environments_path, :success_msg => _("Successfully updated environments")
       else
-        error _("Failed to update environments: %s") % errors.to_sentence
+        process_error :redirect => foreman_chef_environments_path, :error_msg => _("Failed to update environments: %s") % errors.to_sentence
       end
-      redirect_to foreman_chef_environments_path
+
     end
 
     def index

data/app/helpers/foreman_chef/chef_reports_helper.rb

@@ -0,0 +1,7 @@
+module ForemanChef
+  module ChefReportsHelper
+    def chef_report_origin_icon
+      'foreman_chef/Chef.png'
+    end
+  end
+end

data/app/lib/actions/foreman_chef/host/update.rb

@@ -26,7 +26,7 @@ module Actions
         end
 
         def humanized_input
-          input[:host][:name]
+          input.try(:[], :host).try(:[], :name) || 'with unknown name'
         end
       end
     end

data/app/models/foreman_chef/chef_report_scanner.rb

@@ -0,0 +1,20 @@
+module ForemanChef
+  # Scans ConfigReports after import for indicators of an Ansible report and
+  # sets the origin of the report to 'Ansible'
+  class ChefReportScanner
+    class << self
+      def scan(report, logs)
+        if (result = chef_report?(logs))
+          report.origin = 'Chef'
+        end
+
+        result
+      end
+
+      def chef_report?(logs)
+        return false if logs.blank?
+        logs.last['log']['sources']['source'] == 'Chef'
+      end
+    end
+  end
+end

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

@@ -63,6 +63,10 @@ module ForemanChef
         super.concat(%w(chef_proxy_id chef_environment_id))
       end
 
+      def action_input_key
+        "host"
+      end
+
       private
 
       def load_node_data
@@ -73,5 +77,5 @@ module ForemanChef
 end
 
 class ::Host::Managed::Jail < Safemode::Jail
-  allow :run_list
+  allow :run_list, :chef_proxy, :chef_environment, :chef_private_key
 end

data/app/models/foreman_chef/fact_importer.rb

@@ -16,93 +16,6 @@ module ForemanChef
 
     private
 
-    attr_accessor :original_facts
-
-    def logger
-      Foreman::Logging.logger('foreman_chef')
-    end
-
-    def add_new_facts
-      @counters[:added] = 0
-      add_missing_facts(Sparser.new.unsparse(original_facts))
-      logger.debug("Merging facts for '#{host}': added #{@counters[:added]} facts")
-    end
-
-    def add_missing_facts(tree_hash, parent = nil, prefix = '')
-      tree_hash.each do |name, value|
-        name_with_prefix = prefix.empty? ? name : prefix + FactName::SEPARATOR + name
-
-        compose = value.is_a?(Hash)
-        if fact_names[name_with_prefix].present?
-          fact_name_id = fact_names[name_with_prefix]
-        else
-          # fact names didn't contain fact_name so we create new one
-          fact_name = fact_name_class.new(:name      => name_with_prefix,
-                                          :parent_id => parent,
-                                          :compose   => compose)
-          if fact_name.save
-            fact_name_id = fact_name.id
-          elsif fact_name.errors[:name].present?
-            # saving could have failed because of raise condition with another import process,
-            # so if the error is on name uniqueness, we try to reload conflicting name and use it
-            conflicting_fact_name = fact_name_class.where(:name => fact_name.name).first
-            fact_name_id = conflicting_fact_name.id
-          else
-            raise FactNameImportError, "unable to save fact name, errors: #{fact_name.errors.full_messages.join("\n")}"
-          end
-          fact_name_id
-        end
-
-        if compose
-          add_fact(name_with_prefix, nil, fact_name_id)
-          add_missing_facts(value, fact_name_id, name_with_prefix)
-        else
-          add_fact(name_with_prefix, value, fact_name_id)
-        end
-      end
-    end
-
-    def add_fact(name, value, fact_name_id)
-      if facts_to_create.include?(name)
-        host.fact_values.send(method,
-                              :value => value, :fact_name_id => fact_name_id)
-        @counters[:added] += 1
-      end
-    end
-
-    def facts_to_create
-      @facts_to_create ||= facts.keys - db_facts.pluck('fact_names.name')
-    end
-
-    def fact_names
-      @fact_names ||= fact_name_class.group(:name).maximum(:id)
-    end
-
-    # if the host does not exists yet, we don't have an host_id to use the fact_values table.
-    def method
-      @method ||= host.new_record? ? :build : :create!
-    end
-
-    def normalize(facts)
-      @original_facts = super(facts)
-      @facts = completify(@original_facts)
-    end
-
-    def completify(hash)
-      new_facts = hash.dup
-      hash.each do |fact_name, value|
-        name_parts = fact_name.split(FactName::SEPARATOR)
-
-        name_parts.inject([]) do |memo, name|
-          memo           = memo + [name]
-          key            = memo.join(FactName::SEPARATOR)
-          new_facts[key] ||= name_parts == memo ? value : nil
-          memo
-        end
-      end
-      new_facts
-    end
-
     class Sparser
       def sparse(hash, options={})
         hash.map do |k, v|

data/app/models/foreman_chef/fact_name.rb

@@ -1,6 +1,10 @@
 module ForemanChef
   class FactName < ::FactName
     def origin
+      'Chef'
+    end
+
+    def icon_path
       'foreman_chef/Chef'
     end
   end

data/app/models/foreman_chef/fact_parser.rb

@@ -22,6 +22,13 @@ module ForemanChef
         release_name = facts['lsb::codename']
       end
 
+      # convert OHAI names to Foreman common OS names
+      case os_name
+        when 'RedHatEnterpriseServer'
+          os_name = 'RedHat'
+      end
+
+
       # So far only CentOS needs exception
       case os_name
         when 'CentOS'
@@ -85,6 +92,10 @@ module ForemanChef
       support_interfaces_parsing? && !Setting['ignore_puppet_facts_for_provisioning']
     end
 
+    def boot_timestamp
+      Time.zone.now.to_i - facts['system_uptime::seconds'].to_i
+    end
+
     private
 
     def logger
@@ -122,11 +133,11 @@ module ForemanChef
     end
 
     def network_hash
-      @network_hash ||= ForemanChef::FactImporter::Sparser.new.unsparse(facts.select { |k, v| k =~ /\Anetwork::interfaces::/})['network']
+      @network_hash ||= ForemanChef::FactImporter::Sparser.new.unsparse(facts.select { |k, v| k =~ /\Anetwork::interfaces::/}).try(:[], 'network') || {}
     end
 
     def interfaces_hash
-      @interfaces_hash ||= network_hash['interfaces']
+      @interfaces_hash ||= network_hash.try(:[], 'interfaces') || {}
     end
 
     # adds attributes like virtual

data/app/models/setting/foreman_chef.rb

@@ -6,6 +6,7 @@ class Setting::ForemanChef < Setting
 
     self.transaction do
       [
+          self.set('chef_interval', N_("Duration in minutes after servers reporting via Chef are classed as out of sync."), 60),
           self.set('auto_deletion', N_("Enable the auto deletion of mapped objects in chef-server through foreman-proxy (currently node and client upon host deletion, client on host rebuild)"), true),
           self.set('validation_bootstrap_method', N_("Use validation.pem or create client directly storing private key in Foreman DB)"), true),
       ].each { |s| self.create! s.update(:category => "Setting::ForemanChef")}

data/lib/foreman_chef/engine.rb

@@ -13,7 +13,7 @@ module ForemanChef
       end
     end
 
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/helpers"]
 
     # Precompile any JS or CSS files under app/assets/
     # If requiring files from each other, list them explicitly here to avoid precompiling the same
@@ -47,7 +47,7 @@ module ForemanChef
 
     initializer 'foreman_chef.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_chef do
-        requires_foreman '>= 1.17'
+        requires_foreman '>= 1.24'
         extend_template_helpers ForemanChef::Concerns::Renderer
 
         permission :import_chef_environments, { :environments => [:import, :synchronize] }, :resource_type => 'ForemanChef::Environment'
@@ -69,6 +69,9 @@ module ForemanChef
         if ForemanChef.with_remote_execution? && Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
           RemoteExecutionFeature.register(:foreman_chef_run_chef_client, N_("Run chef-client Once"), :description => N_("Run chef-client once"), :host_action_button => true)
         end
+
+        register_report_scanner ForemanChef::ChefReportScanner
+        register_report_origin 'Chef', 'ConfigReport'
       end
     end
 
@@ -76,6 +79,10 @@ module ForemanChef
       ActionView::Base.send :include, ChefProxyForm
     end
 
+    initializer 'foreman_chef.chef_reports_helper' do |app|
+      ActionView::Base.send :include, ChefReportsHelper
+    end
+
     initializer 'foreman_chef.dynflow_world', :before => 'foreman_tasks.initialize_dynflow' do |app|
        ForemanTasks.dynflow.require!
     end
@@ -93,8 +100,9 @@ module ForemanChef
       ::Host::Managed.send :prepend, ForemanChef::Concerns::HostExtensions
       ::Hostgroup.send :include, ForemanChef::Concerns::HostgroupExtensions
       ::SmartProxy.send :prepend, ForemanChef::Concerns::SmartProxyExtensions
-      ::Host::Managed.send :prepend, ForemanChef::Concerns::HostActionSubject
       ::Host::Managed.send :prepend, ForemanChef::Concerns::HostBuild
+      ::HostsController.send :include, ForemanChef::Concerns::HostsControllerExtensions
+      ::Api::V2::HostsController.send :include, ForemanChef::Concerns::HostsControllerExtensions
       ::HostsController.send :prepend, ForemanChef::Concerns::HostsControllerRescuer
 
       ::Host::Managed.send :include, ForemanChef::Concerns::Renderer

data/lib/foreman_chef/version.rb

@@ -1,3 +1,3 @@
 module ForemanChef
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_chef
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -69,9 +69,11 @@ files:
 - app/assets/javascripts/foreman_chef/jsoneditor.js.map
 - app/controllers/foreman_chef/application_controller.rb
 - app/controllers/foreman_chef/concerns/environment_parameters.rb
+- app/controllers/foreman_chef/concerns/hosts_controller_extensions.rb
 - app/controllers/foreman_chef/concerns/hosts_controller_rescuer.rb
 - app/controllers/foreman_chef/environments_controller.rb
 - app/helpers/foreman_chef/chef_proxy_form.rb
+- app/helpers/foreman_chef/chef_reports_helper.rb
 - app/lib/actions/foreman_chef/client/create.rb
 - app/lib/actions/foreman_chef/client/destroy.rb
 - app/lib/actions/foreman_chef/host/destroy.rb
@@ -79,7 +81,7 @@ files:
 - app/lib/actions/foreman_chef/node/update.rb
 - app/lib/proxy_api/foreman_chef/chef_proxy.rb
 - app/models/foreman_chef/cached_run_list.rb
-- app/models/foreman_chef/concerns/host_action_subject.rb
+- app/models/foreman_chef/chef_report_scanner.rb
 - app/models/foreman_chef/concerns/host_and_hostgroup_extensions.rb
 - app/models/foreman_chef/concerns/host_build.rb
 - app/models/foreman_chef/concerns/host_extensions.rb
@@ -139,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Plugin for Chef integration with Foreman

data/app/models/foreman_chef/concerns/host_action_subject.rb

@@ -1,23 +0,0 @@
-module ForemanChef
-  module Concerns
-    module HostActionSubject
-      def update_action
-        sync_action!
-        ::Actions::ForemanChef::Host::Update
-      end
-
-      def destroy_action
-        sync_action!
-        ::Actions::ForemanChef::Host::Destroy
-      end
-
-      def action_input_key
-        "host"
-      end
-    end
-  end
-end
-
-class ::Host::Managed::Jail < Safemode::Jail
-  allow :chef_proxy, :chef_environment, :chef_private_key
-end