foreman_salt 2.1.0 → 3.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDYxMGMzYTMxM2FjODk0NGY5YzU2YWFlYjZlZGIxOGM4OGMwYzQ1MQ==
-  data.tar.gz: !binary |-
-    ZWYxNGRiOWY2MmYxMjExNTJiYWM4N2ZlOTE3ZjBiZGJiNWIzOGExZg==
+SHA1:
+  metadata.gz: a9a26aba67e387ba355bf4b358969f155e0e7550
+  data.tar.gz: c77ad3cab0e6f604f8e60964894d3345b01384ed
 SHA512:
-  metadata.gz: !binary |-
-    YmU3NjEwNzA3NWMwOWQ0MDBhYTljOWMxOWZjNzliMTJlODc4NzRlOWVlN2Q5
-    ZWY4MGNiNjlmNWNlNGMxNWVmYjU0YmQ1YjkyODhjYTY2YzM2ODIxYjNkYjc2
-    MGQwNzI0NTFjNGUzZDQxOWU2YWQzZWQ1ZDgwZjJkNmYxN2MyMWQ=
-  data.tar.gz: !binary |-
-    NDA2MDM3Y2ZiMzE5NzUwOWMwY2QyYmE4YzFmY2YzNDIyYmE2NzM4YjM0ODc3
-    NGE0MDdjMGJjYzA2MWIzOTg3NzRhNGUyMTdlZWVmN2M1ODAyYTAyZDY5YjM3
-    NGI2NGI2MjZmYzA5NGU2ZTQ4NTA4YzgxYmJlMjI5Y2I2ODBlMTM=
+  metadata.gz: 9db5120fde1dff0fffad5b1cf5dbec81cf780669887447f379ba6109d2fd886f45b120a79d219b7b2f327cdd9d35d424e4cb09e1ba427b4441e8ed5124809e03
+  data.tar.gz: b36d148373832511ea50bbf3379f0f096f9a2fdcad94b62422cf7cb06526ddecafba58aeb83e1faa4c7c9c362b7a089b0514b5ec9454656401d9bc4a399ee41c

data/README.md

@@ -4,7 +4,7 @@ This plug-in adds support for Salt to Foreman.
 
 ## Documentation
 
-Available in the Wiki https://github.com/theforeman/foreman_salt/wiki
+See the [Foreman Salt manuals](http://theforeman.org/plugins/foreman_salt/) on the Foreman web site.
 
 ## Contributing
 

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

@@ -5,6 +5,7 @@ module ForemanSalt
         before_filter :find_resource, :except => [:index, :create]
 
         api :GET, '/salt_environments', N_('List all Salt environments')
+        param_group :search_and_pagination, ::Api::V2::BaseController
         def index
           @salt_environments = resource_scope_for_index
         end

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

@@ -5,6 +5,7 @@ module ForemanSalt
         before_filter :find_resource, :except => [:index]
 
         api :GET, '/salt_minions', N_('List all Salt Minions')
+        param_group :search_and_pagination, ::Api::V2::BaseController
         def index
           @salt_minions = resource_scope_for_index
         end

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

@@ -10,6 +10,7 @@ module ForemanSalt
 
         api :GET, '/salt_states', N_('List all Salt states')
         param :salt_environment_id, :identifier_dottable, :required => false, :desc => N_('Limit to a specific environment')
+        param_group :search_and_pagination, ::Api::V2::BaseController
         def index
           if @salt_environment
             @salt_states = resource_scope_for_index.joins(:salt_environments).where('salt_module_environments.salt_environment_id' => @salt_environment)
@@ -46,18 +47,19 @@ module ForemanSalt
 
         api :POST, '/salt_states/import/:smart_proxy_id', N_('Import states from a salt master')
         param :smart_proxy_id, :identifier_dottable, :required => true, :desc => N_('Salt Smart Proxy ID')
-        param :salt_environment_ids, Array, :required => false, :desc => N_('Limit to a specific environments')
+        param :salt_environments, Array, :required => false, :desc => N_('Limit to a specific environments')
         param :actions, Array, :required => false, :desc => N_('Limit to specific actions: i.e. add, remove')
         param :dryrun, :bool, :required => false, :desc => N_('Dryrun only')
         def import
-          states = fetch_states_from_proxy(@proxy, params[:salt_environment_ids])
+          states = fetch_states_from_proxy(@proxy, params[:salt_environments])
+
           unless params[:dryrun]
             states[:changes].each do |environment, state|
-              if state[:add].any? && (params[:actions].blank? || params[:actions].include?('add'))
+              if state[:add].present? && (params[:actions].blank? || params[:actions].include?('add'))
                 add_to_environment(state[:add], environment)
               end
 
-              if state[:remove].any? && (params[:actions].blank? || params[:actions].include?('remove'))
+              if state[:remove].present? && (params[:actions].blank? || params[:actions].include?('remove'))
                 remove_from_environment(state[:remove], environment)
               end
             end

data/app/controllers/foreman_salt/salt_modules_controller.rb

@@ -74,7 +74,6 @@ module ForemanSalt
       else
         params[:changed].each do |environment, states|
           next unless states[:add] || states[:remove]
-          environment = SaltEnvironment.find_or_create_by_name(environment)
 
           add_to_environment(JSON.load(states[:add]), environment) if states[:add]
           remove_from_environment(JSON.load(states[:remove]), environment) if states[:remove]

data/app/controllers/foreman_salt/state_importer.rb

@@ -46,13 +46,17 @@ module ForemanSalt
     end
 
     def add_to_environment(states, environment)
+      environment = SaltEnvironment.find_or_create_by_name(environment)
+
       states.each do |state_name|
         state = SaltModule.find_or_create_by_name(state_name)
-        state.salt_environments << SaltEnvironment.find(environment)
+        state.salt_environments << environment unless state.salt_environments.include? environment
       end
     end
 
     def remove_from_environment(states, environment)
+      return unless (environment = SaltEnvironment.find(environment))
+
       states.each do |state_name|
         state = SaltModule.find(state_name)
         state.salt_environments.delete(environment) if state

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

@@ -3,8 +3,9 @@ module ForemanSalt
     extend ActiveSupport::Concern
 
     included do
-      alias_method_chain :host_title_actions, :salt_run
+      alias_method_chain :host_title_actions, :salt
       alias_method_chain :show_appropriate_host_buttons, :salt
+      alias_method_chain :overview_fields, :salt
     end
 
     def show_appropriate_host_buttons_with_salt(host)
@@ -13,7 +14,7 @@ module ForemanSalt
                                  :title => _('Salt external nodes YAML dump'), :class => 'btn btn-default') unless host.salt_master.blank?)]).flatten.compact
     end
 
-    def host_title_actions_with_salt_run(host)
+    def host_title_actions_with_salt(host)
       title_actions(
         button_group(
           if host.try(:salt_proxy)
@@ -22,7 +23,16 @@ module ForemanSalt
           end
         )
       )
-      host_title_actions_without_salt_run(host)
+      host_title_actions_without_salt(host)
+    end
+
+    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
     end
   end
 end

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

@@ -16,6 +16,7 @@ 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
 
         validate :salt_modules_in_host_environment
       end

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

@@ -12,6 +12,7 @@ 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
       end
 
       def all_salt_modules

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

@@ -1,3 +1,7 @@
 object @salt_environment
 
-extends "foreman_salt/api/v2/salt_environments/base"
+extends 'foreman_salt/api/v2/salt_environments/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/base.json.rabl

@@ -1,3 +1,3 @@
 object @salt_state
 
-attributes :id, :name
+attributes :id, :name, :salt_environment

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

@@ -1,3 +1,12 @@
 object @salt_state
 
-extends "foreman_salt/api/v2/salt_states/base"
+extends 'foreman_salt/api/v2/salt_states/base'
+
+child :hostgroups do
+  extends 'api/v2/hostgroups/base'
+end
+
+child :salt_environments do
+  extends 'foreman_salt/api/v2/salt_environments/base'
+end
+

data/lib/foreman_salt/engine.rb

@@ -37,7 +37,7 @@ module ForemanSalt
 
     initializer 'foreman_salt.register_plugin', :after => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_salt do
-        requires_foreman '>= 1.8'
+        requires_foreman '>= 1.9'
 
         apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
 
@@ -167,7 +167,7 @@ module ForemanSalt
     config.to_prepare do
       begin
         ::FactImporter.register_fact_importer(:foreman_salt, ForemanSalt::FactImporter)
-        ::FactParser.register_fact_importer(:foreman_salt, ForemanSalt::FactParser)
+        ::FactParser.register_fact_parser(:foreman_salt, ForemanSalt::FactParser)
 
         # Helper Extensions
         ::HostsHelper.send :include, ForemanSalt::HostsHelperExtensions

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

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

@@ -29,5 +29,58 @@ module ForemanSalt
       end
       assert_response :success
     end
+
+    context 'importing' do
+      setup do
+        @proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
+        @states = {'env1' => %w(state1 state2 state3),
+                   'env2' => %w(state1 state2)}
+
+        ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(@states)
+      end
+
+      test 'should import' do
+        post :import, :smart_proxy_id => @proxy.id
+
+        assert_response :success
+
+        @states.each do |env, states|
+          environment = ::ForemanSalt::SaltEnvironment.find(env)
+          assert_blank environment.salt_modules.map(&:name) - states
+        end
+      end
+
+      test 'should import only from a given environment' do
+        post :import, :smart_proxy_id => @proxy.id, :salt_environments => ['env2']
+        assert_response :success
+        refute ::ForemanSalt::SaltEnvironment.where(:name => 'env1').first
+        assert ::ForemanSalt::SaltEnvironment.where(:name => 'env2').first
+      end
+
+      test 'should limit actions to add' do
+        env   = FactoryGirl.create :salt_environment
+        state = FactoryGirl.create :salt_module, :salt_environments => [env]
+
+        post :import, :smart_proxy_id => @proxy.id, :actions => ['add']
+        assert_response :success
+        assert ::ForemanSalt::SaltModule.where(:id => state).first
+        assert ::ForemanSalt::SaltModule.where(:name => 'state1').first
+      end
+
+      test 'should limit actions to remove' do
+        state = FactoryGirl.create :salt_module
+        post :import, :smart_proxy_id => @proxy.id, :actions => ['remove']
+        assert_response :success
+        refute ::ForemanSalt::SaltModule.where(:id => state).first
+        refute ::ForemanSalt::SaltModule.where(:name => 'state1').first
+       end
+
+      test 'dryrun should do nothing' do
+        post :import, :smart_proxy_id => @proxy.id, :dryrun => true
+        assert_response :success
+        refute ::ForemanSalt::SaltModule.all.any?
+        refute ::ForemanSalt::SaltEnvironment.all.any?
+      end
+    end
   end
 end

data/test/integration/salt_module_test.rb

@@ -2,8 +2,17 @@ require 'test_plugin_helper'
 
 module ForemanSalt
   class SaltModuleTest < ActionDispatch::IntegrationTest
+    setup do
+      User.current = User.anonymous_admin
+
+      states = %w(state1 state2 state3 state4)
+      state_list = {'env1' => states, 'env2' => states}
+
+      ::ProxyAPI::Salt.any_instance.stubs(:states_list).returns(state_list)
+    end
+
     test 'index page' do
-      FactoryGirl.create_list :salt_module, 50
+      FactoryGirl.create_list :salt_module, 5
       assert_index_page(salt_modules_path, 'Salt State', 'New Salt State')
     end
 
@@ -22,5 +31,25 @@ module ForemanSalt
       assert_submit_button(salt_modules_path)
       assert page.has_link? 'some_other_name'
     end
+
+    test 'import states' do
+      proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
+      state = FactoryGirl.create :salt_module, :salt_environments => [FactoryGirl.create(:salt_environment)]
+
+      visit salt_modules_path
+      click_link "Import from #{proxy.name}"
+
+      assert page.has_selector?('td', :text => 'env1'), 'Could not find env1 on importer page'
+      assert page.has_selector?('td', :text => 'Add'), 'Could not find env1 on importer page'
+      assert page.has_selector?('td', :text => 'state1, state2, state3, and state4'), 'Could not find states on importer page'
+
+      assert page.has_selector?('td', :text => 'Remove'), 'Could not find remove on importer page'
+      assert page.has_selector?('td', :text => state.name), 'Could not find state to remove'
+
+      all('input.state_check').each { |checkbox| check(checkbox[:id]) }
+
+      click_button 'Update'
+      assert page.has_link? 'state1'
+    end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: 0.7.1
 description: Foreman Plug-in for Salt
 email:
 - stephen@redhat.com
@@ -170,37 +170,37 @@ 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
+- 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/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/salt_keys_test.rb
 - test/functional/minions_controller_test.rb
-- test/functional/api/v2/salt_states_controller_test.rb
 - test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
 - test/factories/foreman_salt_factories.rb
-- test/unit/salt_keys_test.rb
-- test/unit/host_extensions_test.rb
-- test/unit/grains_centos.json
-- test/unit/grains_importer_test.rb
-- test/unit/hostgroup_extensions_test.rb
-- test/unit/report_importer_test.rb
-- test/unit/salt_modules_test.rb
-- test/unit/highstate.json
-- test/test_plugin_helper.rb
-- test/integration/salt_keys_test.rb
-- test/integration/salt_environment_test.rb
-- test/integration/salt_autosign_test.rb
-- test/integration/salt_module_test.rb