foreman_salt 8.0.4 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f6b102a6fc74aec003d945ca7d88f86963c673fc624e8867f84fd59ee061d778
-  data.tar.gz: a1a9409a364838b09777da3477e1037def275fe913544de8766ebd9b2a1d99c5
+SHA1:
+  metadata.gz: dcb0cd457b3e5c9000833aaa9df08803939fa100
+  data.tar.gz: e3d96bb062af2c2b6b2c67755812227e6c318567
 SHA512:
-  metadata.gz: 8ad8328433e56b07411ee20fa88f7df325ab40bbd7ba4d2fca557bd8148260929e3027e71319d8f79bbc0795da33f122621a9fb9e13395020af100978e5331c7
-  data.tar.gz: 423f85d580b378fa4bb488bee0d917ed6aa7501dc84e3237a5111dc79f321f9ef15958e00243bfe93f3d0ef6f4b90eadc63e20cdcf621f9a27824dc38562cafa
+  metadata.gz: adc4191bdf884bce9b3bb4c19a89ae8b479219fda7b680ce0e3fa2443f3b59f1ae13f1ec3e96ce977bb44e9b6c2b9f621862c239a60d4d25c3d8e6ebac09a7dd
+  data.tar.gz: 7326754f45cd2725fdf075d1c4477bbc5bdc8c629b85a145e5e83bf1805ed0acfe990bc33a07b50b9772b41600a59f2613448c07608f3d481bab023922221cb0

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

@@ -21,7 +21,7 @@ module ForemanSalt
         param :smart_proxy_id, :identifier_dottable, :required => true
         param :state, String, :required => true, :desc => N_('State can be "accepted" or "rejected"')
         def update
-          case params[:salt_key][:state]
+          case params[:key][:state]
           when 'accepted'
             @key.accept
           when 'rejected'

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

@@ -29,7 +29,7 @@ module ForemanSalt
         param_group :minion
         def update
           params[:minion][:salt_module_ids] = params[:minion].delete(:salt_state_ids) if params[:minion]
-          process_response @salt_minion.update_attributes(params.require(:minion).permit(:salt_proxy_id, :salt_environment_id, :salt_module_ids => []))
+          process_response @salt_minion.update_attributes(params[:minion])
         end
 
         def controller_permission

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

@@ -66,7 +66,7 @@ module ForemanSalt
             end
             clean_orphans
           end
-          render :plain => states.to_json
+          render :text => states.to_json
         end
 
         def controller_permission

data/app/controllers/foreman_salt/minions_controller.rb

@@ -16,12 +16,12 @@ module ForemanSalt
 
       enc['environment'] = env
       respond_to do |format|
-        format.html { render :plain => "<pre>#{ERB::Util.html_escape(enc.to_yaml)}</pre>" }
-        format.yml  { render :plain => enc.to_yaml }
+        format.html { render :text => "<pre>#{ERB::Util.html_escape(enc.to_yaml)}</pre>" }
+        format.yml  { render :text => enc.to_yaml }
       end
     rescue
       logger.warn "Failed to generate external nodes for #{@minion} with #{$ERROR_INFO}"
-      render(:plain => _('Unable to generate output, Check log files\n'), :status => 412) && return
+      render(:text => _('Unable to generate output, Check log files\n'), :status => 412) && return
     end
 
     def run

data/app/controllers/foreman_salt/salt_autosign_controller.rb

@@ -3,7 +3,7 @@ module ForemanSalt
     def index
       setup
       autosign = @api.autosign_list
-      @autosign = autosign.paginate :page => params[:page], :per_page => Setting::General.entries_per_page
+      @autosign = autosign.paginate :page => params[:page], :per_page => Setting[:entries_per_page]
     end
 
     def new

data/app/controllers/foreman_salt/salt_keys_controller.rb

@@ -9,7 +9,7 @@ module ForemanSalt
              else
                SmartProxies::SaltKeys.find_by_state @proxy, params[:state].downcase
              end
-      @keys = keys.sort.paginate :page => params[:page], :per_page => Setting::General.entries_per_page
+      @keys = keys.sort.paginate :page => params[:page], :per_page => Setting[:entries_per_page]
     end
 
     def accept

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

@@ -4,8 +4,8 @@ module ForemanSalt
       extend ActiveSupport::Concern
 
       included do
-        has_many :host_salt_modules, :foreign_key => :host_id, :class_name => '::ForemanSalt::HostSaltModule'
         has_many :salt_modules, :through => :host_salt_modules, :class_name => '::ForemanSalt::SaltModule'
+        has_many :host_salt_modules, :foreign_key => :host_id, :class_name => '::ForemanSalt::HostSaltModule'
 
         belongs_to :salt_proxy, :class_name => 'SmartProxy'
         belongs_to :salt_environment, :class_name => 'ForemanSalt::SaltEnvironment'
@@ -15,9 +15,9 @@ module ForemanSalt
         alias_method_chain :inherited_attributes, :salt
         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
-        scoped_search :in => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
+        scoped_search :relation => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
+        scoped_search :relation => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
+        scoped_search :relation => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
 
         validate :salt_modules_in_host_environment
 

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

@@ -4,15 +4,15 @@ module ForemanSalt
       extend ActiveSupport::Concern
 
       included do
-        has_many :hostgroup_salt_modules, :class_name => '::ForemanSalt::HostgroupSaltModule'
         has_many :salt_modules, :through => :hostgroup_salt_modules, :class_name => '::ForemanSalt::SaltModule'
+        has_many :hostgroup_salt_modules, :class_name => '::ForemanSalt::HostgroupSaltModule'
 
         belongs_to :salt_proxy, :class_name => 'SmartProxy'
         belongs_to :salt_environment, :class_name => 'ForemanSalt::SaltEnvironment'
 
-        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
+        scoped_search :relation => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
+        scoped_search :relation => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
+        scoped_search :relation => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
       end
 
       def all_salt_modules

data/app/models/foreman_salt/host_salt_module.rb

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

data/app/models/foreman_salt/hostgroup_salt_module.rb

@@ -1,5 +1,5 @@
 module ForemanSalt
-  class HostgroupSaltModule < ActiveRecord::Base
+  class HostgroupSaltModule < ApplicationRecord
     belongs_to :hostgroup
     belongs_to :salt_module
   end

data/app/models/foreman_salt/salt_environment.rb

@@ -1,5 +1,5 @@
 module ForemanSalt
-  class SaltEnvironment < ActiveRecord::Base
+  class SaltEnvironment < ApplicationRecord
     include Authorizable
     extend FriendlyId
     friendly_id :name
@@ -7,14 +7,14 @@ module ForemanSalt
     has_many :hosts, :class_name => '::Host::Managed'
     has_many :hostgroups, :class_name => '::Hostgroup'
 
-    has_many :salt_module_environments
     has_many :salt_modules, :through => :salt_module_environments, :before_remove => :remove_from_hosts
+    has_many :salt_module_environments
 
     validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A[\w\d\.]+\z/, :message => N_('is alphanumeric and cannot contain spaces') }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :in => :hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup
-    scoped_search :in => :hosts, :on => :name, :complete_value => true, :rename => :host
+    scoped_search :relation => :hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup
+    scoped_search :relation => :hosts, :on => :name, :complete_value => true, :rename => :host
 
     def self.humanize_class_name(_name = nil)
       _('Salt environment')

data/app/models/foreman_salt/salt_module.rb

@@ -1,17 +1,17 @@
 module ForemanSalt
-  class SaltModule < ActiveRecord::Base
+  class SaltModule < ApplicationRecord
     include Authorizable
     extend FriendlyId
     friendly_id :name
 
-    has_many :host_salt_modules, :foreign_key => :salt_module_id
     has_many :hosts, :through => :host_salt_modules, :class_name => '::Host::Managed'
+    has_many :host_salt_modules, :foreign_key => :salt_module_id
 
-    has_many :hostgroup_salt_modules, :foreign_key => :salt_module_id
     has_many :hostgroups, :through => :hostgroup_salt_modules
+    has_many :hostgroup_salt_modules, :foreign_key => :salt_module_id
 
-    has_many :salt_module_environments
     has_many :salt_environments, :through => :salt_module_environments
+    has_many :salt_module_environments
 
     validates :name, :uniqueness => true, :presence => true, :format => { :with => /\A(?:[\w\d\-]+\.{0,1})+[^\.]\z/, :message => N_('must be alphanumeric, can contain periods, dashes, underscores and must not contain spaces') }
 
@@ -22,9 +22,9 @@ module ForemanSalt
     scope :in_environment, ->(environment) { joins(:salt_environments).where('salt_module_environments.salt_environment_id' => environment) }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :in => :salt_environments, :on => :name, :complete_value => true, :rename => :environment
-    scoped_search :in => :hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup
-    scoped_search :in => :hosts, :on => :name, :complete_value => true, :rename => :host
+    scoped_search :relation => :salt_environments, :on => :name, :complete_value => true, :rename => :environment
+    scoped_search :relation => :hostgroups, :on => :name, :complete_value => true, :rename => :hostgroup
+    scoped_search :relation => :hosts, :on => :name, :complete_value => true, :rename => :host
 
     def self.to_hash
       states = {}

data/app/models/foreman_salt/salt_module_environment.rb

@@ -1,5 +1,5 @@
 module ForemanSalt
-  class SaltModuleEnvironment < ActiveRecord::Base
+  class SaltModuleEnvironment < ApplicationRecord
     belongs_to :salt_environment
     belongs_to :salt_module
 

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

@@ -31,12 +31,14 @@ module ForemanSalt
     end
 
     def accept
+      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
+      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/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '8.0.4'
+  VERSION = '9.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 8.0.4
+  version: 9.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -183,14 +183,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
 - test/factories/foreman_salt_factories.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
 - test/functional/api/v2/salt_states_controller_test.rb
 - test/functional/minions_controller_test.rb