foreman_salt 13.2.1 → 14.0.0

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

@@ -3,6 +3,8 @@ require 'test_plugin_helper'
 class ::ForemanSalt::Api::V2::SaltAutosignControllerTest < ActionController::TestCase
   setup do
     @proxy = FactoryBot.create(:smart_proxy, :with_salt_feature)
+    @host = FactoryBot.create(:host, :managed)
+    @host.salt_proxy = @proxy
     ProxyAPI::Salt.any_instance.stubs(:autosign_list).returns((%w(foo bar baz)))
   end
 

data/test/integration/salt_autosign_test.rb

@@ -19,13 +19,13 @@ module ForemanSalt
       visit smart_proxy_path(@proxy)
       assert page.has_link? "Salt Autosign"
       click_link "Salt Autosign"
-      assert page.has_content?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
+      assert page.has_title?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
     end
 
     test 'index page' do
       visit smart_proxy_salt_autosign_index_path(:smart_proxy_id => @proxy.id)
       assert find_link('Keys').visible?, 'Keys is not visible'
-      assert has_content?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
+      assert has_title?("Autosign entries for #{@proxy.hostname}"), 'Page title does not appear'
       assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 

data/test/integration/salt_keys_test.rb

@@ -22,13 +22,12 @@ module ForemanSalt
       visit smart_proxy_path(@proxy)
       assert page.has_link? "Salt Keys"
       click_link "Salt Keys"
-      assert page.has_content?("Salt Keys on #{@proxy.hostname}"), 'Page title does not appear'
+      assert page.has_title?("Salt Keys on #{@proxy}"), 'Page title does not appear'
     end
 
     test 'index page' do
       visit smart_proxy_salt_keys_path(:smart_proxy_id => @proxy.id)
-      assert find_link('Autosign').visible?, 'Autosign is not visible'
-      assert has_content?("Salt Keys on #{@proxy.hostname}"), 'Page title does not appear'
+      assert has_title?("Salt Keys on #{@proxy}"), 'Page title does not appear'
       assert has_content?('Displaying'), 'Pagination "Display ..." does not appear'
     end
 

data/test/unit/host_extensions_test.rb

@@ -56,23 +56,67 @@ module ForemanSalt
       assert host.configuration?
     end
 
-    context 'key handling' do
+    context 'autosign handling' do
       before do
-        @host = FactoryBot.create(:host, :managed, :build => true)
+        @host = FactoryBot.create(:host, :managed)
         @host.salt_proxy = @proxy
-        @key_stub = stub("key")
-        ForemanSalt::SmartProxies::SaltKeys.expects(:find).at_least_once.with(@host.salt_proxy, @host.fqdn).returns(@key_stub)
+        stub_request(:post, "#{@proxy.url}/salt/autosign_key/asdfasdfasfasdf").
+          to_return(status: 200, body: "", headers: {})
       end
 
-      test 'host key is accepted when host is built' do
-        @key_stub.expects(:accept).at_least_once.returns(true)
-        assert @host.built
-        @host.run_callbacks(:commit) # callbacks don't run with Foreman's transactional fixtures
+      test 'host autosign is created when host is built' do
+        autosign_key = "asdfasdfasfasdf"
+        @host.expects(:generate_provisioning_key).returns(autosign_key)
+        @host.build = true
+        assert @host.save!
+        @host.clear_host_parameters_cache!
+        assert_equal autosign_key, @host.salt_autosign_key
+      end
+    end
+
+    context 'function derive_salt_grains' do
+      before do
+        @host = FactoryBot.create(:host, :managed)
+        @host.salt_proxy = @proxy
+      end
+
+      test 'host returns autosign when deriving salt grains' do
+        autosign_key = "asdfasdfasfasdf"
+        expected_hash = { @host.autosign_grain_name => autosign_key }
+        @host.salt_autosign_key = autosign_key
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+      end
+
+      test 'host returns empty hash when deriving salt grains without any given' do
+        expected_hash = {}
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
+      end
+
+      test 'host returns empty hash when deriving salt grains without autosign' do
+        expected_hash = {}
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => false) }
+      end
+
+      test 'host returns host param grains when deriving salt grains' do
+        expected_hash = { "Some key": "Some value", "Another key": "An extraordinary value" }
+        @host.host_params[@host.host_params_grains_name] = expected_hash
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => false) }
+      end
+
+      test 'host returns only host param grains when deriving salt grains' do
+        expected_hash = { "Some key": "Some value", "Another key": "An extraordinary value" }
+        @host.host_params[@host.host_params_grains_name] = expected_hash
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
       end
 
-      test 'host key is deleted when host is removed' do
-        @key_stub.expects(:delete).at_least_once.returns(true)
-        assert @host.destroy
+      test 'host returns host param grains plus autosign when deriving salt grains' do
+        autosign_key = "asdfasdfasfasdf"
+        host_param_grains = { "Some key": "Some value",
+                              "Another key": "An extraordinary value" }
+        expected_hash = host_param_grains.merge(@host.autosign_grain_name => autosign_key)
+        @host.salt_autosign_key = autosign_key
+        @host.host_params[@host.host_params_grains_name] = host_param_grains
+        assert_equal expected_hash, @host.instance_eval { derive_salt_grains(:use_autosign => true) }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 13.2.1
+  version: 14.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -42,28 +42,28 @@ dependencies:
   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
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.71.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.71.0
 description: Foreman Plug-in for Salt
@@ -110,21 +110,19 @@ files:
 - app/lib/proxy_api/salt.rb
 - app/models/foreman_salt/concerns/host_managed_extensions.rb
 - app/models/foreman_salt/concerns/hostgroup_extensions.rb
-- app/models/foreman_salt/fact_name.rb
 - app/models/foreman_salt/host_salt_module.rb
 - app/models/foreman_salt/hostgroup_salt_module.rb
 - app/models/foreman_salt/salt_environment.rb
 - app/models/foreman_salt/salt_module.rb
 - app/models/foreman_salt/salt_module_environment.rb
 - app/models/foreman_salt/salt_provider.rb
+- app/models/foreman_salt/salt_status.rb
 - app/models/foreman_salt/salt_variable.rb
 - app/models/setting/salt.rb
 - app/overrides/salt_environment_host_selector.rb
 - app/overrides/salt_environment_hostgroup_selector.rb
 - app/overrides/salt_modules_selector.rb
 - app/overrides/salt_proxy_selector.rb
-- app/services/foreman_salt/fact_importer.rb
-- app/services/foreman_salt/fact_parser.rb
 - app/services/foreman_salt/report_importer.rb
 - app/services/foreman_salt/smart_proxies/salt_keys.rb
 - app/views/foreman_salt/api/v2/salt_autosign/base.json.rabl
@@ -190,6 +188,7 @@ files:
 - db/migrate/20150509101505_add_primary_keys.rb
 - db/migrate/20161103104146_add_index_to_join_tables.rb
 - db/migrate/20190515112233_add_salt_module_id_to_lookup_keys.rb
+- db/migrate/20210312150333_add_salt_autosign_to_host.rb
 - db/seeds.d/75-salt_seeds.rb
 - db/seeds.d/76-job_templates.rb
 - lib/foreman_salt.rb
@@ -200,6 +199,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 +211,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
@@ -226,15 +257,12 @@ files:
 - test/integration/salt_module_test.rb
 - test/integration/salt_variable_test.rb
 - test/test_plugin_helper.rb
-- test/unit/grains_centos.json
 - test/unit/grains_importer_test.rb
 - test/unit/highstate.json
 - test/unit/highstate_pchanges.json
 - test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/report_importer_test.rb
-- test/unit/salt_fact_importer_test.rb
-- test/unit/salt_fact_parser_test.rb
 - test/unit/salt_keys_test.rb
 - test/unit/salt_modules_test.rb
 - test/unit/salt_variables_test.rb
@@ -274,10 +302,7 @@ test_files:
 - test/unit/highstate_pchanges.json
 - test/unit/hostgroup_extensions_test.rb
 - test/unit/highstate.json
-- test/unit/salt_fact_parser_test.rb
 - test/unit/salt_modules_test.rb
-- test/unit/grains_centos.json
-- test/unit/salt_fact_importer_test.rb
 - test/unit/report_importer_test.rb
 - test/unit/salt_variables_test.rb
 - test/unit/salt_keys_test.rb

data/app/models/foreman_salt/fact_name.rb

@@ -1,14 +0,0 @@
-module ForemanSalt
-  # Define the class that fact names that come from Salt should have
-  # It allows us to filter facts by origin, and also to display the origin
-  # in the fact values table (/fact_values)
-  class FactName < ::FactName
-    def origin
-      'Salt'
-    end
-
-    def icon_path
-      'foreman_salt/Salt'
-    end
-  end
-end

data/app/services/foreman_salt/fact_importer.rb

@@ -1,15 +0,0 @@
-module ForemanSalt
-  class FactImporter < ::StructuredFactImporter
-    def fact_name_class
-      ForemanSalt::FactName
-    end
-
-    def self.support_background
-      true
-    end
-
-    def self.authorized_smart_proxy_features
-      'Salt'
-    end
-  end
-end

data/app/services/foreman_salt/fact_parser.rb

@@ -1,114 +0,0 @@
-module ForemanSalt
-  class FactParser < ::FactParser
-    attr_reader :facts
-
-    def operatingsystem
-      os = Operatingsystem.where(os_hash).first_or_initialize
-      if os.new_record?
-        os.deduce_family
-        os.release_name = facts[:lsb_distrib_codename]
-        os.save
-      end
-      os if os.persisted?
-    end
-
-    def architecture
-      name = facts[:osarch]
-      name = 'x86_64' if name == 'amd64'
-      Architecture.where(:name => name).first_or_create unless name.blank?
-    end
-
-    def environment
-      # Don't touch the Puppet environment field
-    end
-
-    def model
-      name = facts[:productname]
-      Model.where(:name => name.strip).first_or_create unless name.blank?
-    end
-
-    def domain
-      name = facts[:domain]
-      Domain.where(:name => name).first_or_create unless name.blank?
-    end
-
-    def ip
-      ip = facts.find { |fact, value| fact =~ /^fqdn_ip4/ && value && value != '127.0.0.1' }
-      ip[1] if ip
-    end
-
-    def primary_interface
-      interface = interfaces.find { |_, value| value[:ipaddress] == ip }
-      interface[0] if interface
-    end
-
-    def mac
-      interface = interfaces.find { |_, value| value[:ipaddress] == ip }
-      interface[1][:macaddress] if interface
-    end
-
-    def ipmi_interface
-      nil
-    end
-
-    def interfaces
-      interfaces = {}
-
-      facts.each do |fact, value|
-        next unless value && fact.to_s =~ /^ip_interfaces/
-
-        (_, interface_name) = fact.split(FactName::SEPARATOR)
-
-        next if (IPAddr.new('fe80::/10').include?(value) rescue false)
-
-        if !interface_name.blank? && interface_name != 'lo'
-          interface = interfaces.fetch(interface_name, {})
-          interface[:macaddress] = macs[interface_name]
-          if Net::Validations.validate_ip6(value)
-            interface[:ipaddress6] = value unless interface.include?(:ipaddress6)
-          else
-            interface[:ipaddress] = value unless interface.include?(:ipaddress)
-          end
-          interfaces[interface_name] = interface
-        end
-      end
-
-      interfaces.each do |name, interface|
-        set_additional_attributes(interface, name)
-      end
-
-      interfaces
-    end
-
-    def support_interfaces_parsing?
-      true
-    end
-
-    private
-
-    def os_hash
-      name = facts[:os]
-      (_, major, minor, sub) = /(\d+)\.?(\d+)?\.?(\d+)?/.match(facts[:osrelease]).to_a
-      if name == 'CentOS'
-        if sub
-          minor += '.' + sub
-        end
-      end
-      { :name => name, :major => major, :minor => minor }
-    end
-
-    def macs
-      unless @macs
-        @macs = {}
-        facts.each do |fact, value|
-          next unless value && fact.to_s =~ /^hwaddr_interfaces/
-
-          data = fact.split(FactName::SEPARATOR)
-          interface = data[1]
-          macs[interface] = value
-        end
-      end
-      @macs
-    end
-  end
-end

data/test/unit/grains_centos.json

@@ -1,113 +0,0 @@
-{
-  "facts": {
-    "kernelrelease": "2.6.32-431.23.3.el6.x86_64",
-    "ipv6::0": "::1",
-    "ipv6::1": "fe80::5054:ff:fe35:302a",
-    "saltversioninfo": [
-      2014,
-      1,
-      7
-    ],
-    "operatingsystem": "CentOS",
-    "lsb_distrib_id": "CentOS",
-    "pythonversion::2": 6,
-    "pythonversion::3": "final",
-    "pythonversion::0": 2,
-    "pythonversion::1": 6,
-    "cpu_model": "QEMU Virtual CPU version (cpu64-rhel6)",
-    "pythonversion::4": 0,
-    "oscodename": "Final",
-    "num_gpus": 1,
-    "productname": "KVM",
-    "osarch": "x86_64",
-    "biosversion": "0.5.1",
-    "kernel": "Linux",
-    "domain": "example.com",
-    "pythonpath::4": "/usr/lib64/python2.6/lib-tk",
-    "pythonpath::5": "/usr/lib64/python2.6/lib-old",
-    "pythonpath::6": "/usr/lib64/python2.6/lib-dynload",
-    "pythonpath::7": "/usr/lib64/python2.6/site-packages",
-    "pythonpath::0": "/usr/bin",
-    "mem_total": 742,
-    "pythonpath::2": "/usr/lib64/python2.6",
-    "pythonpath::3": "/usr/lib64/python2.6/plat-linux2",
-    "pythonpath::8": "/usr/lib/python2.6/site-packages",
-    "cpu_flags::25": "pni",
-    "cpu_flags::24": "unfair_spinlock",
-    "cpu_flags::27": "hypervisor",
-    "cpu_flags::26": "cx16",
-    "cpu_flags::21": "nx",
-    "cpu_flags::20": "syscall",
-    "cpu_flags::23": "up",
-    "cpu_flags::22": "lm",
-    "cpu_flags::28": "lahf_lm",
-    "defaultlanguage": "en_US",
-    "osfullname": "CentOS",
-    "localhost": "saltclient01.example.com",
-    "lsb_distrib_release": "6.5",
-    "saltpath": "/usr/lib/python2.6/site-packages/salt",
-    "biosreleasedate": "01/01/2007",
-    "host": "saltclient01",
-    "defaultencoding": "UTF8",
-    "path": "/sbin:/usr/sbin:/bin:/usr/bin",
-    "ip_interfaces::eth0::0": "10.7.13.141",
-    "ip_interfaces::eth0::1": "10.7.23.141",
-    "manufacturer": "Red Hat",
-    "fqdn": "saltclient01.example.com",
-    "os": "CentOS",
-    "osfinger": "CentOS-6",
-    "ps": "ps -efH",
-    "server_id": 654860635,
-    "zmqversion": "3.2.4",
-    "osmajorrelease::1": "5",
-    "osmajorrelease::0": "6",
-    "ip_interfaces::lo::0": "127.0.0.1",
-    "master": "saltstack.example.com",
-    "shell": "/bin/sh",
-    "saltversion": "2014.1.7",
-    "hwaddr_interfaces::lo": "00:00:00:00:00:00",
-    "_timestamp": "2014-08-28 10:02:16 ",
-    "cpu_flags::18": "sse",
-    "cpu_flags::19": "sse2",
-    "cpu_flags::14": "pse36",
-    "cpu_flags::15": "clflush",
-    "cpu_flags::16": "mmx",
-    "cpu_flags::17": "fxsr",
-    "cpu_flags::10": "mtrr",
-    "cpu_flags::11": "pge",
-    "cpu_flags::12": "mca",
-    "cpu_flags::13": "cmov",
-    "cpuarch": "x86_64",
-    "pythonpath::1": "/usr/lib64/python26.zip",
-    "cpu_flags::6": "mce",
-    "cpu_flags::7": "cx8",
-    "cpu_flags::4": "msr",
-    "cpu_flags::5": "pae",
-    "cpu_flags::2": "pse",
-    "cpu_flags::3": "tsc",
-    "cpu_flags::0": "fpu",
-    "cpu_flags::1": "de",
-    "serialnumber": "Not Specified",
-    "hwaddr_interfaces::eth0": "52:54:00:35:30:2a",
-    "cpu_flags::8": "apic",
-    "cpu_flags::9": "sep",
-    "gpus::0::model": "GD 5446",
-    "id": "saltclient01.example.com",
-    "osrelease": "6.5",
-    "num_cpus": 1,
-    "virtual": "kvm",
-    "ipv4::0": "10.7.23.141",
-    "ipv4::1": "10.7.13.141",
-    "ipv4::2": "127.0.0.1",
-    "_type": "foreman_salt",
-    "nodename": "saltclient01.example.com",
-    "os_family": "RedHat",
-    "operatingsystemrelease": "6.5",
-    "gpus::0::vendor": "unknown",
-    "lsb_distrib_codename": "Final",
-    "fqdn_ip4::0": "10.7.13.141",
-    "ip_interfaces::eth1::0": "1.2.3.4",
-    "hwaddr_interfaces::eth1": "DE:AD:BE:EF:07:13"
-  },
-  "name": "saltclient01.example.com"
-}