foreman_openscap 4.1.0 → 4.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b5074ed6694cddda4b32459825e324df98f9d4ca1425826adeb86a5983b08be2
4
- data.tar.gz: aea63d7dfe108a4262909e3110bdb92d83bd3d6aa5eb68da4fbc27f938195118
3
+ metadata.gz: 416db64a783e7876de13cd98e57b7daea2c0ac9f228f52f85fcb54d4db18e75f
4
+ data.tar.gz: c5b5c5f22113c4842a83d3255880af2632e12ccd26f1cc8779a36f4ae1910745
5
5
  SHA512:
6
- metadata.gz: b9dc895ea62f9d607a76a9e81fcedc088f0562c8faa621ec2a5b0a510d472bd59814cf8c05050e65d01a68b50f4f871945bedd257d07328650d05c21cfb2ce3f
7
- data.tar.gz: 4ce6250f308c0bd843261d1dc541d65a1901b0e36ab97c46b007d92668201c2387798307695d8eb3173667d69270bb473f39ca093d20f009cbd2cc67d59784eb
6
+ metadata.gz: e92cbdf9359cc67bb7e7ed1e40da8b78789fbc9daecb7c8559853d1fce03eaa5d2953f8d810ee5176f7f4288f57115c213099ce798229837c1568a09b3a2e1be
7
+ data.tar.gz: 91263d9e014cadff61bca46fe792cd2584e3c4de5ba828cd5f7e7b46e0e5d4c890e5fdd4894d19566bee31b5cb479ed21dd0b65be2bd499d15251c4d90b58920
@@ -0,0 +1,28 @@
1
+ class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
2
+ def up
3
+ update_port_type :to_i
4
+ end
5
+
6
+ def down
7
+ update_port_type :to_s
8
+ end
9
+
10
+ private
11
+
12
+ def update_port_type(method)
13
+ puppet_class = Puppetclass.find_by :name => 'foreman_scap_client'
14
+ return unless puppet_class
15
+ port_key = puppet_class.class_params.find_by :key => 'port'
16
+ return unless port_key
17
+ def_value = port_key.default_value
18
+
19
+ if method == :to_i
20
+ port_key.key_type = "integer"
21
+ port_key.default_value = def_value.to_i
22
+ else
23
+ port_key.key_type == "string"
24
+ port_key.default_value = port_key.default_value.to_s
25
+ end
26
+ port_key.save!
27
+ end
28
+ end
@@ -180,19 +180,6 @@ module ForemanOpenscap
180
180
  :description => proxy_description,
181
181
  :api_description => N_('ID of OpenSCAP Proxy')
182
182
 
183
- if ForemanOpenscap.with_remote_execution?
184
- options = {
185
- :description => N_("Run OpenSCAP scan"),
186
- :provided_inputs => "policies"
187
- }
188
-
189
- if Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
190
- options[:host_action_button] = true
191
- end
192
-
193
- RemoteExecutionFeature.register(:foreman_openscap_run_scans, N_("Run OpenSCAP scan"), options)
194
- end
195
-
196
183
  add_controller_action_scope('Api::V2::HostsController', :index) do |base_scope|
197
184
  base_scope.preload(:policies)
198
185
  end
@@ -231,6 +218,19 @@ module ForemanOpenscap
231
218
  Log.send(:include, ForemanOpenscap::LogExtensions)
232
219
  BookmarkControllerValidator.send(:prepend, ForemanOpenscap::BookmarkControllerValidatorExtensions)
233
220
  ProxyStatus.status_registry.add(ProxyStatus::OpenscapSpool)
221
+
222
+ if ForemanOpenscap.with_remote_execution?
223
+ options = {
224
+ :description => N_("Run OpenSCAP scan"),
225
+ :provided_inputs => "policies"
226
+ }
227
+
228
+ if Gem::Version.new(ForemanRemoteExecution::VERSION) >= Gem::Version.new('1.2.3')
229
+ options[:host_action_button] = true
230
+ end
231
+
232
+ RemoteExecutionFeature.register(:foreman_openscap_run_scans, N_("Run OpenSCAP scan"), options)
233
+ end
234
234
  end
235
235
 
236
236
  rake_tasks do
@@ -1,3 +1,3 @@
1
1
  module ForemanOpenscap
2
- VERSION = "4.1.0".freeze
2
+ VERSION = "4.1.1".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_openscap
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0
4
+ version: 4.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - slukasik@redhat.com
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-11-05 00:00:00.000000000 Z
11
+ date: 2020-12-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -246,6 +246,7 @@ files:
246
246
  - db/migrate/20190103093409_add_deployment_option_to_policy.foreman_openscap.rb
247
247
  - db/migrate/20200117135424_migrate_port_overrides_to_int.rb
248
248
  - db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb
249
+ - db/migrate/20201202110213_update_puppet_port_param_type.rb
249
250
  - db/seeds.d/75-job_templates.rb
250
251
  - db/seeds.d/openscap_feature.rb
251
252
  - db/seeds.d/openscap_policy_notification.rb