foreman_salt 3.0.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 044d6bcb7bb23ae885d02d14977aa289a86566ad
-  data.tar.gz: e3fdf276fedaf50ef67ea0128be66aeaa522ee3d
+  metadata.gz: f6b22fef4003be237f6ba02e594fa8d583bc218f
+  data.tar.gz: e30d40a831982a5c5f07c645ea8936b5be3ab2da
 SHA512:
-  metadata.gz: 9b307a6679849af4beec034ab1a0e1957790845959b18458d483dec84b4d7dbd83fb4515749902d2149b3631be472d5b599d3e214e2a2d7d8dfcc86cc861922c
-  data.tar.gz: ad68170d5cd1c6cde132c80cba7d768d6b0b3d3dcdb5449415d5f37f6ecd75c88eb8883f0dc3742834832442571e8bf80dc19be5f97ffb90490f63a67181b6f2
+  metadata.gz: 2bbb4d5db09be8cc76f57375e61207e0f2a9758bd6ed7f6140234af2a34ec608329180f3001ff5ab7ee712b77b5e43ee1313629c33f0eb74c5fd091782238de1
+  data.tar.gz: 51751be171370526cc4deace259268e790707084eef0f3bc88e17e2d74797b8702e86c808af8355f56a0e043f9f87193b7c39e4896fbd496a962948728e5359a

data/README.md

@@ -1,10 +1,11 @@
 [![Build Status](https://img.shields.io/jenkins/s/http/ci.theforeman.org/test_plugin_foreman_salt_master.svg)](http://ci.theforeman.org/job/test_plugin_foreman_salt_master)
+[![Gem Version](https://img.shields.io/gem/v/foreman_salt.svg)](https://rubygems.org/gems/foreman_salt)
 [![Code Climate](https://codeclimate.com/github/theforeman/foreman_salt/badges/gpa.svg)](https://codeclimate.com/github/theforeman/foreman_salt)
 [![GPL License](https://img.shields.io/github/license/theforeman/foreman_salt.svg)](https://github.com/theforeman/foreman_salt/blob/master/LICENSE)
 
 # Foreman Salt Plug-in
 
-This plug-in adds support for Salt to Foreman. 
+This plug-in adds support for Salt to Foreman.
 
 ## Documentation
 

data/app/assets/javascripts/foreman_salt/states.js

@@ -3,18 +3,20 @@ $(document).on( "ContentLoad", function() {
 });
 
 function update_salt_states(element) {
-  var host_id = $("form").data('id')
+  var host_id = $("form").data('id');
   var env_id = $('select[name*=salt_environment_id]').val();
   var url = $(element).attr('data-url');
   var data = $("form").serialize().replace('method=put', 'method=post');
 
   if (url.match('hostgroups')) {
-    data = data + '&hostgroup_id=' + host_id
+    data = data + '&hostgroup_id=' + host_id;
   } else {
-    data = data + '&host_id=' + host_id
+    data = data + '&host_id=' + host_id;
   }
 
-  if (env_id == "") return;
+  if (!env_id) {
+    return;
+  }
 
   $(element).indicator_show();
   $.ajax({

data/app/controllers/foreman_salt/api/v2/jobs_controller.rb

@@ -39,10 +39,10 @@ module ForemanSalt
 
         def action_permission
           case params[:action]
-            when 'upload'
-              :create
-            else
-              super
+          when 'upload'
+            :create
+          else
+            super
           end
         end
       end

data/app/controllers/foreman_salt/minions_controller.rb

@@ -20,7 +20,7 @@ module ForemanSalt
       end
     rescue
       logger.warn "Failed to generate external nodes for #{@minion} with #{$ERROR_INFO}"
-      render :text => _('Unable to generate output, Check log files\n'), :status => 412 and return
+      render(:text => _('Unable to generate output, Check log files\n'), :status => 412) && return
     end
 
     def run
@@ -44,14 +44,14 @@ module ForemanSalt
 
     def action_permission
       case params[:action]
-        when 'run'
-          :saltrun
-        when 'node'
-          :view
-        when 'salt_environment_selected'
-          :edit
-        else
-          super
+      when 'run'
+        :saltrun
+      when 'node'
+        :view
+      when 'salt_environment_selected'
+        :edit
+      else
+        super
       end
     end
 

data/app/controllers/foreman_salt/state_importer.rb

@@ -18,7 +18,7 @@ module ForemanSalt
 
       environments ||= new.keys + old.keys
 
-      environments.each do |environment|
+      environments.each do |environment| # rubocop:disable Style/Next
         old_states = old[environment] || []
         new_states = new[environment] || []
 

data/app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb

@@ -29,8 +29,8 @@ module ForemanSalt
     def overview_fields_with_salt(host)
       fields = overview_fields_without_salt(host)
 
-      fields.insert(5, [_("Salt Master"), (link_to(host.salt_proxy, hosts_path(:search => "saltmaster = #{host.salt_proxy}")) if host.salt_proxy)])
-      fields.insert(6, [_("Salt Environment"), (link_to(host.salt_environment, hosts_path(:search => "salt_environment = #{host.salt_environment}")) if host.salt_environment)])
+      fields.insert(5, [_('Salt Master'), (link_to(host.salt_proxy, hosts_path(:search => "saltmaster = #{host.salt_proxy}")) if host.salt_proxy)])
+      fields.insert(6, [_('Salt Environment'), (link_to(host.salt_environment, hosts_path(:search => "salt_environment = #{host.salt_environment}")) if host.salt_environment)])
 
       fields
     end

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -13,6 +13,7 @@ module ForemanSalt
         alias_method_chain :params, :salt_proxy
         alias_method_chain :set_hostgroup_defaults, :salt_proxy
         alias_method_chain :smart_proxy_ids, :salt_proxy
+        alias_method_chain :configuration?, :salt
 
         scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
         scoped_search :in => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
@@ -21,6 +22,10 @@ module ForemanSalt
         validate :salt_modules_in_host_environment
       end
 
+      def configuration_with_salt?
+        configuration_without_salt? || !!salt_proxy
+      end
+
       def handle_salt
         return true unless salt?
         set_salt_autosign

data/app/models/foreman_salt/concerns/hostgroup_extensions.rb

@@ -34,7 +34,7 @@ module ForemanSalt
 
       def inherited_salt_proxy_id
         if ancestry.present?
-          read_attribute(:salt_proxy_id) || self.class.sort_by_ancestry(ancestors.where('salt_proxy_id is not NULL')).last.try(:salt_proxy_id)
+          self[:salt_proxy_id] || self.class.sort_by_ancestry(ancestors.where('salt_proxy_id is not NULL')).last.try(:salt_proxy_id)
         else
           salt_proxy_id
         end
@@ -47,7 +47,7 @@ module ForemanSalt
 
       def inherited_salt_environment_id
         if ancestry.present?
-          read_attribute(:salt_environment_id) || self.class.sort_by_ancestry(ancestors.where('salt_environment_id is not NULL')).last.try(:salt_environment_id)
+          self[:salt_environment_id] || self.class.sort_by_ancestry(ancestors.where('salt_environment_id is not NULL')).last.try(:salt_environment_id)
         else
           salt_environment_id
         end

data/app/models/foreman_salt/concerns/orchestration/salt.rb

@@ -29,7 +29,7 @@ module ForemanSalt
 
         def queue_update_salt_autosign
           # Host has been built --> remove auto sign
-          if old.build? and !build?
+          if old.build? && !build?
             queue.create(:name => _('Remove autosign entry for %s') % self, :priority => 50, :action => [self, :del_salt_autosign])
           end
         end

data/app/models/foreman_salt/host_salt_module.rb

@@ -1,6 +1,6 @@
 module ForemanSalt
   class HostSaltModule < ActiveRecord::Base
-    belongs_to :host, :class_name => "Host::Managed", :foreign_key => :host_id
+    belongs_to :host, :class_name => 'Host::Managed', :foreign_key => :host_id
     belongs_to :salt_module
   end
 end

data/app/models/foreman_salt/salt_environment.rb

@@ -1,6 +1,5 @@
 module ForemanSalt
   class SaltEnvironment < ActiveRecord::Base
-    include Taxonomix
     include Authorizable
     extend FriendlyId
     friendly_id :name
@@ -21,8 +20,8 @@ module ForemanSalt
       _('Salt environment')
     end
 
-    def self.permission_name(action)
-      "#{action}_salt_environments"
+    def self.permission_name
+      'salt_environments'
     end
 
     private

data/app/models/foreman_salt/salt_module.rb

@@ -1,6 +1,5 @@
 module ForemanSalt
   class SaltModule < ActiveRecord::Base
-    include Taxonomix
     include Authorizable
     extend FriendlyId
     friendly_id :name
@@ -43,8 +42,8 @@ module ForemanSalt
       _('Salt state')
     end
 
-    def self.permission_name(action)
-      "#{action}_salt_modules"
+    def self.permission_name
+      'salt_modules'
     end
   end
 end

data/app/overrides/salt_environment_host_selector.rb

@@ -6,4 +6,4 @@ selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironm
 Deface::Override.new(:virtual_path  => 'hosts/_form',
                      :name          => 'add_salt_environment_to_host',
                      :insert_bottom => 'div#primary',
-                     :text          =>  selector_text)
+                     :text          => selector_text)

data/app/overrides/salt_environment_hostgroup_selector.rb

@@ -6,4 +6,4 @@ selector_text = "<%= select_f f, :salt_environment_id, ForemanSalt::SaltEnvironm
 Deface::Override.new(:virtual_path  => 'hostgroups/_form',
                      :name          => 'add_salt_environment_to_hostgroup',
                      :insert_bottom => 'div#primary',
-                     :text          =>  selector_text)
+                     :text          => selector_text)

data/app/overrides/salt_proxy_selector.rb

@@ -5,9 +5,9 @@ selector_text = "<%= select_f f, :salt_proxy_id, SmartProxy.unscoped.with_featur
 Deface::Override.new(:virtual_path  => 'hosts/_form',
                      :name          => 'add_salt_proxy_to_host',
                      :insert_bottom => 'div#primary',
-                     :text          =>  selector_text)
+                     :text          => selector_text)
 
 Deface::Override.new(:virtual_path  => 'hostgroups/_form',
                      :name          => 'add_salt_proxy_to_hostgroup',
                      :insert_bottom => 'div#primary',
-                     :text          =>  selector_text)
+                     :text          => selector_text)

data/app/services/foreman_salt/fact_importer.rb

@@ -75,7 +75,7 @@ module ForemanSalt
       hash.each do |fact_name, value|
         name_parts = fact_name.split(FactName::SEPARATOR)
 
-        name_parts.inject([]) do |memo, name|
+        name_parts.inject([]) do |memo, name| # rubocop:disable Style/EachWithObject
           memo += [name]
           key = memo.join(FactName::SEPARATOR)
           new_facts[key] ||= name_parts == memo ? value : nil

data/app/services/foreman_salt/report_importer.rb

@@ -1,10 +1,10 @@
 module ForemanSalt
-  class ReportImporter
+  class ReportImporter # rubocop:disable Metrics/ClassLength
     delegate :logger, :to => :Rails
     attr_reader :report
 
     def self.import(raw, proxy_id = nil)
-      raise ::Foreman::Exception.new(_('Invalid report')) unless raw.is_a?(Hash)
+      fail ::Foreman::Exception.new(_('Invalid report')) unless raw.is_a?(Hash)
       raw.map do |host, report|
         importer = ForemanSalt::ReportImporter.new(host, report, proxy_id)
         importer.import
@@ -36,8 +36,10 @@ module ForemanSalt
         process_normal
       end
 
+      @host.refresh_statuses
+
       @host.save(:validate => false)
-      logger.info("Imported report for #{@host} in #{(Time.now - start_time).round(2)} seconds")
+      logger.info("Imported report for #{@host} in #{(Time.zone.now - start_time).round(2)} seconds")
     end
 
     private
@@ -130,8 +132,6 @@ module ForemanSalt
       metrics = calculate_metrics
       status = ReportStatusCalculator.new(:counters => metrics[:resources].slice(*::Report::METRIC)).calculate
 
-      @host.puppet_status = status
-
       @report = Report.new(:host => @host, :reported_at => start_time, :status => status, :metrics => metrics)
       return @report unless @report.save
       import_log_messages
@@ -139,9 +139,7 @@ module ForemanSalt
 
     def process_failures
       status = ReportStatusCalculator.new(:counters => { 'failed' => @raw.size }).calculate
-      @report = Report.create(:host => @host, :reported_at => Time.now, :status => status, :metrics => {})
-
-      @host.puppet_status = status
+      @report = Report.create(:host => @host, :reported_at => Time.zone.now, :status => status, :metrics => {})
 
       source = Source.find_or_create('Salt')
       @raw.each do |failure|
@@ -151,7 +149,7 @@ module ForemanSalt
     end
 
     def start_time
-      @start_time ||= Time.now
+      @start_time ||= Time.zone.now
     end
   end
 end

data/app/services/foreman_salt/smart_proxies/salt_keys.rb

@@ -8,7 +8,7 @@ module ForemanSalt
 
     class << self
       def all(proxy)
-        raise ::Foreman::Exception.new(N_('Must specify a Smart Proxy to use')) if proxy.nil?
+        fail ::Foreman::Exception.new(N_('Must specify a Smart Proxy to use')) if proxy.nil?
 
         unless (keys = Rails.cache.read("saltkeys_#{proxy.id}"))
           api = ProxyAPI::Salt.new(:url => proxy.url)
@@ -31,14 +31,14 @@ module ForemanSalt
     end
 
     def accept
-      raise ::Foreman::Exception.new(N_('unable to re-accept an accepted key')) unless state == 'unaccepted'
+      fail ::Foreman::Exception.new(N_('unable to re-accept an accepted key')) unless state == 'unaccepted'
       proxy = SmartProxy.find(smart_proxy_id)
       Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
       ProxyAPI::Salt.new(:url => proxy.url).key_accept name
     end
 
     def reject
-      raise ::Foreman::Exception.new(N_('unable to reject an accepted key')) unless state == 'unaccepted'
+      fail ::Foreman::Exception.new(N_('unable to reject an accepted key')) unless state == 'unaccepted'
       proxy = SmartProxy.find(smart_proxy_id)
       Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
       ProxyAPI::Salt.new(:url => proxy.url).key_reject name

data/lib/foreman_salt/engine.rb

@@ -11,181 +11,42 @@ module ForemanSalt
     config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
-    initializer 'foreman_salt.require_dynflow', :before => 'foreman_tasks.initialize_dynflow' do |_app|
+    initializer 'foreman_salt.require_dynflow', :before => 'foreman_tasks.initialize_dynflow' do
       ForemanTasks.dynflow.require!
     end
 
     initializer 'foreman_salt.load_default_settings', :before => :load_config_initializers do
-      require_dependency File.expand_path('../../../app/models/setting/salt.rb', __FILE__) if (Setting.table_exists? rescue(false))
+      if (Setting.table_exists? rescue(false))
+        require_dependency File.expand_path('../../../app/models/setting/salt.rb', __FILE__)
+      end
     end
 
     initializer 'foreman_salt.load_app_instance_data' do |app|
       app.config.paths['db/migrate'] += ForemanSalt::Engine.paths['db/migrate'].existent
     end
 
-    initializer "foreman_salt.assets.precompile" do |app|
+    initializer 'foreman_salt.assets.precompile' do |app|
       app.config.assets.precompile += %w(foreman_salt/states.js)
     end
 
     initializer 'foreman_salt.configure_assets', :group => :assets do
-      SETTINGS[:foreman_salt] = {:assets => {:precompile => ['foreman_salt/states.js']}}
+      SETTINGS[:foreman_salt] = {
+        :assets => {
+          :precompile => ['foreman_salt/states.js']
+        }
+      }
     end
 
     initializer 'foreman_salt.apipie' do
       Apipie.configuration.checksum_path += ['/salt/api/']
     end
 
-    initializer 'foreman_salt.register_plugin', :after => :finisher_hook do |_app|
-      Foreman::Plugin.register :foreman_salt do
-        requires_foreman '>= 1.9'
-
-        apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
-
-        ## Menus
-        menu :top_menu, :salt_environments,
-             :url_hash => { :controller => :'foreman_salt/salt_environments', :action => :index },
-             :caption  => 'Environments',
-             :parent   => :configure_menu,
-             :after    => :common_parameters
-
-        menu :top_menu, :salt_modules,
-             :url_hash => { :controller => :'foreman_salt/salt_modules', :action => :index },
-             :caption  => 'States',
-             :parent   => :configure_menu,
-             :after    => :common_parameters
-
-        divider :top_menu, :parent => :configure_menu,
-                           :caption => 'Salt',
-                           :after   => :common_parameters
-
-        # Permissions
-        security_block :foreman_salt do |_map|
-          permission :destroy_smart_proxies_salt_autosign,
-                     { :'foreman_salt/salt_autosign' => [:destroy],
-                       :'foreman_salt/api/v2/salt_autosign' => [:destroy] },
-                     :resource_type => 'SmartProxy'
-
-          permission :create_smart_proxies_salt_autosign,
-                     { :'foreman_salt/salt_autosign' => [:new, :create],
-                       :'foreman_salt/api/v2/salt_autosign' => [:create] },
-                     :resource_type => 'SmartProxy'
-
-          permission :view_smart_proxies_salt_autosign,
-                     { :'foreman_salt/salt_autosign' => [:index],
-                       :'foreman_salt/api/v2/salt_autosign' => [:index] },
-                     :resource_type => 'SmartProxy'
-
-          permission :create_salt_environments,
-                     { :'foreman_salt/salt_environments' => [:new, :create],
-                       :'foreman_salt/api/v2/salt_environments' => [:create] },
-                     :resource_type => 'ForemanSalt::SaltEnvironment'
-
-          permission :view_salt_environments,
-                     { :'foreman_salt/salt_environments' => [:index, :show, :auto_complete_search],
-                       :'foreman_salt/api/v2/salt_environments' => [:index, :show] },
-                     :resource_type => 'ForemanSalt::SaltEnvironment'
-
-          permission :edit_salt_environments,
-                     { :'foreman_salt/salt_environments' => [:update, :edit] },
-                     :resource_type => 'ForemanSalt::SaltEnvironment'
-
-          permission :destroy_salt_environments,
-                     { :'foreman_salt/salt_environments' => [:destroy],
-                       :'foreman_salt/api/v2/salt_environments' => [:destroy] },
-                     :resource_type => 'ForemanSalt::SaltEnvironment'
-
-          permission :create_reports,
-                     { :'foreman_salt/api/v2/jobs' => [:upload] },
-                     :resource_type => 'Report'
-
-          permission :saltrun_hosts,
-                     { :'foreman_salt/minions' => [:run] },
-                     :resource_type => 'Host'
-
-          permission :edit_hosts,
-                     { :'foreman_salt/api/v2/salt_minions' => [:update],
-                       :'foreman_salt/minions' => [:salt_environment_selected] },
-                     :resource_type => 'Host'
-
-          permission :view_hosts,
-                     { :'foreman_salt/minions' => [:node],
-                       :'foreman_salt/api/v2/salt_minions' => [:index, :show] },
-                     :resource_type => 'Host'
-
-          permission :edit_hostgroups,
-                     { :hostgroups => [:salt_environment_selected] },
-                     :resource_type => 'Hostgroup'
-
-          permission :view_smart_proxies_salt_keys,
-                     { :'foreman_salt/salt_keys' => [:index],
-                       :'foreman_salt/api/v2/salt_keys' => [:index] },
-                     :resource_type => 'SmartProxy'
-
-          permission :destroy_smart_proxies_salt_keys,
-                     { :'foreman_salt/salt_keys' => [:destroy],
-                       :'foreman_salt/api/v2/salt_keys' => [:destroy] },
-                     :resource_type => 'SmartProxy'
-
-          permission :edit_smart_proxies_salt_keys,
-                     { :'foreman_salt/salt_keys' => [:accept, :reject],
-                       :'foreman_salt/api/v2/salt_keys' => [:update] },
-                     :resource_type => 'SmartProxy'
-
-          permission :create_salt_modules,
-                     { :'foreman_salt/salt_modules' => [:new, :create],
-                       :'foreman_salt/api/v2/salt_states' => [:create] },
-                     :resource_type => 'ForemanSalt::SaltModule'
-
-          permission :import_salt_modules,
-                     { :'foreman_salt/salt_modules' => [:import, :apply_changes],
-                       :'foreman_salt/api/v2/salt_states' => [:import] },
-                     :resource_type => 'ForemanSalt::SaltModule'
-
-          permission :view_salt_modules,
-                     { :'foreman_salt/salt_modules' => [:index, :show, :auto_complete_search],
-                       :'foreman_salt/api/v2/salt_states' => [:index, :show] },
-                     :resource_type => 'ForemanSalt::SaltModule'
-
-          permission :edit_salt_modules,
-                     { :'foreman_salt/salt_modules' => [:update, :edit] },
-                     :resource_type => 'ForemanSalt::SaltModule'
-
-          permission :destroy_salt_modules,
-                     { :'foreman_salt/salt_modules' => [:destroy],
-                       :'foreman_salt/api/v2/salt_states' => [:destroy] },
-                     :resource_type => 'ForemanSalt::SaltModule'
-        end
-
-        ## Roles
-        role 'Salt admin', [:saltrun_hosts, :create_salt_modules, :view_salt_modules, :edit_salt_modules, :destroy_salt_modules,
-                            :view_smart_proxies_salt_keys, :destroy_smart_proxies_salt_keys, :edit_smart_proxies_salt_keys,
-                            :create_smart_proxies_salt_autosign, :view_smart_proxies_salt_autosign, :destroy_smart_proxies_salt_autosign,
-                            :create_salt_environments, :view_salt_environments, :edit_salt_environments, :destroy_salt_environments]
-      end
+    initializer 'foreman_salt.register_plugin', :after => :finisher_hook do
+      require 'foreman_salt/plugin'
     end
 
     config.to_prepare do
-      begin
-        ::FactImporter.register_fact_importer(:foreman_salt, ForemanSalt::FactImporter)
-        ::FactParser.register_fact_parser(:foreman_salt, ForemanSalt::FactParser)
-
-        # Helper Extensions
-        ::HostsHelper.send :include, ForemanSalt::HostsHelperExtensions
-        ::SmartProxiesHelper.send :include, ForemanSalt::SmartProxiesHelperExtensions
-        ::LayoutHelper.send :include, ForemanSalt::LayoutHelperExtensions
-
-        # Model Extensions
-        ::Host::Managed.send :include, ForemanSalt::Concerns::HostManagedExtensions
-        ::Host::Managed.send :include, ForemanSalt::Concerns::Orchestration::Salt
-        ::Hostgroup.send :include, ForemanSalt::Concerns::HostgroupExtensions
-
-        # Controller Extensions
-        ::UnattendedController.send :include, ForemanSalt::Concerns::UnattendedControllerExtensions
-        ::HostsController.send :include, ForemanSalt::Concerns::HostsControllerExtensions
-        ::HostgroupsController.send :include, ForemanSalt::Concerns::HostgroupsControllerExtensions
-      rescue => e
-        puts "ForemanSalt: skipping engine hook (#{e})"
-      end
+      require 'foreman_salt/extensions'
     end
   end
 end

data/lib/foreman_salt/extensions.rb

@@ -0,0 +1,20 @@
+begin
+  ::FactImporter.register_fact_importer(:foreman_salt, ForemanSalt::FactImporter)
+  ::FactParser.register_fact_parser(:foreman_salt, ForemanSalt::FactParser)
+
+  # Helper Extensions
+  ::HostsHelper.send :include, ForemanSalt::HostsHelperExtensions
+  ::SmartProxiesHelper.send :include, ForemanSalt::SmartProxiesHelperExtensions
+
+  # Model Extensions
+  ::Host::Managed.send :include, ForemanSalt::Concerns::HostManagedExtensions
+  ::Host::Managed.send :include, ForemanSalt::Concerns::Orchestration::Salt
+  ::Hostgroup.send :include, ForemanSalt::Concerns::HostgroupExtensions
+
+  # Controller Extensions
+  ::UnattendedController.send :include, ForemanSalt::Concerns::UnattendedControllerExtensions
+  ::HostsController.send :include, ForemanSalt::Concerns::HostsControllerExtensions
+  ::HostgroupsController.send :include, ForemanSalt::Concerns::HostgroupsControllerExtensions
+rescue => e
+  puts "ForemanSalt: skipping engine hook (#{e})"
+end

data/lib/foreman_salt/plugin.rb

@@ -0,0 +1,134 @@
+Foreman::Plugin.register :foreman_salt do
+  requires_foreman '>= 1.10'
+
+  apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
+
+  # Menus
+  menu :top_menu, :salt_environments,
+       :url_hash => { :controller => :'foreman_salt/salt_environments', :action => :index },
+       :caption  => 'Environments',
+       :parent   => :configure_menu,
+       :after    => :common_parameters
+
+  menu :top_menu, :salt_modules,
+       :url_hash => { :controller => :'foreman_salt/salt_modules', :action => :index },
+       :caption  => 'States',
+       :parent   => :configure_menu,
+       :after    => :common_parameters
+
+  divider :top_menu, :parent => :configure_menu,
+                     :caption => 'Salt',
+                     :after   => :common_parameters
+
+  # Permissions
+  security_block :foreman_salt do
+    permission :destroy_smart_proxies_salt_autosign,
+               { :'foreman_salt/salt_autosign' => [:destroy],
+                 :'foreman_salt/api/v2/salt_autosign' => [:destroy] },
+               :resource_type => 'SmartProxy'
+
+    permission :create_smart_proxies_salt_autosign,
+               { :'foreman_salt/salt_autosign' => [:new, :create],
+                 :'foreman_salt/api/v2/salt_autosign' => [:create] },
+               :resource_type => 'SmartProxy'
+
+    permission :view_smart_proxies_salt_autosign,
+               { :'foreman_salt/salt_autosign' => [:index],
+                 :'foreman_salt/api/v2/salt_autosign' => [:index] },
+               :resource_type => 'SmartProxy'
+
+    permission :create_salt_environments,
+               { :'foreman_salt/salt_environments' => [:new, :create],
+                 :'foreman_salt/api/v2/salt_environments' => [:create] },
+               :resource_type => 'ForemanSalt::SaltEnvironment'
+
+    permission :view_salt_environments,
+               { :'foreman_salt/salt_environments' => [:index, :show, :auto_complete_search],
+                 :'foreman_salt/api/v2/salt_environments' => [:index, :show] },
+               :resource_type => 'ForemanSalt::SaltEnvironment'
+
+    permission :edit_salt_environments,
+               { :'foreman_salt/salt_environments' => [:update, :edit] },
+               :resource_type => 'ForemanSalt::SaltEnvironment'
+
+    permission :destroy_salt_environments,
+               { :'foreman_salt/salt_environments' => [:destroy],
+                 :'foreman_salt/api/v2/salt_environments' => [:destroy] },
+               :resource_type => 'ForemanSalt::SaltEnvironment'
+
+    permission :create_reports,
+               { :'foreman_salt/api/v2/jobs' => [:upload] },
+               :resource_type => 'Report'
+
+    permission :saltrun_hosts,
+               { :'foreman_salt/minions' => [:run] },
+               :resource_type => 'Host'
+
+    permission :edit_hosts,
+               { :'foreman_salt/api/v2/salt_minions' => [:update],
+                 :'foreman_salt/minions' => [:salt_environment_selected] },
+               :resource_type => 'Host'
+
+    permission :view_hosts,
+               { :'foreman_salt/minions' => [:node],
+                 :'foreman_salt/api/v2/salt_minions' => [:index, :show] },
+               :resource_type => 'Host'
+
+    permission :edit_hostgroups,
+               { :hostgroups => [:salt_environment_selected] },
+               :resource_type => 'Hostgroup'
+
+    permission :view_smart_proxies_salt_keys,
+               { :'foreman_salt/salt_keys' => [:index],
+                 :'foreman_salt/api/v2/salt_keys' => [:index] },
+               :resource_type => 'SmartProxy'
+
+    permission :destroy_smart_proxies_salt_keys,
+               { :'foreman_salt/salt_keys' => [:destroy],
+                 :'foreman_salt/api/v2/salt_keys' => [:destroy] },
+               :resource_type => 'SmartProxy'
+
+    permission :edit_smart_proxies_salt_keys,
+               { :'foreman_salt/salt_keys' => [:accept, :reject],
+                 :'foreman_salt/api/v2/salt_keys' => [:update] },
+               :resource_type => 'SmartProxy'
+
+    permission :create_salt_modules,
+               { :'foreman_salt/salt_modules' => [:new, :create],
+                 :'foreman_salt/api/v2/salt_states' => [:create] },
+               :resource_type => 'ForemanSalt::SaltModule'
+
+    permission :import_salt_modules,
+               { :'foreman_salt/salt_modules' => [:import, :apply_changes],
+                 :'foreman_salt/api/v2/salt_states' => [:import] },
+               :resource_type => 'ForemanSalt::SaltModule'
+
+    permission :view_salt_modules,
+               { :'foreman_salt/salt_modules' => [:index, :show, :auto_complete_search],
+                 :'foreman_salt/api/v2/salt_states' => [:index, :show] },
+               :resource_type => 'ForemanSalt::SaltModule'
+
+    permission :edit_salt_modules,
+               { :'foreman_salt/salt_modules' => [:update, :edit] },
+               :resource_type => 'ForemanSalt::SaltModule'
+
+    permission :destroy_salt_modules,
+               { :'foreman_salt/salt_modules' => [:destroy],
+                 :'foreman_salt/api/v2/salt_states' => [:destroy] },
+               :resource_type => 'ForemanSalt::SaltModule'
+  end
+
+  # Roles
+  role 'Salt admin', [:saltrun_hosts, :create_salt_modules,
+                      :view_salt_modules, :edit_salt_modules,
+                      :destroy_salt_modules,
+                      :view_smart_proxies_salt_keys,
+                      :destroy_smart_proxies_salt_keys,
+                      :edit_smart_proxies_salt_keys,
+                      :create_smart_proxies_salt_autosign,
+                      :view_smart_proxies_salt_autosign,
+                      :destroy_smart_proxies_salt_autosign,
+                      :create_salt_environments, :view_salt_environments,
+                      :edit_salt_environments,
+                      :destroy_salt_environments]
+end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '3.0.2'
+  VERSION = '4.0.0'
 end

data/test/factories/foreman_salt_factories.rb

@@ -28,7 +28,7 @@ FactoryGirl.modify do
 
   factory :smart_proxy do
     trait :with_salt_feature do
-      features        { [::Feature.find_or_create_by_name('Salt')] }
+      features { [::Feature.find_or_create_by_name('Salt')] }
     end
   end
 end

data/test/functional/api/v2/salt_states_controller_test.rb

@@ -33,8 +33,8 @@ module ForemanSalt
     context 'importing' do
       setup do
         @proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
-        @states = {'env1' => %w(state1 state2 state3),
-                   'env2' => %w(state1 state2)}
+        @states = { 'env1' => %w(state1 state2 state3),
+                    'env2' => %w(state1 state2) }
 
         ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(@states)
       end
@@ -73,7 +73,7 @@ module ForemanSalt
         assert_response :success
         refute ::ForemanSalt::SaltModule.where(:id => state).first
         refute ::ForemanSalt::SaltModule.where(:name => 'state1').first
-       end
+      end
 
       test 'dryrun should do nothing' do
         post :import, :smart_proxy_id => @proxy.id, :dryrun => true

data/test/integration/salt_module_test.rb

@@ -6,9 +6,13 @@ module ForemanSalt
       User.current = User.anonymous_admin
 
       states = %w(state1 state2 state3 state4)
-      state_list = {'env1' => states, 'env2' => states}
+      state_list = { 'env1' => states, 'env2' => states }
 
       ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(state_list)
+
+      # FIXME #12143
+      FactoryGirl.create(:permission, :name => 'view_salt_environments',
+                         :resource_type => 'ForemanSalt::SaltEnvironment')
     end
 
     test 'index page' do

data/test/unit/host_extensions_test.rb

@@ -42,5 +42,14 @@ module ForemanSalt
       refute host.save
       assert host.errors.full_messages.include? 'Salt states must be in the environment of the host'
     end
+
+    test '#configuration? considers salt' do
+      host = FactoryGirl.build(:host)
+      proxy = FactoryGirl.build(:smart_proxy)
+
+      refute host.configuration?
+      host.salt_proxy = proxy
+      assert host.configuration?
+    end
   end
 end

data/test/unit/report_importer_test.rb

@@ -19,7 +19,7 @@ module ForemanSalt
 
     test 'importing report updates host status' do
       ForemanSalt::ReportImporter.import(@report)
-      assert_equal Host.find_by_name(@host).host_status, 'Error'
+      assert Host.find_by_name(@host).get_status(HostStatus::ConfigurationStatus).error?
     end
 
     test 'importing report has correct status' do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
 description: Foreman Plug-in for Salt
@@ -67,7 +67,6 @@ files:
 - app/controllers/foreman_salt/salt_modules_controller.rb
 - app/controllers/foreman_salt/state_importer.rb
 - app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb
-- app/helpers/concerns/foreman_salt/layout_helper_extensions.rb
 - app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
 - app/helpers/foreman_salt/salt_keys_helper.rb
 - app/helpers/foreman_salt/salt_modules_helper.rb
@@ -137,9 +136,11 @@ files:
 - db/migrate/20150411003302_add_environments_to_modules.rb
 - db/migrate/20150509094409_rename_join_tables.rb
 - db/migrate/20150509101505_add_primary_keys.rb
-- db/seeds.d/75-salt-seeds.rb
+- db/seeds.d/75-salt_seeds.rb
 - lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
+- lib/foreman_salt/extensions.rb
+- lib/foreman_salt/plugin.rb
 - lib/foreman_salt/version.rb
 - lib/tasks/foreman_salt_tasks.rake
 - test/factories/foreman_salt_factories.rb
@@ -171,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt

data/app/helpers/concerns/foreman_salt/layout_helper_extensions.rb

@@ -1,20 +0,0 @@
-module ForemanSalt
-  module LayoutHelperExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :authorized_associations_permission_name, :salt
-    end
-
-    # Foreman tries to magically guess permission names, but it doesn't work
-    # with plugins. #11408 ForemanSalt models that require permissions provide
-    # a self.permission_name method
-    def authorized_associations_permission_name_with_salt(klass)
-      if klass.respond_to?(:permission_name)
-        klass.permission_name(:view)
-      else
-        authorized_associations_permission_name_without_salt(klass)
-      end
-    end
-  end
-end