foreman_openscap 0.11.5 → 0.12.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -66,6 +66,7 @@ files:
 - app/helpers/compliance_dashboard_helper.rb
 - app/helpers/compliance_hosts_helper.rb
 - app/helpers/concerns/foreman_openscap/hosts_helper_extensions.rb
+- app/helpers/foreman_openscap_helper.rb
 - app/helpers/policies_helper.rb
 - app/helpers/policy_dashboard_helper.rb
 - app/helpers/tailoring_files_helper.rb
@@ -93,7 +94,14 @@ files:
 - app/models/foreman_openscap/tailoring_file.rb
 - app/overrides/hosts/overview/host_compliance_status.rb
 - app/services/foreman_openscap/arf_report_status_calculator.rb
+- app/services/foreman_openscap/client_config/ansible.rb
+- app/services/foreman_openscap/client_config/base.rb
+- app/services/foreman_openscap/client_config/manual.rb
+- app/services/foreman_openscap/client_config/puppet.rb
+- app/services/foreman_openscap/config_name_service.rb
 - app/services/foreman_openscap/host_report_dashboard/data.rb
+- app/services/foreman_openscap/hostgroup_overrider.rb
+- app/services/foreman_openscap/lookup_key_overrider.rb
 - app/services/foreman_openscap/openscap_proxy_assigned_version_check.rb
 - app/services/foreman_openscap/openscap_proxy_version_check.rb
 - app/services/foreman_openscap/policy_dashboard/data.rb
@@ -154,10 +162,11 @@ files:
 - app/views/policies/new.html.erb
 - app/views/policies/select_multiple_hosts.html.erb
 - app/views/policies/show.html.erb
-- app/views/policies/steps/_create_policy_form.html.erb
+- app/views/policies/steps/_deployment_options_form.html.erb
 - app/views/policies/steps/_hostgroups_form.html.erb
 - app/views/policies/steps/_locations_form.html.erb
 - app/views/policies/steps/_organizations_form.html.erb
+- app/views/policies/steps/_policy_attributes_form.html.erb
 - app/views/policies/steps/_scap_content_form.html.erb
 - app/views/policies/steps/_schedule_form.html.erb
 - app/views/policies/steps/_step_form.html.erb
@@ -224,6 +233,7 @@ files:
 - db/migrate/20170830221751_add_index_to_logs_result.rb
 - db/migrate/20171011134112_remove_arf_reports_without_policy.rb
 - db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb
+- db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -324,8 +334,10 @@ files:
 - test/unit/openscap_host_test.rb
 - test/unit/policy_mailer_test.rb
 - test/unit/policy_test.rb
-- test/unit/puppet_overrides_test.rb
 - test/unit/scap_content_test.rb
+- test/unit/services/config_name_service_test.rb
+- test/unit/services/hostgroup_overrider_test.rb
+- test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
@@ -366,9 +378,11 @@ test_files:
 - test/unit/arf_report_status_calculator_test.rb
 - test/unit/policy_mailer_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
+- test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/report_dashboard/data_test.rb
+- test/unit/services/lookup_key_overrider_test.rb
+- test/unit/services/config_name_service_test.rb
 - test/unit/arf_report_test.rb
-- test/unit/puppet_overrides_test.rb
 - test/test_plugin_helper.rb
 - test/functional/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/arf_reports_controller_test.rb

data/test/unit/puppet_overrides_test.rb

@@ -1,38 +0,0 @@
-require 'test_plugin_helper'
-
-class PuppetOverridesTest < ActiveSupport::TestCase
-  setup do
-    ForemanOpenscap::ScapContent.any_instance.stubs(:fetch_profiles).returns({ 'test_profile_key' => 'test_profile_title' })
-    @scap_content = FactoryBot.create(:scap_content)
-    @scap_profile = FactoryBot.create(:scap_content_profile, :scap_content => @scap_content)
-  end
-
-  test "should override puppet class parameters" do
-    env = FactoryBot.create(:environment)
-    puppet_class = FactoryBot.create(:puppetclass, :name => 'foreman_scap_client')
-    server_param = FactoryBot.create(:puppetclass_lookup_key, :key => 'server')
-    port_param = FactoryBot.create(:puppetclass_lookup_key, :key => 'port')
-    policies_param = FactoryBot.create(:puppetclass_lookup_key, :key => 'policies')
-    FactoryBot.create(:environment_class,
-                      :puppetclass_id => puppet_class.id,
-                      :environment_id => env.id,
-                      :puppetclass_lookup_key_id => server_param.id)
-    FactoryBot.create(:environment_class,
-                      :puppetclass_id => puppet_class.id,
-                      :environment_id => env.id,
-                      :puppetclass_lookup_key_id => port_param.id)
-    FactoryBot.create(:environment_class,
-                      :puppetclass_id => puppet_class.id,
-                      :environment_id => env.id,
-                      :puppetclass_lookup_key_id => policies_param.id)
-    refute server_param.override
-    refute port_param.override
-    refute policies_param.override
-    FactoryBot.create(:policy, :scap_content => @scap_content, :scap_content_profile => @scap_content_profile)
-
-    assert server_param.reload.override
-    assert port_param.reload.override
-    assert policies_param.reload.override
-    assert_equal '<%= @host.policies_enc %>', policies_param.default_value
-  end
-end