foreman_puppet 8.1.1 → 8.1.2
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 +4 -4
- data/app/controllers/concerns/foreman_puppet/extensions/api_smart_proxies_controller.rb +1 -1
- data/app/services/foreman_puppet/puppet_class_importer.rb +11 -1
- data/lib/foreman_puppet/version.rb +1 -1
- data/test/integration/foreman_puppet/host_js_test.rb +6 -6
- data/webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/components/ConfigStatusCard/index.js +3 -3
- metadata +3 -44
- data/locale/ca/foreman_puppet.edit.po +0 -1198
- data/locale/ca/foreman_puppet.po.time_stamp +0 -0
- data/locale/cs_CZ/foreman_puppet.edit.po +0 -1203
- data/locale/cs_CZ/foreman_puppet.po.time_stamp +0 -0
- data/locale/de/foreman_puppet.edit.po +0 -1225
- data/locale/de/foreman_puppet.po.time_stamp +0 -0
- data/locale/en/foreman_puppet.edit.po +0 -1194
- data/locale/en/foreman_puppet.po.time_stamp +0 -0
- data/locale/en_GB/foreman_puppet.edit.po +0 -1200
- data/locale/en_GB/foreman_puppet.po.time_stamp +0 -0
- data/locale/es/foreman_puppet.edit.po +0 -1210
- data/locale/es/foreman_puppet.po.time_stamp +0 -0
- data/locale/fr/foreman_puppet.edit.po +0 -1220
- data/locale/fr/foreman_puppet.po.time_stamp +0 -0
- data/locale/gl/foreman_puppet.edit.po +0 -1198
- data/locale/gl/foreman_puppet.po.time_stamp +0 -0
- data/locale/it/foreman_puppet.edit.po +0 -1203
- data/locale/it/foreman_puppet.po.time_stamp +0 -0
- data/locale/ja/foreman_puppet.edit.po +0 -1209
- data/locale/ja/foreman_puppet.po.time_stamp +0 -0
- data/locale/ka/foreman_puppet.edit.po +0 -1208
- data/locale/ka/foreman_puppet.po.time_stamp +0 -0
- data/locale/ko/foreman_puppet.edit.po +0 -1199
- data/locale/ko/foreman_puppet.po.time_stamp +0 -0
- data/locale/nl_NL/foreman_puppet.edit.po +0 -1203
- data/locale/nl_NL/foreman_puppet.po.time_stamp +0 -0
- data/locale/pl/foreman_puppet.edit.po +0 -1202
- data/locale/pl/foreman_puppet.po.time_stamp +0 -0
- data/locale/pt_BR/foreman_puppet.edit.po +0 -1209
- data/locale/pt_BR/foreman_puppet.po.time_stamp +0 -0
- data/locale/ru/foreman_puppet.edit.po +0 -1207
- data/locale/ru/foreman_puppet.po.time_stamp +0 -0
- data/locale/sv_SE/foreman_puppet.edit.po +0 -1202
- data/locale/sv_SE/foreman_puppet.po.time_stamp +0 -0
- data/locale/zh_CN/foreman_puppet.edit.po +0 -1212
- data/locale/zh_CN/foreman_puppet.po.time_stamp +0 -0
- data/locale/zh_TW/foreman_puppet.edit.po +0 -1201
- data/locale/zh_TW/foreman_puppet.po.time_stamp +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5a90ef484a7b0f8ab36135a262e9e208d1443f12b3e8e0b985efcd903f742c63
|
4
|
+
data.tar.gz: d5c359126f7d12c5f4fc0cbd46bdf617ef7e78f0bf98948eb5ce3cbfe59c527a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e7c4779f1b42d345af41dd93d5810fdb5c4d5c40b331cd9159964cc995008c045980540bd27988bac1e1e0d44237a5e9c7916489db07497a272c86bba881d46d
|
7
|
+
data.tar.gz: 5e679100b7105864489d59d16876adcfefec5d2b5496f57c0b7f25b84f25e9e0b28a328376b78c12c2c4ba0377bffe7d71fd936eee5713d8af3770d8d70b13fe
|
@@ -140,7 +140,7 @@ module ForemanPuppet
|
|
140
140
|
end
|
141
141
|
|
142
142
|
def find_optional_environment
|
143
|
-
@environment = Environment.authorized(:view_environments)
|
143
|
+
@environment = resource_finder(Environment.authorized(:view_environments), @env_id) if @env_id
|
144
144
|
rescue ActiveRecord::RecordNotFound => e
|
145
145
|
Foreman::Logging.exception('Resource not found', e, level: :debug)
|
146
146
|
nil
|
@@ -229,7 +229,17 @@ module ForemanPuppet
|
|
229
229
|
end
|
230
230
|
|
231
231
|
def load_ignored_file
|
232
|
-
File.exist?(ignored_file_path)
|
232
|
+
if File.exist?(ignored_file_path)
|
233
|
+
# Ruby 3+
|
234
|
+
if YAML.respond_to(:safe_load_file)
|
235
|
+
YAML.safe_load_file(ignored_file_path, permitted_classes: [Symbol, Regexp])
|
236
|
+
else
|
237
|
+
# NOTE: Once we drop Ruby 2.7 support, you can drop the load_file call.
|
238
|
+
YAML.load_file(ignored_file_path)
|
239
|
+
end
|
240
|
+
else
|
241
|
+
{}
|
242
|
+
end
|
233
243
|
end
|
234
244
|
|
235
245
|
def ignored_file
|
@@ -23,7 +23,7 @@ module ForemanPuppet
|
|
23
23
|
wait_for_ajax
|
24
24
|
click_on_inherit('puppet_attributes_environment')
|
25
25
|
select2(overridden_hostgroup.name, from: 'host_hostgroup_id')
|
26
|
-
assert page.find('
|
26
|
+
assert page.find(select2_selector('host_puppet_attributes_environment_id')).has_text? overridden_hostgroup.puppet.environment.name
|
27
27
|
end
|
28
28
|
|
29
29
|
test 'sets fields to "inherit" when hostgroup is selected' do
|
@@ -137,15 +137,15 @@ module ForemanPuppet
|
|
137
137
|
visit edit_host_path(host)
|
138
138
|
select2(original_hostgroup.name, from: 'host_hostgroup_id')
|
139
139
|
|
140
|
-
|
140
|
+
assert select2_chosen_selector('host_puppet_proxy_id').has_text? original_hostgroup.puppet_proxy.name
|
141
141
|
|
142
142
|
click_on_inherit('puppet_proxy')
|
143
143
|
select2(overridden_hostgroup.name, from: 'host_hostgroup_id')
|
144
144
|
|
145
|
-
assert
|
145
|
+
assert select2_chosen_selector('host_puppet_attributes_environment_id').has_text? original_hostgroup.puppet.environment.name
|
146
146
|
|
147
147
|
# On host group change, the disabled select will be reset to an empty value - disabled select2 is invisible on chrome
|
148
|
-
assert find('
|
148
|
+
assert find(select2_selector('host_puppet_proxy_id'), visible: :all).has_text? ''
|
149
149
|
end
|
150
150
|
|
151
151
|
context 'has inherited Puppetclasses' do
|
@@ -201,14 +201,14 @@ module ForemanPuppet
|
|
201
201
|
switch_form_tab('Puppet ENC')
|
202
202
|
assert puppetclass_params.has_selector?("a[data-tag='remove']", visible: :visible)
|
203
203
|
assert puppetclass_params.has_selector?("a[data-tag='override']", visible: :hidden)
|
204
|
-
|
204
|
+
assert select2_chosen_selector("host_lookup_values_attributes_#{lookup_key.id}_value").has_text? 'false'
|
205
205
|
select2 'true', from: "host_lookup_values_attributes_#{lookup_key.id}_value"
|
206
206
|
click_button('Submit')
|
207
207
|
find('h5', text: /#{host.name}/)
|
208
208
|
|
209
209
|
visit edit_host_path(host)
|
210
210
|
switch_form_tab('Puppet ENC')
|
211
|
-
|
211
|
+
assert select2_chosen_selector("host_lookup_values_attributes_#{lookup_key.id}_value").has_text? 'true'
|
212
212
|
end
|
213
213
|
|
214
214
|
test 'class parameters and overrides are displayed correctly for strings' do
|
data/webpack/src/Extends/Host/PuppetTab/SubTabs/Reports/components/ConfigStatusCard/index.js
CHANGED
@@ -104,12 +104,12 @@ const createPuppetMetricsTable = (metrics = undefined) => (
|
|
104
104
|
key="foreman-puppet-metrics-table"
|
105
105
|
>
|
106
106
|
<Tbody>
|
107
|
-
<Tr>
|
107
|
+
<Tr ouiaId="foreman-puppet-metrics-row-1">
|
108
108
|
{createPuppetMetricsTableElement(__('Failed'), metrics.failed)}
|
109
109
|
{createPuppetMetricsTableElement(__('Changed'), metrics.changed)}
|
110
110
|
{createPuppetMetricsTableElement(__('Scheduled'), metrics.scheduled)}
|
111
111
|
</Tr>
|
112
|
-
<Tr>
|
112
|
+
<Tr ouiaId="foreman-puppet-metrics-row-2">
|
113
113
|
{createPuppetMetricsTableElement(
|
114
114
|
__('Failed to start'),
|
115
115
|
metrics.failed_to_start
|
@@ -120,7 +120,7 @@ const createPuppetMetricsTable = (metrics = undefined) => (
|
|
120
120
|
metrics.corrective_change
|
121
121
|
)}
|
122
122
|
</Tr>
|
123
|
-
<Tr>
|
123
|
+
<Tr ouiaId="foreman-puppet-metrics-row-3">
|
124
124
|
{createPuppetMetricsTableElement(__('Skipped'), metrics.skipped)}
|
125
125
|
{createPuppetMetricsTableElement(
|
126
126
|
__('Out of sync'),
|
metadata
CHANGED
@@ -1,15 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_puppet
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 8.1.
|
4
|
+
version: 8.1.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ondřej Ezr
|
8
8
|
- Shira Maximov
|
9
|
-
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date:
|
11
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
13
12
|
dependencies: []
|
14
13
|
description: Allow assigning Puppet environments and classes to the Foreman Hosts.
|
15
14
|
email:
|
@@ -238,83 +237,45 @@ files:
|
|
238
237
|
- lib/tasks/foreman_puppet_tasks.rake
|
239
238
|
- locale/Makefile
|
240
239
|
- locale/ca/LC_MESSAGES/foreman_puppet.mo
|
241
|
-
- locale/ca/foreman_puppet.edit.po
|
242
240
|
- locale/ca/foreman_puppet.po
|
243
|
-
- locale/ca/foreman_puppet.po.time_stamp
|
244
241
|
- locale/cs_CZ/LC_MESSAGES/foreman_puppet.mo
|
245
|
-
- locale/cs_CZ/foreman_puppet.edit.po
|
246
242
|
- locale/cs_CZ/foreman_puppet.po
|
247
|
-
- locale/cs_CZ/foreman_puppet.po.time_stamp
|
248
243
|
- locale/de/LC_MESSAGES/foreman_puppet.mo
|
249
|
-
- locale/de/foreman_puppet.edit.po
|
250
244
|
- locale/de/foreman_puppet.po
|
251
|
-
- locale/de/foreman_puppet.po.time_stamp
|
252
245
|
- locale/en/LC_MESSAGES/foreman_puppet.mo
|
253
|
-
- locale/en/foreman_puppet.edit.po
|
254
246
|
- locale/en/foreman_puppet.po
|
255
|
-
- locale/en/foreman_puppet.po.time_stamp
|
256
247
|
- locale/en_GB/LC_MESSAGES/foreman_puppet.mo
|
257
|
-
- locale/en_GB/foreman_puppet.edit.po
|
258
248
|
- locale/en_GB/foreman_puppet.po
|
259
|
-
- locale/en_GB/foreman_puppet.po.time_stamp
|
260
249
|
- locale/es/LC_MESSAGES/foreman_puppet.mo
|
261
|
-
- locale/es/foreman_puppet.edit.po
|
262
250
|
- locale/es/foreman_puppet.po
|
263
|
-
- locale/es/foreman_puppet.po.time_stamp
|
264
251
|
- locale/foreman_puppet.pot
|
265
252
|
- locale/fr/LC_MESSAGES/foreman_puppet.mo
|
266
|
-
- locale/fr/foreman_puppet.edit.po
|
267
253
|
- locale/fr/foreman_puppet.po
|
268
|
-
- locale/fr/foreman_puppet.po.time_stamp
|
269
254
|
- locale/gemspec.rb
|
270
255
|
- locale/gl/LC_MESSAGES/foreman_puppet.mo
|
271
|
-
- locale/gl/foreman_puppet.edit.po
|
272
256
|
- locale/gl/foreman_puppet.po
|
273
|
-
- locale/gl/foreman_puppet.po.time_stamp
|
274
257
|
- locale/it/LC_MESSAGES/foreman_puppet.mo
|
275
|
-
- locale/it/foreman_puppet.edit.po
|
276
258
|
- locale/it/foreman_puppet.po
|
277
|
-
- locale/it/foreman_puppet.po.time_stamp
|
278
259
|
- locale/ja/LC_MESSAGES/foreman_puppet.mo
|
279
|
-
- locale/ja/foreman_puppet.edit.po
|
280
260
|
- locale/ja/foreman_puppet.po
|
281
|
-
- locale/ja/foreman_puppet.po.time_stamp
|
282
261
|
- locale/ka/LC_MESSAGES/foreman_puppet.mo
|
283
|
-
- locale/ka/foreman_puppet.edit.po
|
284
262
|
- locale/ka/foreman_puppet.po
|
285
|
-
- locale/ka/foreman_puppet.po.time_stamp
|
286
263
|
- locale/ko/LC_MESSAGES/foreman_puppet.mo
|
287
|
-
- locale/ko/foreman_puppet.edit.po
|
288
264
|
- locale/ko/foreman_puppet.po
|
289
|
-
- locale/ko/foreman_puppet.po.time_stamp
|
290
265
|
- locale/nl_NL/LC_MESSAGES/foreman_puppet.mo
|
291
|
-
- locale/nl_NL/foreman_puppet.edit.po
|
292
266
|
- locale/nl_NL/foreman_puppet.po
|
293
|
-
- locale/nl_NL/foreman_puppet.po.time_stamp
|
294
267
|
- locale/pl/LC_MESSAGES/foreman_puppet.mo
|
295
|
-
- locale/pl/foreman_puppet.edit.po
|
296
268
|
- locale/pl/foreman_puppet.po
|
297
|
-
- locale/pl/foreman_puppet.po.time_stamp
|
298
269
|
- locale/pt_BR/LC_MESSAGES/foreman_puppet.mo
|
299
|
-
- locale/pt_BR/foreman_puppet.edit.po
|
300
270
|
- locale/pt_BR/foreman_puppet.po
|
301
|
-
- locale/pt_BR/foreman_puppet.po.time_stamp
|
302
271
|
- locale/ru/LC_MESSAGES/foreman_puppet.mo
|
303
|
-
- locale/ru/foreman_puppet.edit.po
|
304
272
|
- locale/ru/foreman_puppet.po
|
305
|
-
- locale/ru/foreman_puppet.po.time_stamp
|
306
273
|
- locale/sv_SE/LC_MESSAGES/foreman_puppet.mo
|
307
|
-
- locale/sv_SE/foreman_puppet.edit.po
|
308
274
|
- locale/sv_SE/foreman_puppet.po
|
309
|
-
- locale/sv_SE/foreman_puppet.po.time_stamp
|
310
275
|
- locale/zh_CN/LC_MESSAGES/foreman_puppet.mo
|
311
|
-
- locale/zh_CN/foreman_puppet.edit.po
|
312
276
|
- locale/zh_CN/foreman_puppet.po
|
313
|
-
- locale/zh_CN/foreman_puppet.po.time_stamp
|
314
277
|
- locale/zh_TW/LC_MESSAGES/foreman_puppet.mo
|
315
|
-
- locale/zh_TW/foreman_puppet.edit.po
|
316
278
|
- locale/zh_TW/foreman_puppet.po
|
317
|
-
- locale/zh_TW/foreman_puppet.po.time_stamp
|
318
279
|
- package.json
|
319
280
|
- test/controllers/foreman_puppet/api/v2/config_groups_controller_test.rb
|
320
281
|
- test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
|
@@ -426,7 +387,6 @@ homepage: https://github.com/theforeman/foreman_puppet
|
|
426
387
|
licenses:
|
427
388
|
- GPL-3.0
|
428
389
|
metadata: {}
|
429
|
-
post_install_message:
|
430
390
|
rdoc_options: []
|
431
391
|
require_paths:
|
432
392
|
- lib
|
@@ -444,8 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
444
404
|
- !ruby/object:Gem::Version
|
445
405
|
version: '0'
|
446
406
|
requirements: []
|
447
|
-
rubygems_version: 3.
|
448
|
-
signing_key:
|
407
|
+
rubygems_version: 3.6.7
|
449
408
|
specification_version: 4
|
450
409
|
summary: Add Puppet features to Foreman
|
451
410
|
test_files:
|