foreman_salt 13.1.0 → 13.2.4

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.4
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -28,28 +28,28 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
@@ -200,6 +200,10 @@ files:
 - lib/tasks/foreman_salt_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/ca/LC_MESSAGES/foreman_salt.mo
+- locale/ca/foreman_salt.po
+- locale/cs_CZ/LC_MESSAGES/foreman_salt.mo
+- locale/cs_CZ/foreman_salt.po
 - locale/de/LC_MESSAGES/foreman_salt.mo
 - locale/de/foreman_salt.edit.po
 - locale/de/foreman_salt.po
@@ -208,7 +212,35 @@ files:
 - locale/en/foreman_salt.edit.po
 - locale/en/foreman_salt.po
 - locale/en/foreman_salt.po.time_stamp
+- locale/en_GB/LC_MESSAGES/foreman_salt.mo
+- locale/en_GB/foreman_salt.po
+- locale/es/LC_MESSAGES/foreman_salt.mo
+- locale/es/foreman_salt.po
 - locale/foreman_salt.pot
+- locale/fr/LC_MESSAGES/foreman_salt.mo
+- locale/fr/foreman_salt.po
+- locale/gl/LC_MESSAGES/foreman_salt.mo
+- locale/gl/foreman_salt.po
+- locale/it/LC_MESSAGES/foreman_salt.mo
+- locale/it/foreman_salt.po
+- locale/ja/LC_MESSAGES/foreman_salt.mo
+- locale/ja/foreman_salt.po
+- locale/ko/LC_MESSAGES/foreman_salt.mo
+- locale/ko/foreman_salt.po
+- locale/nl_NL/LC_MESSAGES/foreman_salt.mo
+- locale/nl_NL/foreman_salt.po
+- locale/pl/LC_MESSAGES/foreman_salt.mo
+- locale/pl/foreman_salt.po
+- locale/pt_BR/LC_MESSAGES/foreman_salt.mo
+- locale/pt_BR/foreman_salt.po
+- locale/ru/LC_MESSAGES/foreman_salt.mo
+- locale/ru/foreman_salt.po
+- locale/sv_SE/LC_MESSAGES/foreman_salt.mo
+- locale/sv_SE/foreman_salt.po
+- locale/zh_CN/LC_MESSAGES/foreman_salt.mo
+- locale/zh_CN/foreman_salt.po
+- locale/zh_TW/LC_MESSAGES/foreman_salt.mo
+- locale/zh_TW/foreman_salt.po
 - test/factories/foreman_salt_factories.rb
 - test/functional/api/v2/salt_autosign_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb