foreman_salt 4.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e9c60ec9d9ffcbadae6c71eae62c4e545bd20f
-  data.tar.gz: 6dd19160007e09f75ed43082ebc446c848a260dd
+  metadata.gz: f9868208c4e4fcafc333d26d1328d26fda1aedbe
+  data.tar.gz: 5123aa03c84c55a2b2bcf7781bd20a4c8f8c0bc7
 SHA512:
-  metadata.gz: 5553e760b7ba4c5ccbcb4694818f2cee361cb4bfa26717817aed8e1ae016d3b01207336745bf899f394e69fc2cc5d66f3ae0c27423d44d23ba183b0aaab64490
-  data.tar.gz: f4a10ec1a21cddb8134961584baca1ba768fd75f51c30a9ed9b94a28965e854fd3b660ae189eeab7b098374681c255ffb90c7385b22c2b344e3f45acf12dee94
+  metadata.gz: f3eb26a7c80cfd36770eeaa6fd758641e24942940964c4a97d2e516ecd3e80f59b7806f1828cea71dc3abee4623f30e6056e66df97a6143f12e67087e23244ba
+  data.tar.gz: 2912f3b5f10639dfd156bc5b7b3110fcc18eb732b49c04f1b4e036f2fc32c75916ad739d08456423c8c846c71486651aa73348f401a22e5e87bf49c52c64917e

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

@@ -8,6 +8,8 @@ function update_salt_states(element) {
   var url = $(element).attr('data-url');
   var data = $("form").serialize().replace('method=put', 'method=post');
 
+  if (url == undefined) return;
+
   if (url.match('hostgroups')) {
     data = data + '&hostgroup_id=' + host_id;
   } else {
@@ -18,9 +20,9 @@ function update_salt_states(element) {
     return;
   }
 
-  $(element).indicator_show();
+  foreman.tools.showSpinner();
   $.ajax({
-    type: 'post',
+    type: 'put',
     url:  url,
     data: data,
     success: function(request) {
@@ -29,7 +31,7 @@ function update_salt_states(element) {
       multiSelectOnLoad();
     },
     complete: function() {
-      $(element).indicator_hide();
+      foreman.tools.hideSpinner();
     }
   });
 }

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

@@ -51,7 +51,7 @@ module ForemanSalt
         end
 
         def find_proxy
-          @proxy = ::SmartProxy.find(params[:smart_proxy_id])
+          @proxy = ::SmartProxy.friendly.find(params[:smart_proxy_id])
           not_found unless @proxy
         end
 

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

@@ -65,7 +65,7 @@ module ForemanSalt
         end
 
         def find_proxy
-          @proxy = ::SmartProxy.find(params[:smart_proxy_id])
+          @proxy = ::SmartProxy.friendly.find(params[:smart_proxy_id])
           not_found unless @proxy
         end
 

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

@@ -89,7 +89,7 @@ module ForemanSalt
 
         def find_environment
           if params[:salt_environment_id]
-            @salt_environment = ForemanSalt::SaltEnvironment.find(params[:salt_environment_id])
+            @salt_environment = ForemanSalt::SaltEnvironment.friendly.find(params[:salt_environment_id])
             fail _('Could not find salt environment with id %s') % params[:salt_environment_id] unless @salt_environment
           end
         end

data/app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb

@@ -11,7 +11,7 @@ module ForemanSalt
         @hostgroup = Hostgroup.authorized(:view_hostgroups, Hostgroup).find_by_id(params[:hostgroup_id]) || Hostgroup.new(params[:hostgroup])
 
         if params[:hostgroup][:salt_environment_id].present?
-          @salt_environment = ::ForemanSalt::SaltEnvironment.find(params[:hostgroup][:salt_environment_id])
+          @salt_environment = ::ForemanSalt::SaltEnvironment.friendly.find(params[:hostgroup][:salt_environment_id])
           load_vars_for_ajax
           render :partial => 'foreman_salt/salt_modules/host_tab_pane'
         else

data/app/controllers/foreman_salt/minions_controller.rb

@@ -34,7 +34,7 @@ module ForemanSalt
 
     def salt_environment_selected
       if params[:host][:salt_environment_id].present?
-        @salt_environment = ::ForemanSalt::SaltEnvironment.find(params[:host][:salt_environment_id])
+        @salt_environment = ::ForemanSalt::SaltEnvironment.friendly.find(params[:host][:salt_environment_id])
         load_ajax_vars
         render :partial => 'foreman_salt/salt_modules/host_tab_pane'
       else

data/app/controllers/foreman_salt/state_importer.rb

@@ -46,19 +46,19 @@ module ForemanSalt
     end
 
     def add_to_environment(states, environment)
-      environment = SaltEnvironment.find_or_create_by_name(environment)
+      environment = SaltEnvironment.where(:name => environment).first_or_create
 
       states.each do |state_name|
-        state = SaltModule.find_or_create_by_name(state_name)
+        state = SaltModule.where(:name => state_name).first_or_create
         state.salt_environments << environment unless state.salt_environments.include? environment
       end
     end
 
     def remove_from_environment(states, environment)
-      return unless (environment = SaltEnvironment.find(environment))
+      return unless (environment = SaltEnvironment.friendly.find(environment))
 
       states.each do |state_name|
-        state = SaltModule.find(state_name)
+        state = SaltModule.friendly.find(state_name)
         state.salt_environments.delete(environment) if state
       end
     end

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

@@ -7,16 +7,14 @@ module ForemanSalt
     end
 
     def proxy_actions_with_salt_proxy(proxy, authorizer)
-      salt = proxy.features.detect { |feature| feature.name == 'Salt' }
-      [
-        if salt
-          display_link_if_authorized(_('Salt Keys'), :controller => 'foreman_salt/salt_keys', :action => 'index', :smart_proxy_id => proxy)
-        end,
+      actions = proxy_actions_without_salt_proxy(proxy, authorizer)
 
-        if salt
-          display_link_if_authorized(_('Salt Autosign'), :controller => 'foreman_salt/salt_autosign', :action => 'index', :smart_proxy_id => proxy)
-        end
-      ] + proxy_actions_without_salt_proxy(proxy, authorizer)
+      if proxy.has_feature?('Salt')
+        actions << display_link_if_authorized(_('Salt Keys'), :controller => 'foreman_salt/salt_keys', :action => 'index', :smart_proxy_id => proxy)
+        actions << display_link_if_authorized(_('Salt Autosign'), :controller => 'foreman_salt/salt_autosign', :action => 'index', :smart_proxy_id => proxy)
+      end
+
+      actions
     end
   end
 end

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

@@ -24,6 +24,9 @@ module ForemanSalt
         after_build      :delete_salt_key, :if => ->(host) { host.salt_proxy }
         before_provision :accept_salt_key, :if => ->(host) { host.salt_proxy }
         before_destroy   :delete_salt_key, :if => ->(host) { host.salt_proxy }
+
+        attr_accessible :salt_proxy_id, :salt_proxy_name, :salt_environment_id,
+          :salt_environment_name, :salt_modules, :salt_module_ids
       end
 
       def configuration_with_salt?
@@ -87,7 +90,8 @@ module ForemanSalt
       def accept_salt_key
         begin
           Rails.logger.info("Host #{fqdn} is built, accepting Salt key")
-          ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn).accept
+          key = ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn)
+          key.accept unless key.nil?
         rescue Foreman::Exception => e
            Rails.logger.warn("Unable to accept key for #{fqdn}: #{e}")
         end
@@ -95,7 +99,8 @@ module ForemanSalt
 
       def delete_salt_key
         begin
-          ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn).delete
+          key = ForemanSalt::SmartProxies::SaltKeys.find(salt_proxy, fqdn)
+          key.delete unless key.nil?
         rescue Foreman::Exception => e
          Rails.logger.warn("Unable to delete key for #{fqdn}: #{e}")
         end

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

@@ -13,6 +13,9 @@ module ForemanSalt
         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
         scoped_search :in => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
+
+        attr_accessible :salt_proxy_id, :salt_proxy_name, :salt_environment_id,
+          :salt_environment_name, :salt_modules, :salt_module_ids
       end
 
       def all_salt_modules

data/app/models/foreman_salt/fact_name.rb

@@ -1,3 +1,5 @@
 module ForemanSalt
-  class FactName < ::FactName; end
+  class FactName < ::FactName
+    attr_accessible :parent, :name, :compose, :parent_id
+  end
 end

data/app/models/foreman_salt/salt_environment.rb

@@ -4,6 +4,8 @@ module ForemanSalt
     extend FriendlyId
     friendly_id :name
 
+    attr_accessible :name, :salt_modules, :salt_module_ids
+
     has_many :hosts, :class_name => '::Host::Managed'
     has_many :hostgroups, :class_name => '::Hostgroup'
 

data/app/models/foreman_salt/salt_module.rb

@@ -4,6 +4,8 @@ module ForemanSalt
     extend FriendlyId
     friendly_id :name
 
+    attr_accessible :name, :salt_environments, :salt_environment_ids
+
     # before_destroy EnsureNotUsedBy.new(:hosts, :hostgroups)
 
     has_many :hosts, :through => :host_salt_modules, :class_name => '::Host::Managed'

data/app/overrides/salt_modules_selector.rb

@@ -5,7 +5,7 @@ Deface::Override.new(:virtual_path => 'hosts/_form',
 
 Deface::Override.new(:virtual_path => 'hosts/_form',
                      :name => 'add_salt_modules_tab_pane_to_host',
-                     :insert_before => 'div#puppet_klasses',
+                     :insert_before => 'div#primary',
                      :partial => 'foreman_salt/salt_modules/host_tab_pane')
 
 Deface::Override.new(:virtual_path => 'hostgroups/_form',
@@ -15,5 +15,5 @@ Deface::Override.new(:virtual_path => 'hostgroups/_form',
 
 Deface::Override.new(:virtual_path => 'hostgroups/_form',
                      :name => 'add_salt_modules_tab_pane_to_hg',
-                     :insert_before => 'div#puppet_klasses',
+                     :insert_before => 'div#primary',
                      :partial => 'foreman_salt/salt_modules/host_tab_pane')

data/app/services/foreman_salt/fact_importer.rb

@@ -27,7 +27,7 @@ module ForemanSalt
         name_with_prefix = prefix.empty? ? name : prefix + FactName::SEPARATOR + name
 
         compose = value.is_a?(Hash)
-        if fact_names[name_with_prefix].present?
+        if fact_names.is_a?(Hash) && fact_names[name_with_prefix].present?
           fact_name_id = fact_names[name_with_prefix]
         else
           fact_name_id = fact_name_class.create!(:name      => name_with_prefix,

data/app/services/foreman_salt/fact_parser.rb

@@ -15,7 +15,7 @@ module ForemanSalt
     def architecture
       name = facts[:osarch]
       name = 'x86_64' if name == 'amd64'
-      Architecture.find_or_create_by_name name unless name.blank?
+      Architecture.where(:name => name).first_or_create unless name.blank?
     end
 
     def environment
@@ -24,12 +24,12 @@ module ForemanSalt
 
     def model
       name = facts[:productname]
-      Model.find_or_create_by_name(name.strip) unless name.blank?
+      Model.where(:name => name.strip).first_or_create unless name.blank?
     end
 
     def domain
       name = facts[:domain]
-      Domain.find_or_create_by_name name unless name.blank?
+      Domain.where(:name => name).first_or_create unless name.blank?
     end
 
     def ip

data/app/services/foreman_salt/report_importer.rb

@@ -24,7 +24,7 @@ module ForemanSalt
 
       if @host.new_record? && !Setting[:create_new_host_when_report_is_uploaded]
         logger.info("skipping report for #{@host} as its an unknown host and create_new_host_when_report_is_uploaded setting is disabled")
-        return Report.new
+        return ConfigReport.new
       end
 
       @host.salt_proxy_id ||= @proxy_id
@@ -36,9 +36,10 @@ module ForemanSalt
         process_normal
       end
 
+      @host.save(:validate => false)
+      @host.reload
       @host.refresh_statuses
 
-      @host.save(:validate => false)
       logger.info("Imported report for #{@host} in #{(Time.zone.now - start_time).round(2)} seconds")
     end
 
@@ -130,16 +131,16 @@ module ForemanSalt
 
     def process_normal
       metrics = calculate_metrics
-      status = ReportStatusCalculator.new(:counters => metrics[:resources].slice(*::Report::METRIC)).calculate
+      status = ConfigReportStatusCalculator.new(:counters => metrics[:resources].slice(*::ConfigReport::METRIC)).calculate
 
-      @report = Report.new(:host => @host, :reported_at => start_time, :status => status, :metrics => metrics)
+      @report = ConfigReport.new(:host => @host, :reported_at => start_time, :status => status, :metrics => metrics)
       return @report unless @report.save
       import_log_messages
     end
 
     def process_failures
-      status = ReportStatusCalculator.new(:counters => { 'failed' => @raw.size }).calculate
-      @report = Report.create(:host => @host, :reported_at => Time.zone.now, :status => status, :metrics => {})
+      status = ConfigReportStatusCalculator.new(:counters => { 'failed' => @raw.size }).calculate
+      @report = ConfigReport.create(:host => @host, :reported_at => Time.zone.now, :status => status, :metrics => {})
 
       source = Source.find_or_create('Salt')
       @raw.each do |failure|

data/config/routes.rb

@@ -1,14 +1,14 @@
 Rails.application.routes.draw do
   scope :salt, :path => '/salt' do
     constraints(:id => /[\w\.-]+/) do
-      match '/node/:id' => 'foreman_salt/minions#node'
-      match '/run/:id'  => 'foreman_salt/minions#run'
+      match '/node/:id' => 'foreman_salt/minions#node', :via => :get
+      match '/run/:id'  => 'foreman_salt/minions#run', :via => :get
     end
 
     resources :minions, :controller => 'foreman_salt/minions', :only => [] do
       collection do
         constraints(:id => /[^\/]+/) do
-          post 'salt_environment_selected'
+          put 'salt_environment_selected'
         end
       end
     end

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

@@ -1,5 +1,5 @@
 # Create feature for Smart Proxy
-Feature.find_or_create_by_name('Salt')
+Feature.where(:name => 'Salt').first_or_create
 
 # Add new viewing permissions to Viewer role
 viewer = Role.find_by_name('Viewer')

data/lib/foreman_salt/engine.rb

@@ -22,7 +22,9 @@ module ForemanSalt
     end
 
     initializer 'foreman_salt.load_app_instance_data' do |app|
-      app.config.paths['db/migrate'] += ForemanSalt::Engine.paths['db/migrate'].existent
+      ForemanSalt::Engine.paths['db/migrate'].existent.each do |path|
+        app.config.paths['db/migrate'] << path
+      end
     end
 
     initializer 'foreman_salt.assets.precompile' do |app|

data/lib/foreman_salt/plugin.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_salt do
-  requires_foreman '>= 1.10'
+  requires_foreman '>= 1.11'
 
   apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
 

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '4.0.1'
+  VERSION = '5.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.where(:name => 'Salt').first_or_create] }
     end
   end
 end

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

@@ -45,8 +45,8 @@ module ForemanSalt
         assert_response :success
 
         @states.each do |env, states|
-          environment = ::ForemanSalt::SaltEnvironment.find(env)
-          assert_blank environment.salt_modules.map(&:name) - states
+          environment = ::ForemanSalt::SaltEnvironment.find_by_name(env)
+          assert_empty environment.salt_modules.map(&:name) - states
         end
       end
 

data/test/test_plugin_helper.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 def assert_row_button(index_path, link_text, button_text, dropdown = false)
   visit index_path
   within(:xpath, "//tr[contains(.,'#{link_text}')]") do
-    find('i.caret').click if dropdown
+    find('span.caret').click if dropdown
     click_link(button_text)
   end
 end

data/test/unit/host_extensions_test.rb

@@ -56,11 +56,11 @@ module ForemanSalt
       before do
         @host = FactoryGirl.create(:host, :with_salt_proxy, :build => true)
         @key_stub = stub("key")
-        ForemanSalt::SmartProxies::SaltKeys.expects(:find).with(@host.salt_proxy, @host.fqdn).returns(@key_stub)
+        ForemanSalt::SmartProxies::SaltKeys.expects(:find).at_least_once.with(@host.salt_proxy, @host.fqdn).returns(@key_stub)
       end
 
       test 'host key is accepted when host is built' do
-        @key_stub.expects(:accept).returns(true)
+        @key_stub.expects(:accept).at_least_once.returns(true)
         assert @host.built
         @host.run_callbacks(:commit) # callbacks don't run with Foreman's transactional fixtures
       end

data/test/unit/hostgroup_extensions_test.rb

@@ -43,7 +43,7 @@ module ForemanSalt
       parent = FactoryGirl.create :hostgroup, :with_salt_modules
       child_one = FactoryGirl.create :hostgroup, :parent => parent
       child_two = FactoryGirl.create :hostgroup, :parent => child_one
-      assert_blank parent.all_salt_modules - child_two.all_salt_modules
+      assert_empty parent.all_salt_modules - child_two.all_salt_modules
     end
 
     test 'inheritance when no parents have modules' do

data/test/unit/report_importer_test.rb

@@ -18,6 +18,7 @@ module ForemanSalt
     end
 
     test 'importing report updates host status' do
+      HostStatus::ConfigurationStatus.any_instance.stubs(:relevant?).returns(true)
       ForemanSalt::ReportImporter.import(@report)
       assert Host.find_by_name(@host).get_status(HostStatus::ConfigurationStatus).error?
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -180,27 +180,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       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
 test_files:
+- test/factories/foreman_salt_factories.rb
+- test/integration/salt_autosign_test.rb
 - test/integration/salt_module_test.rb
 - test/integration/salt_environment_test.rb
-- test/integration/salt_autosign_test.rb
 - test/integration/salt_keys_test.rb
-- test/test_plugin_helper.rb
-- test/unit/grains_importer_test.rb
+- test/unit/highstate.json
+- test/unit/report_importer_test.rb
 - test/unit/grains_centos.json
 - test/unit/host_extensions_test.rb
-- test/unit/report_importer_test.rb
-- test/unit/hostgroup_extensions_test.rb
 - test/unit/salt_modules_test.rb
-- test/unit/highstate.json
+- test/unit/grains_importer_test.rb
 - test/unit/salt_keys_test.rb
-- test/functional/minions_controller_test.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
-- test/functional/api/v2/salt_states_controller_test.rb
+- test/unit/hostgroup_extensions_test.rb
+- test/test_plugin_helper.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
-- test/factories/foreman_salt_factories.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/minions_controller_test.rb