foreman_salt 13.1.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce5a18cef1f569ee315e5260928b43cc24a059b895f6cf2c4bbc6c98592cac8
-  data.tar.gz: 864b8551057471a940a44b5d0447502040558fc0b697339a7ca28a09f1256203
+  metadata.gz: 01e9df6381c6f711af6e6a24f692bbb6241d073f67e9914087982e4ea5f97301
+  data.tar.gz: 9c041d7bacf1da063ed09dfc087267541ef678b5eeda256fcf69fe258e37e3f7
 SHA512:
-  metadata.gz: d4ed7429fd288b8d07677e7bc28091262c5acc2f751fc511fa0a4b223bb8e9b257177a91098b94ef0e68dd660e704fbbe70ec37e0135d04a8e8a2ff6d9507445
-  data.tar.gz: 82aa1176e433e8223e8ceb8003bfc22eb2d207ada21cdfd0e98a106e78ec7338f484db96fa315a303757a910b91d65247f7edbb66719090570c69397b8a2d9b6
+  metadata.gz: 859ca388dcebfc6614017feacbf20ebf52c4b1e3dbc8191d5378af6ec1dc97a40a52eba6897bdb858860bdc7315724eecdbb4478980c396cd5775122721a45b0
+  data.tar.gz: b3ad5e94db738522e58df0fdec82fea191f6b4518a33c818af79a2c60df2784b37f0c37dfff5224de57fe686ada2fce0ad6ffe088fed376414a4b920d473b4e9

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

@@ -7,6 +7,9 @@ module ForemanSalt
         include ::Foreman::Controller::SmartProxyAuth
         add_smart_proxy_filters :upload, :features => 'Salt'
 
+        include ::Foreman::Controller::FilterParameters
+        filter_parameters :job
+
         def_param_group :job do
           param :job, Hash, :required => true, :action_aware => true do
             param :job_id, Integer, :required => true, :desc => N_('JID')

data/app/controllers/foreman_salt/minions_controller.rb

@@ -12,6 +12,7 @@ module ForemanSalt
       enc['classes'] = @minion.salt_modules_for_enc
 
       pillars = @minion.info['parameters']
+      pillars['saltenv'] = env
       pillars.merge!(@minion.salt_params)
 
       enc['parameters'] = Setting[:salt_namespace_pillars] ? { 'foreman' => pillars } : pillars

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

@@ -1,13 +1,2 @@
 # Create feature for Smart Proxy
 Feature.where(:name => 'Salt').first_or_create
-
-# Add new viewing permissions to Viewer role
-viewer = Role.find_by_name('Viewer')
-
-if viewer
-  Permission.where(:name => [:view_smart_proxies_salt_keys, :view_smart_proxies_salt_autosign, :view_salt_modules]).each do |permission|
-    viewer.ignore_locking do
-      viewer.add_permissions!([permission.name]) unless viewer.permissions.include? permission
-    end
-  end
-end

data/db/seeds.d/76-job_templates.rb

@@ -22,8 +22,8 @@ if ForemanSalt.with_remote_execution?
                                              :default => true,
                                              :locked => true,
                                              :update => sync)
-          template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
-          template.locations = locations if SETTINGS[:locations_enabled] && template.present?
+          template.organizations = organizations if template.present?
+          template.locations = locations if template.present?
         end
       end
     end

data/lib/foreman_salt/plugin.rb

@@ -165,6 +165,11 @@ Foreman::Plugin.register :foreman_salt do
                       :create_salt_variables, :view_salt_variables,
                       :edit_salt_variables, :destroy_salt_variables]
 
+  role 'Salt viewer', [:view_smart_proxies_salt_keys,
+                       :view_smart_proxies_salt_autosign,
+                       :view_salt_variables,
+                       :view_salt_environments,
+                       :view_salt_modules]
 
   # Parameter filters
   parameter_filter Hostgroup,

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '13.1.0'
+  VERSION = '13.2.0'
 end

data/test/functional/minions_controller_test.rb

@@ -11,7 +11,9 @@ module ForemanSalt
       @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
       Resolv.any_instance.stubs(:getnames).returns([@proxy.to_s])
 
+      @hostgroup = FactoryBot.create(:hostgroup)
       @host = FactoryBot.create(:host, salt_environment: FactoryBot.create(:salt_environment), salt_proxy: @proxy)
+      @host2 = FactoryBot.create(:host, :hostgroup => @hostgroup, salt_environment: FactoryBot.create(:salt_environment), salt_proxy: @proxy)
       FactoryBot.create(:host_parameter, name: "parameter1", value: "different", host: @host)
     end
 
@@ -34,39 +36,39 @@ module ForemanSalt
     end
 
     test 'salt variable is available' do
-      @var = FactoryBot.create(:salt_variable, override: true)
-      @var.salt_module.salt_environments << @host.salt_environment
-      @host.salt_modules << @var.salt_module
+      var = FactoryBot.create(:salt_variable, override: true)
+      var.salt_module.salt_environments << @host.salt_environment
+      @host.salt_modules << var.salt_module
 
       get :node, params: { :id => @host, :format => 'yml' }
       assert_response :success
 
       res = YAML.safe_load(@response.body)
-      assert_equal res['parameters'][@var.key], @var.value
+      assert_equal res['parameters'][var.key], var.value
     end
 
     test 'salt variable overrides host parameter' do
-      @var = FactoryBot.create(:salt_variable, key: 'parameter1', override: true)
-      @var.salt_module.salt_environments << @host.salt_environment
-      @host.salt_modules << @var.salt_module
+      var = FactoryBot.create(:salt_variable, key: 'parameter1', override: true)
+      var.salt_module.salt_environments << @host.salt_environment
+      @host.salt_modules << var.salt_module
 
       get :node, params: { :id => @host, :format => 'yml' }
       assert_response :success
 
       res = YAML.safe_load(@response.body)
-      assert_equal res['parameters']['parameter1'], @var.value
+      assert_equal res['parameters']['parameter1'], var.value
     end
 
-    test 'salt variable matching host' do
-      @var = FactoryBot.create(:salt_variable, key: 'parameter1', override: true)
+    test 'salt variable matching host with host specific value' do
+      var = FactoryBot.create(:salt_variable, key: 'parameter1', value: "default", override: true)
       # rubocop:disable Lint/UselessAssignment
-      value1 = LookupValue.create(:lookup_key => @var, :match => "os=debian", :value => "aaa")
-      value2 = LookupValue.create(:lookup_key => @var, :match => "fqdn=#{@host.fqdn}", :value => "myval")
-      value3 = LookupValue.create(:lookup_key => @var, :match => "hostgroup=Unusual", :value => "bbbb")
+      value1 = LookupValue.create(:lookup_key => var, :match => "os=debian", :value => "aaa")
+      value2 = LookupValue.create(:lookup_key => var, :match => "fqdn=#{@host.fqdn}", :value => "myval")
+      value3 = LookupValue.create(:lookup_key => var, :match => "hostgroup=Unusual", :value => "bbbb")
       # rubocop:enable Lint/UselessAssignment
 
-      @var.salt_module.salt_environments << @host.salt_environment
-      @host.salt_modules << @var.salt_module
+      var.salt_module.salt_environments << @host.salt_environment
+      @host.salt_modules << var.salt_module
 
       get :node, params: { :id => @host, :format => 'yml' }
       assert_response :success
@@ -74,5 +76,39 @@ module ForemanSalt
       res = YAML.safe_load(@response.body)
       assert_equal res['parameters']['parameter1'], value2.value
     end
+
+    test 'salt variable matching host with hostgroup specific value' do
+      var = FactoryBot.create(:salt_variable, key: 'parameter1', value: "default", override: true)
+      # rubocop:disable Lint/UselessAssignment
+      value1 = LookupValue.create(:lookup_key => var, :match => "os=debian", :value => "aaa")
+      value2 = LookupValue.create(:lookup_key => var, :match => @hostgroup.lookup_value_matcher, :value => "bbbb")
+      # rubocop:enable Lint/UselessAssignment
+
+      var.salt_module.salt_environments << @host2.salt_environment
+      @host2.salt_modules << var.salt_module
+
+      get :node, params: { :id => @host2, :format => 'yml' }
+      assert_response :success
+
+      res = YAML.safe_load(@response.body)
+      assert_equal res['parameters']['parameter1'], value2.value
+    end
+
+    test 'salt variable matching host with default value' do
+      var = FactoryBot.create(:salt_variable, key: 'parameter1', value: "default", override: true)
+      # rubocop:disable Lint/UselessAssignment
+      value1 = LookupValue.create(:lookup_key => var, :match => "os=debian", :value => "aaa")
+      value2 = LookupValue.create(:lookup_key => var, :match => "fqdn=#{@host.fqdn}", :value => "myval")
+      value3 = LookupValue.create(:lookup_key => var, :match => "hostgroup=Unusual", :value => "bbbb")
+      # rubocop:enable Lint/UselessAssignment
+
+      var.salt_module.salt_environments << @host2.salt_environment
+      @host2.salt_modules << var.salt_module
+      get :node, params: { :id => @host2, :format => 'yml' }
+      assert_response :success
+
+      res = YAML.safe_load(@response.body)
+      assert_equal res['parameters']['parameter1'], var.value
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.2.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface