foreman_salt 13.0.0 → 13.1.0

data/test/integration/salt_variable_test.rb

@@ -0,0 +1,24 @@
+require 'test_plugin_helper'
+require 'integration_test_helper'
+
+module ForemanSalt
+  class SaltVariableTest < IntegrationTestWithJavascript
+    setup do
+      User.current = users :admin
+    end
+
+    test 'index page' do
+      FactoryBot.create_list :salt_variable, 5
+      assert_index_page(salt_variables_path, 'Salt Variable', 'New Salt Variable')
+    end
+
+    test 'create new page' do
+      state = FactoryBot.create :salt_module
+      assert_new_button(salt_variables_path, 'New Salt Variable', new_salt_variable_path)
+      fill_in 'foreman_salt_salt_variable_key', :with => 'mykey'
+      select2(state.name, :from => 'foreman_salt_salt_variable_salt_module_id')
+      assert_submit_button(salt_variables_path)
+      assert page.has_link? 'mykey'
+    end
+  end
+end

data/test/unit/salt_variables_test.rb

@@ -0,0 +1,32 @@
+require 'test_plugin_helper'
+
+class SaltVariablesTest < ActiveSupport::TestCase
+  setup do
+    User.current = users :admin
+    @state = FactoryBot.create :salt_module
+  end
+
+  test 'salt variable has a salt module' do
+    salt_variable = ForemanSalt::SaltVariable.new(:key => 'awesome_key', :salt_module_id => @state.id)
+    assert_valid salt_variable
+    assert_equal true, salt_variable.salt?
+    assert_equal @state.id, salt_variable.salt_module.id
+  end
+
+  test 'salt variable is referencing a LookupValue' do
+    salt_variable = ForemanSalt::SaltVariable.new(:key => 'awesome_key', :salt_module_id => @state.id)
+    assert salt_variable.lookup_values.count.zero?
+    LookupValue.create(:value => "[1.2.3.4,2.3.4.5]", :match => "domain =  mydomain.net", :lookup_key => salt_variable)
+    assert salt_variable.lookup_values.count == 1
+  end
+
+  test 'should cast default_value to hash' do
+    salt_variable = ForemanSalt::SaltVariable.new(:key => 'awesome_key',
+                                                  :salt_module_id => @state.id,
+                                                  :key_type => 'hash',
+                                                  :default_value => "{\r\n  \"bat\": \"man\"\r\n}\r\n",
+                                                  :override => true)
+    salt_variable.save
+    assert salt_variable.default_value.is_a?(Hash)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.1.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -85,21 +85,26 @@ files:
 - app/controllers/foreman_salt/api/v2/salt_keys_controller.rb
 - app/controllers/foreman_salt/api/v2/salt_minions_controller.rb
 - app/controllers/foreman_salt/api/v2/salt_states_controller.rb
+- app/controllers/foreman_salt/api/v2/salt_variables_controller.rb
 - app/controllers/foreman_salt/application_controller.rb
 - app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
 - app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
 - app/controllers/foreman_salt/concerns/salt_environment_parameters.rb
 - app/controllers/foreman_salt/concerns/salt_module_parameters.rb
+- app/controllers/foreman_salt/concerns/salt_override_value.rb
+- app/controllers/foreman_salt/concerns/salt_variable_parameters.rb
 - app/controllers/foreman_salt/minions_controller.rb
 - app/controllers/foreman_salt/salt_autosign_controller.rb
 - app/controllers/foreman_salt/salt_environments_controller.rb
 - app/controllers/foreman_salt/salt_keys_controller.rb
 - app/controllers/foreman_salt/salt_modules_controller.rb
+- app/controllers/foreman_salt/salt_variables_controller.rb
 - app/controllers/foreman_salt/state_importer.rb
 - app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_salt/smart_proxies_helper_extensions.rb
 - app/helpers/foreman_salt/salt_keys_helper.rb
 - app/helpers/foreman_salt/salt_modules_helper.rb
+- app/helpers/foreman_salt/salt_plugin_helper.rb
 - app/helpers/foreman_salt/salt_reports_helper.rb
 - app/lib/actions/foreman_salt/report_import.rb
 - app/lib/proxy_api/salt.rb
@@ -112,6 +117,7 @@ files:
 - 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_variable.rb
 - app/models/setting/salt.rb
 - app/overrides/salt_environment_host_selector.rb
 - app/overrides/salt_environment_hostgroup_selector.rb
@@ -143,6 +149,10 @@ files:
 - app/views/foreman_salt/api/v2/salt_states/index.json.rabl
 - app/views/foreman_salt/api/v2/salt_states/main.json.rabl
 - app/views/foreman_salt/api/v2/salt_states/show.json.rabl
+- app/views/foreman_salt/api/v2/salt_variables/create.json.rabl
+- app/views/foreman_salt/api/v2/salt_variables/destroy.json.rabl
+- app/views/foreman_salt/api/v2/salt_variables/index.json.rabl
+- app/views/foreman_salt/api/v2/salt_variables/show.json.rabl
 - app/views/foreman_salt/job_templates/salt_run_command_-_salt_default.erb
 - app/views/foreman_salt/job_templates/salt_run_function_-_ssh_default.erb
 - app/views/foreman_salt/job_templates/salt_run_state_highstate_-_salt_default.erb
@@ -163,6 +173,10 @@ files:
 - app/views/foreman_salt/salt_modules/import.html.erb
 - app/views/foreman_salt/salt_modules/index.html.erb
 - app/views/foreman_salt/salt_modules/new.html.erb
+- app/views/foreman_salt/salt_variables/_fields.erb
+- app/views/foreman_salt/salt_variables/edit.html.erb
+- app/views/foreman_salt/salt_variables/index.html.erb
+- app/views/foreman_salt/salt_variables/new.html.erb
 - app/views/hosts/select_multiple_salt_environment.html.erb
 - app/views/hosts/select_multiple_salt_master.html.erb
 - config/routes.rb
@@ -175,6 +189,7 @@ files:
 - db/migrate/20150509094409_rename_join_tables.rb
 - 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/seeds.d/75-salt_seeds.rb
 - db/seeds.d/76-job_templates.rb
 - lib/foreman_salt.rb
@@ -199,13 +214,17 @@ files:
 - 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/api/v2/salt_variables_controller_test.rb
 - test/functional/hosts_controller_test.rb
 - test/functional/minions_controller_test.rb
+- test/functional/salt_modules_controller_test.rb
+- test/functional/salt_variables_controller_test.rb
 - test/integration/hosts_js_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/integration/salt_variable_test.rb
 - test/test_plugin_helper.rb
 - test/unit/grains_centos.json
 - test/unit/grains_importer_test.rb
@@ -218,6 +237,7 @@ files:
 - 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
 homepage: https://github.com/theforeman/foreman_salt
 licenses:
 - GPL-3.0
@@ -243,6 +263,7 @@ signing_key:
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
+- test/integration/salt_variable_test.rb
 - test/integration/salt_environment_test.rb
 - test/integration/salt_module_test.rb
 - test/integration/hosts_js_test.rb
@@ -258,12 +279,16 @@ test_files:
 - 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
 - test/unit/host_extensions_test.rb
 - test/test_plugin_helper.rb
+- test/functional/salt_variables_controller_test.rb
 - test/functional/minions_controller_test.rb
 - test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_variables_controller_test.rb
 - test/functional/api/v2/salt_states_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
 - test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/salt_modules_controller_test.rb
 - test/functional/hosts_controller_test.rb