foreman_salt 10.0.0 → 10.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a5c38ada1b7092ea56ff7da05ebdfd13bff174ddd00b04d61813ea3f18b367
-  data.tar.gz: c559363f1e3a18b955b3707dc410cb094e6b4e4556ca99c4ae059c7cad09adb1
+  metadata.gz: a0d07824ea3e38fef2e9e0e6d29013dddc9e09d201144c0f2513e6afe482f8bb
+  data.tar.gz: a6bb3c8d79328b30ed8c0191274e71034c3f78140bd278d89679872e60373407
 SHA512:
-  metadata.gz: 240c3e9a0d46d6cf4ddebe976129af37917a108d55be3aeb434262a9cddd824b06e0266f41cc528703acef7e0f6c4ea7db013fa9c5262de6004ed1820c0927f3
-  data.tar.gz: 9eeb42cebc16d142a157c12e11da6121974516cd022e0efcdef841dc94d30b740f532ab730e491c0bb7e7eb6fb1b3dc366ecffcad749732c574d0d1d896c82d9
+  metadata.gz: 4f134063a3d744cdc69944c72de6cfb480758cd335b17448a207a818219f3426370500493fed8c449649631c7d54416d915c012730f021b0db5e271edfea81fc
+  data.tar.gz: a576753c9fe866c74c360214f3b8ef235144c596cde0df4bc6702d5cae2da2b3f8fd3307e524527a107c470a8ad2549a13efe92a2f0ce160615dc693c89544d0

data/README.md

@@ -7,6 +7,13 @@
 
 This plug-in adds support for Salt to Foreman.
 
+# Compatibility
+
+| Foreman Version | Plugin Version |
+| --------------- | --------------:|
+| <= 1.16         | 10.0.0         |
+| >= 1.17         | 10.1.0         |
+
 ## Documentation
 
 See the [Foreman Salt manuals](http://theforeman.org/plugins/foreman_salt/) on the Foreman web site.

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

@@ -19,6 +19,7 @@ module ForemanSalt
         param_group :job, :as => :upload
 
         def upload
+          params[:job].permit!
           Rails.logger.info("Processing job #{params[:job][:job_id]} from Salt.")
           case params[:job][:function]
           when 'state.highstate'

data/app/services/foreman_salt/fact_importer.rb

@@ -1,5 +1,5 @@
 module ForemanSalt
-  class FactImporter < ::FactImporter
+  class FactImporter < ::StructuredFactImporter
     def fact_name_class
       ForemanSalt::FactName
     end
@@ -11,101 +11,5 @@ module ForemanSalt
     def self.authorized_smart_proxy_features
       'Salt'
     end
-
-    private
-
-    attr_accessor :original_facts
-
-    def add_new_facts
-      @counters[:added] = 0
-      add_missing_facts(unsparse(original_facts))
-      logger.debug("Merging facts for '#{host}': added #{@counters[:added]} facts")
-    end
-
-    def add_missing_facts(tree_hash, parent = nil, prefix = '')
-      tree_hash.each do |name, value|
-        name_with_prefix = prefix.empty? ? name : prefix + FactName::SEPARATOR + name
-
-        compose = value.is_a?(Hash)
-        if fact_names.is_a?(Hash) && fact_names[name_with_prefix].present?
-          fact_name_id = fact_names[name_with_prefix]
-        else
-          fact_name_id = fact_name_class.create!(:name      => name_with_prefix,
-                                                 :parent_id => parent,
-                                                 :compose   => compose).id
-        end
-
-        if compose
-          add_fact(name_with_prefix, nil, fact_name_id)
-          add_missing_facts(value, fact_name_id, name_with_prefix)
-        else
-          add_fact(name_with_prefix, value, fact_name_id)
-        end
-      end
-    end
-
-    def add_fact(name, value, fact_name_id)
-      if facts_to_create.include?(name)
-        host.fact_values.send(method,
-                              :value => value, :fact_name_id => fact_name_id)
-        @counters[:added] += 1
-      end
-    end
-
-    def facts_to_create
-      @facts_to_create ||= facts.keys - db_facts.pluck('fact_names.name')
-    end
-
-    def fact_names
-      @fact_names ||= fact_name_class.group(:name).maximum(:id)
-    end
-
-    # if the host does not exists yet, we don't have an host_id to use the fact_values table.
-    def method
-      @method ||= host.new_record? ? :build : :create!
-    end
-
-    def normalize(facts)
-      @original_facts = super(facts)
-      @facts = completify(@original_facts)
-    end
-
-    def completify(hash)
-      new_facts = hash.dup
-      hash.each do |fact_name, value|
-        name_parts = fact_name.split(FactName::SEPARATOR)
-
-        name_parts.inject([]) do |memo, name|
-          memo += [name]
-          key = memo.join(FactName::SEPARATOR)
-          new_facts[key] ||= name_parts == memo ? value : nil
-          memo
-        end
-      end
-      new_facts
-    end
-
-    def sort_by_key(hash)
-      hash.sort_by { |k, _v| k.to_s }
-    end
-
-    def sparse(hash, options = {})
-      hash.map do |k, v|
-        prefix = (options.fetch(:prefix, []) + [k])
-        next Sparsify.sparse(v, options.merge(:prefix => prefix)) if v.is_a? Hash
-        { prefix.join(options.fetch(:separator, FactName::SEPARATOR)) => v }
-      end.reduce(:merge) || {}
-    end
-
-    def unsparse(hash, options = {})
-      ret = {}
-      sparse(hash).each do |k, v|
-        current            = ret
-        key                = k.to_s.split(options.fetch(:separator, FactName::SEPARATOR))
-        current            = (current[key.shift] ||= {}) until (key.size <= 1)
-        current[key.first] = v
-      end
-      ret
-    end
   end
 end

data/app/services/foreman_salt/fact_parser.rb

@@ -56,20 +56,26 @@ module ForemanSalt
 
       facts.each do |fact, value|
         next unless value && fact.to_s =~ /^ip_interfaces/
-        (_, interface, number) = fact.split(FactName::SEPARATOR)
-
-        interface_name = if number == '0' || number.nil?
-                           interface
-                         else
-                           "#{interface}.#{number}"
-                         end
-
-        if !interface.blank? && interface != 'lo'
-          interfaces[interface_name] = {} if interfaces[interface_name].blank?
-          interfaces[interface_name].merge!(:ipaddress => value, :macaddress => macs[interface])
+        (_, 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
+          else
+            interface[:ipaddress] = value
+          end
+          interfaces[interface_name] = interface
         end
       end
 
+      interfaces.each do |name, interface|
+        set_additional_attributes(interface, name)
+      end
+
       interfaces
     end
 
@@ -85,7 +91,7 @@ module ForemanSalt
       if name == 'CentOS'
         if sub
           minor += '.' + sub
-          end
+        end
       end
       { :name => name, :major => major, :minor => minor }
     end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '10.0.0'
+  VERSION = '10.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.1.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-06 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -163,7 +163,7 @@ files:
 - test/unit/report_importer_test.rb
 - test/unit/salt_keys_test.rb
 - test/unit/salt_modules_test.rb
-homepage: http://github.com/theforeman/foreman_salt
+homepage: https://github.com/theforeman/foreman_salt
 licenses:
 - GPL-3.0
 metadata: {}
@@ -183,27 +183,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
-- test/factories/foreman_salt_factories.rb
+- test/integration/salt_environment_test.rb
+- test/integration/salt_autosign_test.rb
+- test/integration/salt_keys_test.rb
+- test/integration/salt_module_test.rb
+- test/functional/minions_controller_test.rb
 - test/functional/api/v2/salt_autosign_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
 - test/functional/api/v2/salt_states_controller_test.rb
-- test/functional/minions_controller_test.rb
-- test/integration/salt_autosign_test.rb
-- test/integration/salt_environment_test.rb
-- test/integration/salt_keys_test.rb
-- test/integration/salt_module_test.rb
+- test/test_plugin_helper.rb
+- test/factories/foreman_salt_factories.rb
+- test/unit/host_extensions_test.rb
+- test/unit/report_importer_test.rb
 - test/unit/grains_centos.json
 - test/unit/highstate.json
-- test/unit/salt_keys_test.rb
 - test/unit/salt_modules_test.rb
-- test/unit/grains_importer_test.rb
-- test/unit/host_extensions_test.rb
 - test/unit/hostgroup_extensions_test.rb
-- test/unit/report_importer_test.rb
-- test/test_plugin_helper.rb
+- test/unit/salt_keys_test.rb
+- test/unit/grains_importer_test.rb