foreman_openscap 10.0.1 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8777fbcfc38a616d360ca6b386ae905d321f9cd6bcc4c55031dd6e2202311b
-  data.tar.gz: 36ff65d50b221f099122bd03cdcb88bc4e381763576f38c3e2675214330881d7
+  metadata.gz: a336811c9ef74e3f336a1ebe5e4ae7ede49fba1e34c20c1c805a211928ef5a05
+  data.tar.gz: 502cae89f02856e4263f6957cfad53e31079d67c8313563cf877d26bdf756782
 SHA512:
-  metadata.gz: 282d877864a2dd6108381246abe2cada805afe3e9afcf64f2cab10066d52ac0023f33dd406030e30286f68d9ac2018ed2d8e208c901463741048b0d9489bbb39
-  data.tar.gz: ca3fe8ca835caf8468f8afe661a828bf43ddaefd1b6d9278fb749f2667c0bded86b2d238d3392840862ded03153b6b5a1c62c8cfd0586422406d14d81eb3d54f
+  metadata.gz: 9f26b453c1b9ee555912eeff899498bdd60798ce72ab723265bf1c0444e0a9c01097736416817fd88d3891711be18973f87f684281c9b3d4d2de66d3308dc77d
+  data.tar.gz: 891f9abfeddfeaa612fff54d2f9c3dbcf21069e53a9092791a44b6389cd453983a83451058e04aa578369ead1e7a5b048a21540b7f1079eb7b146a3b406a3b09

data/app/services/foreman_openscap/lookup_key_overrider.rb

@@ -15,9 +15,10 @@ module ForemanOpenscap
 
     def handle_config_not_available(config)
       return true if config.available?
-      @policy.errors[:deploy_by] <<
+      @policy.errors.add(:deploy_by,
         _("%{type} was selected to deploy policy to clients, but %{type} is not available. Are you missing a plugin?") %
           { :type => config.type.to_s.camelize }
+      )
       false
     end
 
@@ -25,7 +26,7 @@ module ForemanOpenscap
       return true if item
       err = _("Required %{msg_name} %{class} was not found, please ensure it is imported first.") %
           { :class => config.config_item_name, :msg_name => config.msg_name }
-      @policy.errors[:base] << err
+      @policy.errors.add(:base, err)
       false
     end
 
@@ -34,7 +35,7 @@ module ForemanOpenscap
       err = _("The following %{key_name} were missing for %{item_name}: %{key_names}. Make sure they are imported before proceeding.") %
         { :key_name => config.lookup_key_plural_name, :key_names => key_names, :item_name => config.config_item_name }
 
-      @policy.errors[:base] << err
+      @policy.errors.add(:base, err)
       false
     end
 
@@ -52,9 +53,9 @@ module ForemanOpenscap
 
     def handle_param_override(config, param)
       if param.changed? && !param.save
-        @policy.errors[:base] <<
+        @policy.errors.add(:base,
           _('Failed to save when overriding parameters for %{config_tool}, cause: %{errors}') %
-          { :config_tool => config.type, :errors => param.errors.full_messages.join(', ') }
+          { :config_tool => config.type, :errors => param.errors.full_messages.join(', ') })
         return false
       end
       true

data/app/views/job_templates/run_openscap_remediation_-_ansible_default.erb

@@ -16,6 +16,8 @@ template_inputs:
   description: Indicate wether the host should be rebooted after all the remediation
   input_type: user
   required: false
+require:
+- plugin: foreman_ansible
 %>
 ---
 - hosts: all

data/config/routes.rb

@@ -62,7 +62,7 @@ Rails.application.routes.draw do
 
   namespace :api, :defaults => { :format => 'json' } do
     scope "(:apiv)", :module => :v2, :defaults => { :apiv => 'v2' },
-                     :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
+                     :apiv => /v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       namespace :compliance do
         resources :scap_contents, :except => %i[new edit] do
           member do
@@ -95,6 +95,14 @@ Rails.application.routes.draw do
         post 'arf_reports/:cname/:policy_id/:date', \
              :constraints => { :cname => /[^\/]+/ }, :to => 'arf_reports#create'
       end
+
+      constraints(:id => %r{[^\/]+}) do
+        resources :hosts, :except => [:new, :edit] do
+          member do
+            get :policies_enc
+          end
+        end
+      end
     end
   end
 end
@@ -113,19 +121,4 @@ Foreman::Application.routes.draw do
       post 'openscap_proxy_changed'
     end
   end
-
-  namespace :api do
-    scope "(:api_version)", :module => :v2,
-                            :defaults => { :api_version => 'v2' },
-                            :api_version => /v2/,
-                            :constraints => ApiConstraints.new(:version => 2, :default => true) do
-      constraints(:id => %r{[^\/]+}) do
-        resources :hosts, :only => [] do
-          member do
-            get :policies_enc
-          end
-        end
-      end
-    end
-  end
 end

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "10.0.1".freeze
+  VERSION = "10.0.2".freeze
 end

data/test/functional/openscap_proxies_controller_test.rb

@@ -1,5 +1,4 @@
 require 'test_plugin_helper'
-require 'application_helper'
 
 class OpenscapProxiesControllerTest < ActionController::TestCase
   include ActionView::Helpers::DateHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.0.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -295,71 +295,39 @@ files:
 - lib/tasks/foreman_openscap_tasks.rake
 - locale/Makefile
 - locale/cs_CZ/LC_MESSAGES/foreman_openscap.mo
-- locale/cs_CZ/foreman_openscap.edit.po
 - locale/cs_CZ/foreman_openscap.po
-- locale/cs_CZ/foreman_openscap.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_openscap.mo
-- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
-- locale/de/foreman_openscap.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_openscap.mo
-- locale/en/foreman_openscap.edit.po
 - locale/en/foreman_openscap.po
-- locale/en/foreman_openscap.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
-- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
-- locale/en_GB/foreman_openscap.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_openscap.mo
-- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
-- locale/es/foreman_openscap.po.time_stamp
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
-- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
-- locale/fr/foreman_openscap.po.time_stamp
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
-- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
-- locale/gl/foreman_openscap.po.time_stamp
 - locale/it/LC_MESSAGES/foreman_openscap.mo
-- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
-- locale/it/foreman_openscap.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
-- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
-- locale/ja/foreman_openscap.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_openscap.mo
-- locale/ka/foreman_openscap.edit.po
 - locale/ka/foreman_openscap.po
-- locale/ka/foreman_openscap.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
-- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
-- locale/ko/foreman_openscap.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
-- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
-- locale/pt_BR/foreman_openscap.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
-- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
-- locale/ru/foreman_openscap.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
-- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
-- locale/sv_SE/foreman_openscap.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
-- locale/zh_CN/foreman_openscap.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
-- locale/zh_TW/foreman_openscap.po.time_stamp
 - package.json
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
@@ -469,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports