foreman_salt 14.0.0 → 15.1.0

data/app/services/foreman_salt/report_importer.rb

@@ -1,11 +1,10 @@
 module ForemanSalt
-  # rubocop:disable ClassLength
   class ReportImporter
-    delegate :logger, :to => :Rails
+    delegate :logger, to: :Rails
     attr_reader :report
 
     def self.import(raw, proxy_id = nil)
-      fail ::Foreman::Exception.new(_('Invalid report')) unless raw.is_a?(Hash)
+      raise ::Foreman::Exception, _('Invalid report') unless raw.is_a?(Hash)
 
       raw.map do |host, report|
         importer = ForemanSalt::ReportImporter.new(host, report, proxy_id)
@@ -41,9 +40,9 @@ module ForemanSalt
         process_normal
       end
 
-      @host.save(:validate => false)
+      @host.save(validate: false)
       @host.reload
-      @host.refresh_statuses([HostStatus.find_status_by_humanized_name("configuration")])
+      @host.refresh_statuses([HostStatus.find_status_by_humanized_name('configuration')])
 
       logger.info("Imported report for #{@host} in #{(Time.zone.now - start_time).round(2)} seconds")
     end
@@ -51,11 +50,11 @@ module ForemanSalt
     private
 
     def find_or_create_host(host)
-      @host ||= Host::Managed.find_by_name(host)
+      @host ||= Host::Managed.find_by(name: host)
 
       unless @host
-        new = Host::Managed.new(:name => host)
-        new.save(:validate => false)
+        new = Host::Managed.new(name: host)
+        new.save(validate: false)
         @host = new
       end
 
@@ -73,11 +72,11 @@ module ForemanSalt
                   :notice
                 end
 
-        source = Source.find_or_create(resource)
+        source = Source.find_or_create_by(value: resource)
 
         message = if result['changes']['diff']
                     result['changes']['diff']
-                  elsif !result['pchanges'].blank? && result['pchanges'].include?('diff')
+                  elsif result['pchanges'].present? && result['pchanges'].include?('diff')
                     result['pchanges']['diff']
                   elsif result['comment'].presence
                     result['comment']
@@ -85,12 +84,11 @@ module ForemanSalt
                     'No message available'
                   end
 
-        message = Message.find_or_create(message)
-        Log.create(:message_id => message.id, :source_id => source.id, :report => @report, :level => level)
+        message = Message.find_or_create_by(value: message)
+        Log.create(message_id: message.id, source_id: source.id, report: @report, level: level)
       end
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize,Metrics/MethodLength
     def calculate_metrics
       success = 0
       failed = 0
@@ -108,13 +106,13 @@ module ForemanSalt
           success += 1
           if resource.match(/^service_/) && result['comment'].include?('restarted')
             restarted += 1
-          elsif !result['changes'].blank?
+          elsif result['changes'].present?
             changed += 1
-          elsif !result['pchanges'].blank?
+          elsif result['pchanges'].present?
             pending += 1
           end
         elsif result['result'].nil?
-            pending += 1
+          pending += 1
         elsif !result['result']
           if resource.match(/^service_/) && result['comment'].include?('restarted')
             restarted_failed += 1
@@ -124,7 +122,11 @@ module ForemanSalt
         end
 
         duration = if result['duration'].is_a? String
-                     Float(result['duration'].delete(' ms')) rescue nil
+                     begin
+                       Float(result['duration'].delete(' ms'))
+                     rescue StandardError
+                       nil
+                     end
                    else
                      result['duration']
                    end
@@ -134,36 +136,35 @@ module ForemanSalt
         time[resource] = duration || 0
       end
 
-      time[:total] = time.values.compact.inject(&:+) || 0
-      events = { :total => changed + failed + restarted + restarted_failed, :success => success + restarted, :failure => failed + restarted_failed }
+      time[:total] = time.values.compact.sum || 0
+      events = { total: changed + failed + restarted + restarted_failed, success: success + restarted, failure: failed + restarted_failed }
 
-      changes = { :total => changed + restarted }
+      changes = { total: changed + restarted }
 
       resources = { 'total' => @raw.size, 'applied' => changed, 'restarted' => restarted, 'failed' => failed,
                     'failed_restarts' => restarted_failed, 'skipped' => 0, 'scheduled' => 0, 'pending' => pending }
 
-      { :events => events, :resources => resources, :changes => changes, :time => time }
+      { events: events, resources: resources, changes: changes, time: time }
     end
-    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize,Metrics/MethodLength
 
     def process_normal
       metrics = calculate_metrics
-      status = ConfigReportStatusCalculator.new(:counters => metrics[:resources].slice(*::ConfigReport::METRIC)).calculate
+      status = ConfigReportStatusCalculator.new(counters: metrics[:resources].slice(*::ConfigReport::METRIC)).calculate
 
-      @report = ConfigReport.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 = ConfigReportStatusCalculator.new(:counters => { 'failed' => @raw.size }).calculate
-      @report = ConfigReport.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')
+      source = Source.find_or_create_by(value: 'Salt')
       @raw.each do |failure|
-        message = Message.find_or_create(failure)
-        Log.create(:message_id => message.id, :source_id => source.id, :report => @report, :level => :err)
+        message = Message.find_or_create_by(value: failure)
+        Log.create(message_id: message.id, source_id: source.id, report: @report, level: :err)
       end
     end
 
@@ -171,5 +172,4 @@ module ForemanSalt
       @start_time ||= Time.zone.now
     end
   end
-  # rubocop:enable ClassLength
 end

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

@@ -1,63 +1,65 @@
 module ForemanSalt
-  class SmartProxies::SaltKeys
-    attr_reader :name, :state, :fingerprint, :smart_proxy_id
+  module SmartProxies
+    class SaltKeys
+      attr_reader :name, :state, :fingerprint, :smart_proxy_id
 
-    def initialize(opts)
-      @name, @state, @fingerprint, @smart_proxy_id = opts.flatten
-    end
+      def initialize(opts)
+        @name, @state, @fingerprint, @smart_proxy_id = opts.flatten
+      end
 
-    class << self
-      def all(proxy)
-        fail ::Foreman::Exception.new(N_('Must specify a Smart Proxy to use')) if proxy.nil?
+      class << self
+        def all(proxy)
+          raise ::Foreman::Exception, 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)
-          keys = api.key_list.map do |name, properties|
-            new([name.strip, properties['state'], properties['fingerprint'], proxy.id])
-          end.compact
+          unless (keys = Rails.cache.read("saltkeys_#{proxy.id}"))
+            api = ProxyAPI::Salt.new(url: proxy.url)
+            keys = api.key_list.map do |name, properties|
+              new([name.strip, properties['state'], properties['fingerprint'], proxy.id])
+            end.compact
 
-          Rails.cache.write("saltkeys_#{proxy.id}", keys, :expires_in => 1.minute) if Rails.env.production?
+            Rails.cache.write("saltkeys_#{proxy.id}", keys, expires_in: 1.minute) if Rails.env.production?
+          end
+          keys
         end
-        keys
-      end
 
-      def find(proxy, name)
-        all(proxy).find { |c| c.name == name }
-      end
+        def find(proxy, name)
+          all(proxy).find { |c| c.name == name }
+        end
 
-      def find_by_state(proxy, state)
-        all(proxy).select { |c| c.state == state }
+        def find_by_state(proxy, state)
+          all(proxy).select { |c| c.state == state }
+        end
       end
-    end
 
-    def accept
-      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 accept
+        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
-      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
-    end
+      def reject
+        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
+      end
 
-    def delete
-      proxy = SmartProxy.find(smart_proxy_id)
-      Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
-      ProxyAPI::Salt.new(:url => proxy.url).key_delete name
-    end
+      def delete
+        proxy = SmartProxy.find(smart_proxy_id)
+        Rails.cache.delete("saltkeys_#{proxy.id}") if Rails.env.production?
+        ProxyAPI::Salt.new(url: proxy.url).key_delete name
+      end
 
-    def to_param
-      name
-    end
+      def to_param
+        name
+      end
 
-    def to_s
-      name
-    end
+      def to_s
+        name
+      end
 
-    def <=>(other)
-      name <=> other.name
+      def <=>(other)
+        name <=> other.name
+      end
     end
   end
 end

data/app/views/foreman_salt/api/v2/salt_autosign/create.json.rabl

@@ -1,3 +1,3 @@
 object @salt_autosign
 
-extends "foreman_salt/api/v2/salt_autosign/main"
+extends 'foreman_salt/api/v2/salt_autosign/main'

data/app/views/foreman_salt/api/v2/salt_environments/create.json.rabl

@@ -1,3 +1,3 @@
 object @salt_environment
 
-extends "foreman_salt/api/v2/salt_environments/main"
+extends 'foreman_salt/api/v2/salt_environments/main'

data/app/views/foreman_salt/api/v2/salt_environments/show.json.rabl

@@ -2,6 +2,6 @@ object @salt_environment
 
 extends 'foreman_salt/api/v2/salt_environments/base'
 
-child :salt_modules => :salt_states do
+child salt_modules: :salt_states do
   extends 'foreman_salt/api/v2/salt_states/base'
 end

data/app/views/foreman_salt/api/v2/salt_hostgroups/base.json.rabl

@@ -0,0 +1,7 @@
+object @salt_hostgroup
+
+attributes :id, :name, :salt_master, :salt_environment
+
+child salt_modules: :salt_states do
+  extends 'foreman_salt/api/v2/salt_states/base'
+end

data/app/views/foreman_salt/api/v2/salt_hostgroups/show.json.rabl

@@ -0,0 +1,3 @@
+object @salt_hostgroup
+
+extends 'foreman_salt/api/v2/salt_hostgroups/base'

data/app/views/foreman_salt/api/v2/salt_hostgroups/update.json.rabl

@@ -0,0 +1,3 @@
+object @salt_hostgroup
+
+extends 'foreman_salt/api/v2/salt_hostgroups/base'

data/app/views/foreman_salt/api/v2/salt_keys/update.json.rabl

@@ -1,3 +1,3 @@
 object @salt_key
 
-extends "foreman_salt/api/v2/salt_keys/main"
+extends 'foreman_salt/api/v2/salt_keys/main'

data/app/views/foreman_salt/api/v2/salt_minions/show.json.rabl

@@ -1,8 +1,7 @@
 object @salt_minion
 
-extends "foreman_salt/api/v2/salt_minions/main"
+extends 'foreman_salt/api/v2/salt_minions/main'
 
-child :salt_modules => :salt_states do
-  extends "foreman_salt/api/v2/salt_states/base"
+child salt_modules: :salt_states do
+  extends 'foreman_salt/api/v2/salt_states/base'
 end
-

data/app/views/foreman_salt/api/v2/salt_states/create.json.rabl

@@ -1,3 +1,3 @@
 object @salt_state
 
-extends "foreman_salt/api/v2/salt_states/main"
+extends 'foreman_salt/api/v2/salt_states/main'

data/app/views/foreman_salt/api/v2/salt_states/show.json.rabl

@@ -9,4 +9,3 @@ end
 child :salt_environments do
   extends 'foreman_salt/api/v2/salt_environments/base'
 end
-

data/app/views/foreman_salt/api/v2/salt_variables/create.json.rabl

@@ -1,3 +1,3 @@
 object @salt_variable
 
-extends "foreman_salt/api/v2/salt_variables/show"
+extends 'foreman_salt/api/v2/salt_variables/show'

data/app/views/foreman_salt/api/v2/salt_variables/destroy.json.rabl

@@ -1,3 +1,3 @@
 object @salt_variable
 
-extends "foreman_salt/api/v2/salt_variables/show"
+extends 'foreman_salt/api/v2/salt_variables/show'

data/app/views/foreman_salt/api/v2/salt_variables/show.json.rabl

@@ -2,17 +2,17 @@ object @salt_variable
 
 attribute :parameter
 attributes :id, :variable, :salt_state, :salt_state_id, :description, :override,
-           :variable_type, :hidden_value?, :validator_type,
-           :validator_rule, :merge_overrides, :merge_default,
-           :avoid_duplicates, :override_value_order, :created_at, :updated_at,
-           :default_value
+  :variable_type, :hidden_value?, :validator_type,
+  :validator_rule, :merge_overrides, :merge_default,
+  :avoid_duplicates, :override_value_order, :created_at, :updated_at,
+  :default_value
 
 node do |salt_variable|
   {
-    :override_values => partial(
-      'api/v2/override_values/index',
-      :object => salt_variable.lookup_values
-    )
+    override_values: partial(
+      'api/v2/override_values/main',
+      object: salt_variable.lookup_values
+    ),
   }
 end
 

data/app/views/foreman_salt/salt_autosign/index.html.erb

@@ -17,5 +17,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @autosign %>
-<%= will_paginate @autosign %>
+<%= will_paginate_with_info @autosign %>

data/app/views/foreman_salt/salt_environments/index.html.erb

@@ -24,6 +24,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @salt_environments %>
-<%= will_paginate @salt_environments %>
-
+<%= will_paginate_with_info @salt_environments %>

data/app/views/foreman_salt/salt_keys/index.erb

@@ -29,6 +29,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @keys  %>
-<%= will_paginate @keys %>
-
+<%= will_paginate_with_info @keys %>

data/app/views/foreman_salt/salt_modules/index.html.erb

@@ -39,5 +39,4 @@
   <% end %>
 </table>
 
-<%= page_entries_info @salt_modules %>
-<%= will_paginate @salt_modules %>
+<%= will_paginate_with_info @salt_modules %>

data/config/api_routes.rb

@@ -0,0 +1,31 @@
+Rails.application.routes.draw do
+  scope :salt, path: '/salt' do
+    namespace :api, defaults: { format: 'json' } do
+      scope '(:apiv)', module: :v2, defaults: { apiv: 'v2' }, apiv: /v1|v2/, constraints: ApiConstraints.new(version: 2, default: true) do
+        match '/jobs/upload' => '/foreman_salt/api/v2/jobs#upload', :via => :post
+        match '/salt_autosign_auth' => '/foreman_salt/api/v2/salt_autosign#auth', :via => :put
+
+        constraints(smart_proxy_id: /[\w.-]+/, name: /[\w.-]+/, record: %r{[^/]+}) do
+          match '/salt_keys/:smart_proxy_id' => '/foreman_salt/api/v2/salt_keys#index', :via => :get
+          match '/salt_keys/:smart_proxy_id/:name' => '/foreman_salt/api/v2/salt_keys#update', :via => :put
+          match '/salt_keys/:smart_proxy_id/:name' => '/foreman_salt/api/v2/salt_keys#destroy', :via => :delete
+
+          match '/salt_autosign/:smart_proxy_id' => '/foreman_salt/api/v2/salt_autosign#index', :via => :get
+          match '/salt_autosign/:smart_proxy_id' => '/foreman_salt/api/v2/salt_autosign#create', :via => :post
+          match '/salt_autosign/:smart_proxy_id/:record' => '/foreman_salt/api/v2/salt_autosign#destroy', :via => :delete
+
+          match '/salt_states/import/:smart_proxy_id' => '/foreman_salt/api/v2/salt_states#import', :via => :post
+        end
+
+        constraints(id: /[\w.-]+/) do
+          resources :salt_environments, only: %i[show index create destroy], controller: '/foreman_salt/api/v2/salt_environments'
+          resources :salt_minions, only: %i[show index update], controller: '/foreman_salt/api/v2/salt_minions'
+          resources :salt_states, only: %i[show index create destroy], controller: '/foreman_salt/api/v2/salt_states'
+          resources :hostgroups, only: %i[show update], controller: '/foreman_salt/api/v2/salt_hostgroups'
+        end
+
+        resources :salt_variables, only: %i[show index destroy update create], controller: '/foreman_salt/api/v2/salt_variables'
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -1,25 +1,25 @@
 Rails.application.routes.draw do
-  scope :salt, :path => '/salt' do
-    constraints(:id => /[\w\.-]+/) do
-      match '/node/:id' => 'foreman_salt/minions#node', :via => :get
-      match '/run/:id'  => 'foreman_salt/minions#run', :via => :get
+  scope :salt, path: '/salt' do
+    constraints(id: /[\w.-]+/) do
+      get '/node/:id' => 'foreman_salt/minions#node'
+      get '/run/:id'  => 'foreman_salt/minions#run'
     end
 
-    resources :minions, :controller => 'foreman_salt/minions', :only => [] do
+    resources :minions, controller: 'foreman_salt/minions', only: [] do
       collection do
-        constraints(:id => /[^\/]+/) do
+        constraints(id: %r{[^/]+}) do
           put 'salt_environment_selected'
         end
       end
     end
 
-    resources :salt_environments, :controller => 'foreman_salt/salt_environments' do
+    resources :salt_environments, controller: 'foreman_salt/salt_environments' do
       collection do
         get 'auto_complete_search'
       end
     end
 
-    resources :salt_modules, :controller => 'foreman_salt/salt_modules' do
+    resources :salt_modules, controller: 'foreman_salt/salt_modules' do
       collection do
         get 'import'
         get 'auto_complete_search'
@@ -27,43 +27,15 @@ Rails.application.routes.draw do
       end
     end
 
-    resources :salt_variables, :controller => 'foreman_salt/salt_variables', :except => [:show] do
-      resources :lookup_values, :only => [:index, :create, :update, :destroy]
+    resources :salt_variables, controller: 'foreman_salt/salt_variables', except: [:show] do
+      resources :lookup_values, only: %i[index create update destroy]
       collection do
         get 'auto_complete_search'
       end
     end
-
-    scope :api, :path => '/api', :defaults => { :format => 'json' } do
-      scope '(:apiv)', :defaults => { :apiv => 'v2' },
-                       :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
-        match '/jobs/upload' => 'foreman_salt/api/v2/jobs#upload', :via => :post
-        match '/salt_autosign_auth' => 'foreman_salt/api/v2/salt_autosign#auth', :via => :put
-
-        constraints(:smart_proxy_id => /[\w\.-]+/, :name => /[\w\.-]+/, :record => /[^\/]+/) do
-          match '/salt_keys/:smart_proxy_id' => 'foreman_salt/api/v2/salt_keys#index', :via => :get
-          match '/salt_keys/:smart_proxy_id/:name' => 'foreman_salt/api/v2/salt_keys#update', :via => :put
-          match '/salt_keys/:smart_proxy_id/:name' => 'foreman_salt/api/v2/salt_keys#destroy', :via => :delete
-
-          match '/salt_autosign/:smart_proxy_id' => 'foreman_salt/api/v2/salt_autosign#index', :via => :get
-          match '/salt_autosign/:smart_proxy_id' => 'foreman_salt/api/v2/salt_autosign#create', :via => :post
-          match '/salt_autosign/:smart_proxy_id/:record' => 'foreman_salt/api/v2/salt_autosign#destroy', :via => :delete
-
-          match '/salt_states/import/:smart_proxy_id' => 'foreman_salt/api/v2/salt_states#import', :via => :post
-        end
-
-        constraints(:id => /[\w\.-]+/) do
-          resources :salt_environments, :only => [:show, :index, :create, :destroy], :controller => 'foreman_salt/api/v2/salt_environments'
-          resources :salt_minions, :only => [:show, :index, :update], :controller => 'foreman_salt/api/v2/salt_minions'
-          resources :salt_states, :only => [:show, :index, :create, :destroy], :controller => 'foreman_salt/api/v2/salt_states'
-        end
-
-        resources :salt_variables, :only => [:show, :index, :destroy, :update, :create], :controller => 'foreman_salt/api/v2/salt_variables'
-      end
-    end
   end
 
-  constraints(:id => /[^\/]+/) do
+  constraints(id: %r{[^/]+}) do
     resources :hosts do
       collection do
         post 'select_multiple_salt_master'
@@ -74,11 +46,11 @@ Rails.application.routes.draw do
     end
   end
 
-  constraints(:smart_proxy_id => /[^\/]+/) do
-    resources :smart_proxies, :except => [:show] do
-      constraints(:id => /[^\/]+/) do
-        resources :salt_autosign, :only => [:index, :destroy, :create, :new], :controller => 'foreman_salt/salt_autosign'
-        resources :salt_keys, :only => [:index, :destroy], :controller => 'foreman_salt/salt_keys' do
+  constraints(smart_proxy_id: %r{[^/]+}) do
+    resources :smart_proxies, except: [:show] do
+      constraints(id: %r{[^/]+}) do
+        resources :salt_autosign, only: %i[index destroy create new], controller: 'foreman_salt/salt_autosign'
+        resources :salt_keys, only: %i[index destroy], controller: 'foreman_salt/salt_keys' do
           get :accept
           get :reject
         end

data/db/migrate/20140817210214_create_salt_modules.rb

@@ -1,16 +1,16 @@
 class CreateSaltModules < ActiveRecord::Migration[4.2]
   def self.up
     create_table :salt_modules do |t|
-      t.string :name, :default => '', :null => false
-      t.timestamps :null => true
+      t.string :name, default: '', null: false
+      t.timestamps null: true
     end
 
-    create_table 'hosts_salt_modules', :id => false do |t|
+    create_table 'hosts_salt_modules', id: false do |t|
       t.column :host_id, :integer
       t.column :salt_module_id, :integer
     end
 
-    add_index :salt_modules, :name, :unique => true
+    add_index :salt_modules, :name, unique: true
   end
 
   def self.down

data/db/migrate/20140829210214_add_salt_modules_to_hostgroups.rb

@@ -1,6 +1,6 @@
 class AddSaltModulesToHostgroups < ActiveRecord::Migration[4.2]
   def self.up
-    create_table 'hostgroups_salt_modules', :id => false do |t|
+    create_table 'hostgroups_salt_modules', id: false do |t|
       t.column :hostgroup_id, :integer
       t.column :salt_module_id, :integer
     end

data/db/migrate/20140920232200_create_salt_environments.rb

@@ -1,14 +1,14 @@
 class CreateSaltEnvironments < ActiveRecord::Migration[4.2]
   def self.up
     create_table :salt_environments do |t|
-      t.string :name, :default => '', :null => false
-      t.timestamps :null => true
+      t.string :name, default: '', null: false
+      t.timestamps null: true
     end
 
     add_column :hosts, :salt_environment_id, :integer
     add_column :hostgroups, :salt_environment_id, :integer
 
-    add_index :salt_environments, :name, :unique => true
+    add_index :salt_environments, :name, unique: true
   end
 
   def self.down

data/db/migrate/20150220122707_fix_incorrect_report_metrics.rb

@@ -7,13 +7,17 @@ class FixIncorrectReportMetrics < ActiveRecord::Migration[4.2]
 
       report.metrics['time'].each do |resource, time|
         metrics['time'][resource] = if time.is_a? String
-                                      Float(time.delete(' ms')) rescue nil
+                                      begin
+                                        Float(time.delete(' ms'))
+                                      rescue StandardError
+                                        nil
+                                      end
                                     else
                                       time
                                     end
       end
 
-      report.update_attributes(:metrics => metrics) if metrics != report.metrics
+      report.update(metrics: metrics) if metrics != report.metrics
     end
   end
 

data/db/migrate/20211108211312_add_missing_permissions.rb

@@ -0,0 +1,9 @@
+class AddMissingPermissions < ActiveRecord::Migration[6.0]
+  def up
+    Permission.create!(name: 'auth_smart_proxies_salt_autosign', resource_type: 'SmartProxy')
+  end
+
+  def down
+    Permission.where(name: 'auth_smart_proxies_salt_autosign').destroy_all
+  end
+end

data/db/migrate/20220118160349_drop_salt_hide_run_salt_button_setting.rb

@@ -0,0 +1,5 @@
+class DropSaltHideRunSaltButtonSetting < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(name: 'salt_hide_run_salt_button').delete_all
+  end
+end

data/db/migrate/20220406185204_fix_salt_setting_category_to_dsl.rb

@@ -0,0 +1,5 @@
+class FixSaltSettingCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::Salt').update_all(category: 'Setting')
+  end
+end

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

@@ -1,2 +1,2 @@
 # Create feature for Smart Proxy
-Feature.where(:name => 'Salt').first_or_create
+Feature.where(name: 'Salt').first_or_create