foreman_salt 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a26aba67e387ba355bf4b358969f155e0e7550
-  data.tar.gz: c77ad3cab0e6f604f8e60964894d3345b01384ed
+  metadata.gz: bea1caeb04b5f73dc724c2d4bdd45e46055dbf80
+  data.tar.gz: 21b7646d6d05aea5c7a393e1505910bc08efde11
 SHA512:
-  metadata.gz: 9db5120fde1dff0fffad5b1cf5dbec81cf780669887447f379ba6109d2fd886f45b120a79d219b7b2f327cdd9d35d424e4cb09e1ba427b4441e8ed5124809e03
-  data.tar.gz: b36d148373832511ea50bbf3379f0f096f9a2fdcad94b62422cf7cb06526ddecafba58aeb83e1faa4c7c9c362b7a089b0514b5ec9454656401d9bc4a399ee41c
+  metadata.gz: 7ae9d028461860b4fac00233e19a8de3b74614c92278539d4848649c20fc632987f1cd1f33aa53c3d63c8de9e7831532e0f753f49317fe0147f1c9de2c8e1e3c
+  data.tar.gz: 495c4414f5718ecc4d75ba82bada937b1cf799327f9adebe434a65ead4880eb45c4f79fc2717e5e66357691617e25809e6566409ba67375c9320d704aed0fea2

data/app/assets/javascripts/foreman_salt/states.js

@@ -4,7 +4,7 @@ $(document).on( "ContentLoad", function() {
 
 function update_salt_states(element) {
   var host_id = $("form").data('id')
-  var env_id = $('*[id*=salt_environment_id]').val();
+  var env_id = $('select[name*=salt_environment_id]').val();
   var url = $(element).attr('data-url');
   var data = $("form").serialize().replace('method=put', 'method=post');
 

data/app/controllers/foreman_salt/minions_controller.rb

@@ -69,7 +69,7 @@ module ForemanSalt
       @minion = Host::Base.authorized(:view_hosts, Host).find_by_id(params[:host_id])
       if @minion
         unless @minion.is_a?(Host::Managed)
-          @minion      = @host.becomes(Host::Managed)
+          @minion      = @minion.becomes(Host::Managed)
           @minion.type = 'Host::Managed'
         end
         @minion.attributes = params[:host]

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

@@ -33,10 +33,9 @@ module ForemanSalt
       end
 
       def salt_modules_for_enc
-        return [] unless self.salt_environment
-
-        hostgroup_modules = self.hostgroup ? self.hostgroup.all_salt_modules : []
-        self.salt_environment.salt_modules.where(:id => self.salt_modules + hostgroup_modules).pluck(:name)
+        return [] unless salt_environment
+        modules = salt_modules + (hostgroup ? hostgroup.all_salt_modules : [])
+        ForemanSalt::SaltModule.in_environment(salt_environment).where(:id => modules).pluck(:name).uniq
       end
 
       def salt_master

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

@@ -16,11 +16,7 @@ module ForemanSalt
       end
 
       def all_salt_modules
-        if ancestry.present?
-          (self.salt_modules + self.inherited_salt_modules).uniq
-        else
-          self.salt_modules
-        end
+        ForemanSalt::SaltModule.in_environment(salt_environment).where(:id => salt_module_ids + inherited_salt_module_ids)
       end
 
       def inherited_salt_modules
@@ -28,11 +24,7 @@ module ForemanSalt
       end
 
       def inherited_salt_module_ids
-        if ancestry.present?
-          self.class.sort_by_ancestry(ancestors.reject { |ancestor| ancestor.salt_module_ids.empty? }).map(&:salt_module_ids).inject(&:+).uniq
-        else
-          []
-        end
+        ancestors.map(&:salt_module_ids).flatten.uniq
       end
 
       def salt_proxy

data/lib/foreman_salt/version.rb

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

data/test/factories/foreman_salt_factories.rb

@@ -4,24 +4,25 @@ FactoryGirl.define do
   end
 
   factory :salt_environment, :class => 'ForemanSalt::SaltEnvironment' do
-    sequence(:name) { |n| "module#{n}" }
+    sequence(:name) { |n| "environment#{n}" }
   end
 end
 
 FactoryGirl.modify do
   factory :host do
     trait :with_salt_proxy do
-      salt_proxy { FactoryGirl.create :smart_proxy, :with_salt_feature }
+      salt_proxy { FactoryGirl.build :smart_proxy, :with_salt_feature }
     end
   end
 
   factory :hostgroup do
     trait :with_salt_proxy do
-      salt_proxy { FactoryGirl.create :smart_proxy, :with_salt_feature }
+      salt_proxy { FactoryGirl.build :smart_proxy, :with_salt_feature }
     end
 
     trait :with_salt_modules do
-      salt_modules { FactoryGirl.create_list :salt_module, 10 }
+      salt_environment { FactoryGirl.build :salt_environment }
+      salt_modules { FactoryGirl.create_list :salt_module, 10, :salt_environments => [self.salt_environment] }
     end
   end
 

data/test/unit/hostgroup_extensions_test.rb

@@ -25,16 +25,32 @@ module ForemanSalt
     end
 
     test 'child and parent salt modules are combined' do
+      environment = FactoryGirl.create :salt_environment
+      parent = FactoryGirl.create :hostgroup, :with_salt_modules, :salt_environment => environment
+      child = FactoryGirl.create :hostgroup, :with_salt_modules, :salt_environment => environment, :parent => parent
+
+      total = parent.salt_modules.count + child.salt_modules.count
+      assert_equal total, child.all_salt_modules.count
+    end
+
+    test 'child doesnt get modules from outside its environment' do
       parent = FactoryGirl.create :hostgroup, :with_salt_modules
       child = FactoryGirl.create :hostgroup, :with_salt_modules, :parent => parent
-      assert_equal 10, (child.salt_modules - parent.salt_modules).length
+      assert_equal child.salt_modules.count, child.all_salt_modules.count
     end
 
-    test 'second child inherits from parent' do
+    test 'inheritance when only parent has modules' do
       parent = FactoryGirl.create :hostgroup, :with_salt_modules
       child_one = FactoryGirl.create :hostgroup, :parent => parent
       child_two = FactoryGirl.create :hostgroup, :parent => child_one
-      assert_equal [], parent.all_salt_modules - child_two.all_salt_modules
+      assert_blank parent.all_salt_modules - child_two.all_salt_modules
+    end
+
+    test 'inheritance when no parents have modules' do
+      parent = FactoryGirl.create :hostgroup
+      child_one = FactoryGirl.create :hostgroup, :parent => parent
+      child_two = FactoryGirl.create :hostgroup, :with_salt_modules, :parent => child_one
+      assert child_two.all_salt_modules.any?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement