openvox 9.0.0.pre.rc4 → 9.1.0
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/CHANGELOG.md +30 -0
- data/Gemfile +1 -1
- data/Gemfile.lock +34 -28
- data/lib/puppet/face/epp.rb +1 -1
- data/lib/puppet/face/parser.rb +1 -1
- data/lib/puppet/pal/json_catalog_encoder.rb +1 -1
- data/lib/puppet/reference/report.rb +4 -0
- data/lib/puppet/reports/store.rb +1 -2
- data/lib/puppet/util/json.rb +15 -3
- data/lib/puppet/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 05d6df4a27de02110c9c74de6816b7f2918b3eab327390d7484517b4fb072122
|
|
4
|
+
data.tar.gz: daf7a5b3d788fe303ed08665f44b2c4943a3be8157d42ecb8580106efe7eaf6c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d29e55164b3132fa09a81b47a57db8d77366da732b6a4054f50c05a78e282018c4780d328b8fca1682c0b1b0483e2bddae1d39e5462816fe89fa7fb37171095f
|
|
7
|
+
data.tar.gz: 03bee6f25b26fb2474fe40f797671a29d3e5c0641005fcbca604fd44763e518852771e9aaccebe66046e04843433cf4b47089be5397a92fb74f30129e00abda2
|
data/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,36 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
|
|
5
|
+
## [9.1.0](https://github.com/openvoxproject/openvox/tree/9.1.0) (2026-10-12)
|
|
6
|
+
|
|
7
|
+
[Full Changelog](https://github.com/openvoxproject/openvox/compare/9.0.0...9.1.0)
|
|
8
|
+
|
|
9
|
+
**Implemented enhancements:**
|
|
10
|
+
|
|
11
|
+
- Port Puppet::Util::Json to the json 3 API [\#706](https://github.com/OpenVoxProject/openvox/pull/706) ([miharp](https://github.com/miharp))
|
|
12
|
+
|
|
13
|
+
**Closed issues:**
|
|
14
|
+
|
|
15
|
+
- json 3.0.0 breaks Puppet::Util::Json and the test suite [\#654](https://github.com/OpenVoxProject/openvox/issues/654)
|
|
16
|
+
|
|
17
|
+
**Merged pull requests:**
|
|
18
|
+
|
|
19
|
+
- Promote puppet-runtime 2026.10.12.2 into main [\#722](https://github.com/OpenVoxProject/openvox/pull/722) ([OpenVoxProjectBot](https://github.com/OpenVoxProjectBot))
|
|
20
|
+
- Add redhatfips-10-x86\_64 platform and remove outdated comments [\#707](https://github.com/OpenVoxProject/openvox/pull/707) ([nmburgan](https://github.com/nmburgan))
|
|
21
|
+
- Fix documentation for default disabled reports [\#701](https://github.com/OpenVoxProject/openvox/pull/701) ([ekohl](https://github.com/ekohl))
|
|
22
|
+
|
|
23
|
+
## [9.0.0](https://github.com/openvoxproject/openvox/tree/9.0.0) (2026-10-02)
|
|
24
|
+
|
|
25
|
+
[Full Changelog](https://github.com/openvoxproject/openvox/compare/9.0.0-rc4...9.0.0)
|
|
26
|
+
|
|
27
|
+
**Fixed bugs:**
|
|
28
|
+
|
|
29
|
+
- \[Bug\]: Ruby crashes on child side of fork pre-exec macOS 26 \(Tahoe\) [\#538](https://github.com/OpenVoxProject/openvox/issues/538)
|
|
30
|
+
|
|
31
|
+
**Merged pull requests:**
|
|
32
|
+
|
|
33
|
+
- Skip the tests that need jruby-openssl in FIPS mode [\#696](https://github.com/OpenVoxProject/openvox/pull/696) ([nmburgan](https://github.com/nmburgan))
|
|
34
|
+
|
|
5
35
|
## [9.0.0-rc4](https://github.com/openvoxproject/openvox/tree/9.0.0-rc4) (2026-09-29)
|
|
6
36
|
|
|
7
37
|
[Full Changelog](https://github.com/openvoxproject/openvox/compare/9.0.0-rc3...9.0.0-rc4)
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
GIT
|
|
2
2
|
remote: https://github.com/openvoxproject/vanagon
|
|
3
|
-
revision:
|
|
3
|
+
revision: 9cd6c43406379d3ff4638dcbde3d1008860631ad
|
|
4
4
|
branch: main
|
|
5
5
|
specs:
|
|
6
6
|
vanagon (1.3.1)
|
|
@@ -14,7 +14,7 @@ GIT
|
|
|
14
14
|
PATH
|
|
15
15
|
remote: .
|
|
16
16
|
specs:
|
|
17
|
-
openvox (9.
|
|
17
|
+
openvox (9.1.0)
|
|
18
18
|
base64 (>= 0.1, < 0.4)
|
|
19
19
|
benchmark (>= 0.2, < 0.6)
|
|
20
20
|
concurrent-ruby (~> 1.0)
|
|
@@ -150,7 +150,7 @@ GEM
|
|
|
150
150
|
octokit (~> 4.6)
|
|
151
151
|
rainbow (>= 2.2.1)
|
|
152
152
|
rake (>= 10.0)
|
|
153
|
-
google-apis-core (1.
|
|
153
|
+
google-apis-core (1.3.1)
|
|
154
154
|
addressable (~> 2.9)
|
|
155
155
|
faraday (~> 2.13)
|
|
156
156
|
faraday-follow_redirects (~> 0.3)
|
|
@@ -161,16 +161,16 @@ GEM
|
|
|
161
161
|
retriable (>= 3.1, < 5.0)
|
|
162
162
|
google-apis-iamcredentials_v1 (0.28.0)
|
|
163
163
|
google-apis-core (>= 0.15.0, < 2.a)
|
|
164
|
-
google-apis-storage_v1 (0.
|
|
164
|
+
google-apis-storage_v1 (0.69.0)
|
|
165
165
|
google-apis-core (>= 0.15.0, < 2.a)
|
|
166
166
|
google-cloud-core (1.9.0)
|
|
167
167
|
google-cloud-env (>= 1.0, < 3.a)
|
|
168
168
|
google-cloud-errors (~> 1.0)
|
|
169
|
-
google-cloud-env (2.4.
|
|
169
|
+
google-cloud-env (2.4.1)
|
|
170
170
|
base64 (~> 0.2)
|
|
171
171
|
faraday (>= 1.0, < 3.a)
|
|
172
172
|
google-cloud-errors (1.7.0)
|
|
173
|
-
google-cloud-storage (1.62.
|
|
173
|
+
google-cloud-storage (1.62.1)
|
|
174
174
|
addressable (~> 2.8)
|
|
175
175
|
digest-crc (~> 0.4)
|
|
176
176
|
google-apis-core (>= 0.18, < 2)
|
|
@@ -209,8 +209,8 @@ GEM
|
|
|
209
209
|
prism (>= 1.3.0)
|
|
210
210
|
rdoc (>= 4.0.0)
|
|
211
211
|
reline (>= 0.4.2)
|
|
212
|
-
json (
|
|
213
|
-
json-schema (6.2.
|
|
212
|
+
json (3.1.0)
|
|
213
|
+
json-schema (6.2.1)
|
|
214
214
|
addressable (~> 2.8)
|
|
215
215
|
bigdecimal (>= 3.1, < 5)
|
|
216
216
|
jwt (3.3.0)
|
|
@@ -236,8 +236,11 @@ GEM
|
|
|
236
236
|
msgpack (1.8.5)
|
|
237
237
|
multi_json (1.21.2)
|
|
238
238
|
mustache (1.1.3)
|
|
239
|
-
net-http (0.
|
|
239
|
+
net-http (0.10.0)
|
|
240
|
+
net-protocol (>= 0.3.0)
|
|
240
241
|
uri (>= 0.11.1)
|
|
242
|
+
net-protocol (0.4.0)
|
|
243
|
+
timeout
|
|
241
244
|
nkf (0.3.0)
|
|
242
245
|
nokogiri (1.19.4-aarch64-linux-gnu)
|
|
243
246
|
racc (~> 1.4)
|
|
@@ -267,7 +270,7 @@ GEM
|
|
|
267
270
|
thor (~> 1.5)
|
|
268
271
|
tsort (< 0.3)
|
|
269
272
|
openssl (4.0.2)
|
|
270
|
-
openvox-strings (7.
|
|
273
|
+
openvox-strings (7.2.0)
|
|
271
274
|
irb (< 2)
|
|
272
275
|
rgen (>= 0.9, < 0.11)
|
|
273
276
|
yard (~> 0.9)
|
|
@@ -286,13 +289,13 @@ GEM
|
|
|
286
289
|
retriable (~> 3.1, >= 3.1.2)
|
|
287
290
|
rexml
|
|
288
291
|
pandoc-ruby (2.1.10)
|
|
289
|
-
parallel (2.
|
|
292
|
+
parallel (2.3.0)
|
|
290
293
|
parser (3.3.12.0)
|
|
291
294
|
ast (~> 2.4.1)
|
|
292
295
|
racc
|
|
293
296
|
pp (0.6.4)
|
|
294
297
|
prettyprint
|
|
295
|
-
prettyprint (0.2.
|
|
298
|
+
prettyprint (0.2.1)
|
|
296
299
|
prime (0.1.4)
|
|
297
300
|
forwardable
|
|
298
301
|
singleton
|
|
@@ -410,6 +413,7 @@ GEM
|
|
|
410
413
|
logger
|
|
411
414
|
text (1.3.1)
|
|
412
415
|
thor (1.5.0)
|
|
416
|
+
timeout (0.6.1)
|
|
413
417
|
track_open_instances (0.1.15)
|
|
414
418
|
trailblazer-option (0.1.2)
|
|
415
419
|
tsort (0.2.0)
|
|
@@ -419,9 +423,9 @@ GEM
|
|
|
419
423
|
unicode-display_width (3.3.0)
|
|
420
424
|
unicode-emoji (~> 4.3)
|
|
421
425
|
unicode-emoji (4.3.0)
|
|
422
|
-
uri (1.1.
|
|
426
|
+
uri (1.1.2)
|
|
423
427
|
vcr (6.4.0)
|
|
424
|
-
webmock (3.
|
|
428
|
+
webmock (3.30.0)
|
|
425
429
|
addressable (>= 2.8.0)
|
|
426
430
|
crack (>= 0.3.2)
|
|
427
431
|
hashdiff (>= 0.4.0, < 2.0.0)
|
|
@@ -448,7 +452,7 @@ DEPENDENCIES
|
|
|
448
452
|
github_changelog_generator (~> 1.18)
|
|
449
453
|
hiera-eyaml
|
|
450
454
|
hocon (~> 1.0)
|
|
451
|
-
json (<
|
|
455
|
+
json (< 4)
|
|
452
456
|
json-schema (>= 2, < 7)
|
|
453
457
|
memory_profiler
|
|
454
458
|
minitar (~> 1.0)
|
|
@@ -536,13 +540,13 @@ CHECKSUMS
|
|
|
536
540
|
gettext-setup (1.1.1) sha256=15ce653696283c9835b0ad9f02f236b9f240cb35facd3341cc62b85d42c6b667
|
|
537
541
|
git (4.4.5) sha256=1ee6dfa5ffc4cec038d47ef21a503d160b1d800e97f129a521b2a78dc23b2b62
|
|
538
542
|
github_changelog_generator (1.18.0) sha256=f6ad4c53a14e8d1e440492f5a7b3d0a4c76e072add568e78b437510b2f02d000
|
|
539
|
-
google-apis-core (1.
|
|
543
|
+
google-apis-core (1.3.1) sha256=20ce9ee1fde0be87fe30a135dfdbd4b9ee33ba32172794c1f2770e7a45361b2f
|
|
540
544
|
google-apis-iamcredentials_v1 (0.28.0) sha256=0a92ffe6cc39c569554af2a77a25dfc61519ed8bbb64ab04cffdd352dc5ef106
|
|
541
|
-
google-apis-storage_v1 (0.
|
|
545
|
+
google-apis-storage_v1 (0.69.0) sha256=ca5faad4a244c609bb434f81884432c449e34b31a87623f7c32b582e464ca7c8
|
|
542
546
|
google-cloud-core (1.9.0) sha256=ab55409f51488e8deefb6edcc1ce4771dfb5da2fe7b3bc075709a030c2b682a4
|
|
543
|
-
google-cloud-env (2.4.
|
|
547
|
+
google-cloud-env (2.4.1) sha256=987cc58afc50ce2903128ab4dcd442159be4457246b8137e41d49d5c3fc590dd
|
|
544
548
|
google-cloud-errors (1.7.0) sha256=6e682f42d89aae08689f36f28495de629d756da076bafff0003bac7f8042ebb3
|
|
545
|
-
google-cloud-storage (1.62.
|
|
549
|
+
google-cloud-storage (1.62.1) sha256=10dbf2ebda3af1b4b841335364cb889827c6cb17bf6c9f8bc5313b6bef7a4d3c
|
|
546
550
|
google-logging-utils (0.2.0) sha256=675462b4ea5affa825a3442694ca2d75d0069455a1d0956127207498fca3df7b
|
|
547
551
|
googleauth (1.17.4) sha256=acc2cac2a6011048f149c922cbc6c9675719e165aa5000c7fa3876c480fe9ae3
|
|
548
552
|
hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1
|
|
@@ -555,8 +559,8 @@ CHECKSUMS
|
|
|
555
559
|
io-event (1.22.1) sha256=0dd054cefe4a29f1b8286604f332c14f3208d75f54902961e91e94d45e5e1600
|
|
556
560
|
io-stream (0.14.0) sha256=07d9b13ea2066ccbbc761fff8d69ad5a31e47561d31e02cc271f3ed9c1a8f1cd
|
|
557
561
|
irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
|
|
558
|
-
json (
|
|
559
|
-
json-schema (6.2.
|
|
562
|
+
json (3.1.0) sha256=3ce7ccf8fde58960177a3a756c31f292a4c1e1dedee884547096a5b0604e3bd8
|
|
563
|
+
json-schema (6.2.1) sha256=c0bf6113d772348bfd159fb096950beeb1e1e25aaeea50b676bd45191d8dbdf3
|
|
560
564
|
jwt (3.3.0) sha256=44cc34fbc341c148233cf66641522b4bce0dfb1ce55e8073f05c56f44f4ee546
|
|
561
565
|
kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa
|
|
562
566
|
kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729
|
|
@@ -573,7 +577,8 @@ CHECKSUMS
|
|
|
573
577
|
msgpack (1.8.5) sha256=97419eaa7b35dfe3e462c0e6c1a3dfdcbfc8756605c09e46e4c6daef127517ba
|
|
574
578
|
multi_json (1.21.2) sha256=245531eaf54bdba57aba515ff08b4503505c5e09911daa89c5a561e2f85bea8e
|
|
575
579
|
mustache (1.1.3) sha256=75bdfeaa17e4af168fae2c262867b2992087aef39d8580965cb90d37a7d093c2
|
|
576
|
-
net-http (0.
|
|
580
|
+
net-http (0.10.0) sha256=1a2ff6e37a05724973c43f2bf7bf105f59c36a4cd0a7e9b1c021a0a566987c27
|
|
581
|
+
net-protocol (0.4.0) sha256=f9f90c8c6f64794a45160bf422177a336db12809de3beeeaa26b88fcd2e8c853
|
|
577
582
|
nkf (0.3.0) sha256=357a8dbeba38b727b75930f665146546076a394a1c243faf634ff176e3588895
|
|
578
583
|
nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f
|
|
579
584
|
nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af
|
|
@@ -586,18 +591,18 @@ CHECKSUMS
|
|
|
586
591
|
octokit (4.25.1) sha256=c02092ee82dcdfe84db0e0ea630a70d32becc54245a4f0bacfd21c010df09b96
|
|
587
592
|
openfact (6.2.1) sha256=77c682f525ce9c1a950745783205269ae565f1760b4de56abfbbe009d2e7bdd1
|
|
588
593
|
openssl (4.0.2) sha256=1037ad2868ae58df9ad917891c0c0f9815a1172f6846d4bcdd508e4c2ee747c2
|
|
589
|
-
openvox (9.
|
|
590
|
-
openvox-strings (7.
|
|
594
|
+
openvox (9.1.0)
|
|
595
|
+
openvox-strings (7.2.0) sha256=67039708e459f6a4ddad9b2694891aba31967e530f5e9d64d579d4cfecf80136
|
|
591
596
|
openvoxserver-ca (3.3.0) sha256=8cf3860b4fd1562e381256b2c2d8c4360db843e8be7c81cc3232d775d7ec9c80
|
|
592
597
|
optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
|
|
593
598
|
os (1.1.4) sha256=57816d6a334e7bd6aed048f4b0308226c5fb027433b67d90a9ab435f35108d3f
|
|
594
599
|
ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
|
|
595
600
|
packaging (0.122.3) sha256=f9e8258c30ca15a66ca32434dfcd641efb4cef4c1cbda5dac630350aa1e9b1a1
|
|
596
601
|
pandoc-ruby (2.1.10) sha256=37653d6b5e71657fb25b3cb230e6eebbfb8c925c7f1fcf69dfb6b929d12b74b2
|
|
597
|
-
parallel (2.
|
|
602
|
+
parallel (2.3.0) sha256=f75a3e904101ce6a1ccb6b8dc800cbafd42166d83330192438dcf29395167a6f
|
|
598
603
|
parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
|
|
599
604
|
pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
|
|
600
|
-
prettyprint (0.2.
|
|
605
|
+
prettyprint (0.2.1) sha256=d555d57ea6d7cf001d4774b693546a6bd88bec1e778ddffb5c60b68ceec4b7d4
|
|
601
606
|
prime (0.1.4) sha256=4d755ebf7c2994a6f3a3fee0d072063be3fff2d4042ebff6cd5eebd4747a225e
|
|
602
607
|
prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
|
|
603
608
|
process_executer (4.1.1) sha256=02e93624eb984c94282a892084781d8343d39198b983a25753c862c228f1786e
|
|
@@ -648,6 +653,7 @@ CHECKSUMS
|
|
|
648
653
|
syslog (0.4.0) sha256=c4c38ae982fe72903ec41094b5e5f2dcbbc66f510d0225c9702e5e980d827472
|
|
649
654
|
text (1.3.1) sha256=2fbbbc82c1ce79c4195b13018a87cbb00d762bda39241bb3cdc32792759dd3f4
|
|
650
655
|
thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
|
|
656
|
+
timeout (0.6.1) sha256=78f57368a7e7bbadec56971f78a3f5ecbcfb59b7fcbb0a3ed6ddc08a5094accb
|
|
651
657
|
track_open_instances (0.1.15) sha256=7f0e48821e6b4c881daaa40fb1583e308937c22a9c84883c150b399c3b5c3029
|
|
652
658
|
trailblazer-option (0.1.2) sha256=20e4f12ea4e1f718c8007e7944ca21a329eee4eed9e0fa5dde6e8ad8ac4344a3
|
|
653
659
|
tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
|
|
@@ -655,10 +661,10 @@ CHECKSUMS
|
|
|
655
661
|
uber (0.1.0) sha256=5beeb407ff807b5db994f82fa9ee07cfceaa561dad8af20be880bc67eba935dc
|
|
656
662
|
unicode-display_width (3.3.0) sha256=4b7aa66a4b11db50f6f7e98411215cd0dd10eaecb665d36eec5bcacb3fa0b613
|
|
657
663
|
unicode-emoji (4.3.0) sha256=11c02fa73290378c066bb0562cd4c87d8e1b706fbbe0059ca12746a4244de8ce
|
|
658
|
-
uri (1.1.
|
|
664
|
+
uri (1.1.2) sha256=89292e98eabbef6248b0a0ed5e7e398e152f83f17560023a6d94a7f492b169fb
|
|
659
665
|
vanagon (1.3.1)
|
|
660
666
|
vcr (6.4.0) sha256=077ac92cc16efc5904eb90492a18153b5e6ca5398046d8a249a7c96a9ea24ae6
|
|
661
|
-
webmock (3.
|
|
667
|
+
webmock (3.30.0) sha256=9d3bb917f82bb02effb95bcee36da3783232efacee7783bac4e357c6e650c136
|
|
662
668
|
webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
|
|
663
669
|
yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51
|
|
664
670
|
|
data/lib/puppet/face/epp.rb
CHANGED
|
@@ -384,7 +384,7 @@ Puppet::Face.define(:epp, '0.0.1') do
|
|
|
384
384
|
pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
|
|
385
385
|
case fmt
|
|
386
386
|
when 'json'
|
|
387
|
-
options[:pretty] ? JSON.
|
|
387
|
+
options[:pretty] ? JSON.pretty_generate(pn.to_data) : JSON.dump(pn.to_data)
|
|
388
388
|
else
|
|
389
389
|
pn.format(options[:pretty] ? Puppet::Pops::PN::Indent.new(' ') : nil, output)
|
|
390
390
|
end
|
data/lib/puppet/face/parser.rb
CHANGED
|
@@ -194,7 +194,7 @@ Puppet::Face.define(:parser, '0.0.1') do
|
|
|
194
194
|
pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
|
|
195
195
|
case fmt
|
|
196
196
|
when 'json'
|
|
197
|
-
options[:pretty] ? JSON.
|
|
197
|
+
options[:pretty] ? JSON.pretty_generate(pn.to_data) : JSON.dump(pn.to_data)
|
|
198
198
|
else
|
|
199
199
|
pn.format(options[:pretty] ? Puppet::Pops::PN::Indent.new(' ') : nil, output)
|
|
200
200
|
end
|
|
@@ -58,7 +58,7 @@ class JsonCatalogEncoder
|
|
|
58
58
|
r = possibly_filtered_catalog.resource(type, title)
|
|
59
59
|
return nil if r.nil?
|
|
60
60
|
|
|
61
|
-
r.to_data_hash
|
|
61
|
+
Puppet::Util::Json.dump(r.to_data_hash, :pretty => pretty)
|
|
62
62
|
end
|
|
63
63
|
|
|
64
64
|
# Applies a filter for virtual resources and returns filtered catalog
|
|
@@ -19,4 +19,8 @@ documents the built-in report processors.
|
|
|
19
19
|
See [About Reporting](https://docs.openvoxproject.org/openvox/latest/reporting_about.html)
|
|
20
20
|
for more details.
|
|
21
21
|
|
|
22
|
+
none
|
|
23
|
+
----
|
|
24
|
+
Discard all reports received. This is the default handler when the `reports`
|
|
25
|
+
setting is unset.
|
|
22
26
|
"
|
data/lib/puppet/reports/store.rb
CHANGED
|
@@ -11,8 +11,7 @@ Puppet::Reports.register_report(:store) do
|
|
|
11
11
|
and this just stores the file on disk, in the `reportdir` directory.
|
|
12
12
|
|
|
13
13
|
These files collect quickly -- one every half hour -- so it is a good idea
|
|
14
|
-
to perform some maintenance on them if you use this report
|
|
15
|
-
default report)."
|
|
14
|
+
to perform some maintenance on them if you use this report."
|
|
16
15
|
|
|
17
16
|
def process
|
|
18
17
|
validate_host(host)
|
data/lib/puppet/util/json.rb
CHANGED
|
@@ -18,6 +18,14 @@ module Puppet::Util
|
|
|
18
18
|
|
|
19
19
|
require 'json'
|
|
20
20
|
|
|
21
|
+
# Generator options equivalent to the `JSON::PRETTY_STATE_PROTOTYPE`
|
|
22
|
+
# that json 2.x provided and json 3 removed.
|
|
23
|
+
PRETTY_OPTIONS = { :indent => ' ', :space => ' ', :object_nl => "\n", :array_nl => "\n" }.freeze
|
|
24
|
+
|
|
25
|
+
# Generator options that json 3 rejects as unknown. `quirks_mode` has been
|
|
26
|
+
# a no-op since json 2.0, when quirks mode became the only mode.
|
|
27
|
+
OBSOLETE_DUMP_OPTIONS = [:quirks_mode].freeze
|
|
28
|
+
|
|
21
29
|
# Load the content from a file as JSON if
|
|
22
30
|
# contents are in valid format. This method does not
|
|
23
31
|
# raise error but returns `nil` when invalid file is
|
|
@@ -41,16 +49,20 @@ module Puppet::Util
|
|
|
41
49
|
def self.load(string, options = {})
|
|
42
50
|
string = string.read if string.respond_to?(:read)
|
|
43
51
|
|
|
52
|
+
options = options.dup
|
|
44
53
|
options[:symbolize_names] = true if options.delete(:symbolize_keys)
|
|
45
|
-
|
|
54
|
+
# json 3 only accepts parser options as keyword arguments
|
|
55
|
+
::JSON.parse(string, **options)
|
|
46
56
|
rescue JSON::ParserError => e
|
|
47
57
|
raise Puppet::Util::Json::ParseError.build(e, string)
|
|
48
58
|
end
|
|
49
59
|
|
|
50
60
|
def self.dump(object, options = {})
|
|
51
61
|
# Options is a state when we're being called recursively
|
|
52
|
-
|
|
53
|
-
options.
|
|
62
|
+
unless options.is_a?(JSON::State)
|
|
63
|
+
options = options.dup
|
|
64
|
+
OBSOLETE_DUMP_OPTIONS.each { |key| options.delete(key) }
|
|
65
|
+
options.merge!(PRETTY_OPTIONS) if options.delete(:pretty)
|
|
54
66
|
end
|
|
55
67
|
object.to_json(options)
|
|
56
68
|
end
|
data/lib/puppet/version.rb
CHANGED