puppet 7.1.0-universal-darwin → 7.6.1-universal-darwin

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (198) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +38 -30
  3. data/ext/build_defaults.yaml +0 -1
  4. data/lib/puppet/application.rb +10 -6
  5. data/lib/puppet/application/agent.rb +1 -0
  6. data/lib/puppet/application/apply.rb +3 -2
  7. data/lib/puppet/application/device.rb +1 -0
  8. data/lib/puppet/application/script.rb +1 -0
  9. data/lib/puppet/application/ssl.rb +11 -0
  10. data/lib/puppet/configurer.rb +16 -3
  11. data/lib/puppet/defaults.rb +14 -19
  12. data/lib/puppet/environments.rb +16 -1
  13. data/lib/puppet/face/facts.rb +26 -2
  14. data/lib/puppet/ffi/windows/api_types.rb +1 -1
  15. data/lib/puppet/ffi/windows/constants.rb +1 -1
  16. data/lib/puppet/file_serving/configuration/parser.rb +5 -2
  17. data/lib/puppet/file_system/memory_file.rb +8 -1
  18. data/lib/puppet/file_system/windows.rb +2 -0
  19. data/lib/puppet/functions.rb +1 -1
  20. data/lib/puppet/functions/partition.rb +8 -0
  21. data/lib/puppet/http/factory.rb +4 -0
  22. data/lib/puppet/indirector/facts/facter.rb +1 -0
  23. data/lib/puppet/loaders.rb +0 -4
  24. data/lib/puppet/module.rb +1 -0
  25. data/lib/puppet/module_tool/applications/installer.rb +48 -2
  26. data/lib/puppet/module_tool/errors/shared.rb +17 -2
  27. data/lib/puppet/network/formats.rb +67 -0
  28. data/lib/puppet/network/http.rb +5 -2
  29. data/lib/puppet/network/http/api.rb +10 -6
  30. data/lib/puppet/network/http/api/master.rb +3 -2
  31. data/lib/puppet/network/http/api/master/v3.rb +2 -25
  32. data/lib/puppet/network/http/api/master/v3/environments.rb +2 -33
  33. data/lib/puppet/network/http/api/server.rb +10 -0
  34. data/lib/puppet/network/http/api/server/v3.rb +39 -0
  35. data/lib/puppet/network/http/api/server/v3/environments.rb +48 -0
  36. data/lib/puppet/node/environment.rb +12 -5
  37. data/lib/puppet/parser/ast/leaf.rb +3 -2
  38. data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
  39. data/lib/puppet/pops/loader/base_loader.rb +42 -32
  40. data/lib/puppet/pops/loader/dependency_loader.rb +2 -2
  41. data/lib/puppet/pops/loader/loader.rb +15 -5
  42. data/lib/puppet/pops/loader/module_loaders.rb +8 -8
  43. data/lib/puppet/pops/loader/predefined_loader.rb +4 -0
  44. data/lib/puppet/pops/loader/runtime3_type_loader.rb +1 -1
  45. data/lib/puppet/pops/loader/static_loader.rb +4 -0
  46. data/lib/puppet/pops/loaders.rb +4 -4
  47. data/lib/puppet/pops/model/ast_transformer.rb +1 -1
  48. data/lib/puppet/pops/parser/lexer2.rb +0 -4
  49. data/lib/puppet/pops/types/p_type_set_type.rb +1 -1
  50. data/lib/puppet/pops/validation/checker4_0.rb +0 -1
  51. data/lib/puppet/property/list.rb +1 -1
  52. data/lib/puppet/provider/group/groupadd.rb +13 -8
  53. data/lib/puppet/provider/package/apt.rb +34 -2
  54. data/lib/puppet/provider/package/aptitude.rb +6 -0
  55. data/lib/puppet/provider/package/dnfmodule.rb +1 -1
  56. data/lib/puppet/provider/package/puppet_gem.rb +12 -1
  57. data/lib/puppet/provider/service/debian.rb +2 -0
  58. data/lib/puppet/provider/service/systemd.rb +1 -1
  59. data/lib/puppet/provider/user/useradd.rb +62 -8
  60. data/lib/puppet/reference/configuration.rb +6 -5
  61. data/lib/puppet/settings.rb +36 -30
  62. data/lib/puppet/settings/alias_setting.rb +37 -0
  63. data/lib/puppet/settings/environment_conf.rb +1 -0
  64. data/lib/puppet/type/package.rb +3 -3
  65. data/lib/puppet/util/autoload.rb +1 -8
  66. data/lib/puppet/util/monkey_patches.rb +7 -0
  67. data/lib/puppet/util/posix.rb +1 -1
  68. data/lib/puppet/util/windows/adsi.rb +46 -0
  69. data/lib/puppet/util/windows/principal.rb +9 -2
  70. data/lib/puppet/util/windows/sid.rb +4 -2
  71. data/lib/puppet/version.rb +1 -1
  72. data/locales/puppet.pot +166 -146
  73. data/man/man5/puppet.conf.5 +14 -6
  74. data/man/man8/puppet-agent.8 +2 -2
  75. data/man/man8/puppet-apply.8 +2 -2
  76. data/man/man8/puppet-catalog.8 +1 -1
  77. data/man/man8/puppet-config.8 +1 -1
  78. data/man/man8/puppet-describe.8 +1 -1
  79. data/man/man8/puppet-device.8 +2 -2
  80. data/man/man8/puppet-doc.8 +1 -1
  81. data/man/man8/puppet-epp.8 +1 -1
  82. data/man/man8/puppet-facts.8 +8 -2
  83. data/man/man8/puppet-filebucket.8 +1 -1
  84. data/man/man8/puppet-generate.8 +1 -1
  85. data/man/man8/puppet-help.8 +1 -1
  86. data/man/man8/puppet-lookup.8 +1 -1
  87. data/man/man8/puppet-module.8 +1 -1
  88. data/man/man8/puppet-node.8 +1 -1
  89. data/man/man8/puppet-parser.8 +1 -1
  90. data/man/man8/puppet-plugin.8 +1 -1
  91. data/man/man8/puppet-report.8 +1 -1
  92. data/man/man8/puppet-resource.8 +1 -1
  93. data/man/man8/puppet-script.8 +2 -2
  94. data/man/man8/puppet-ssl.8 +5 -1
  95. data/man/man8/puppet.8 +2 -2
  96. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
  97. data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset +9 -0
  98. data/spec/integration/application/agent_spec.rb +160 -3
  99. data/spec/integration/application/apply_spec.rb +19 -0
  100. data/spec/integration/application/plugin_spec.rb +1 -1
  101. data/spec/integration/defaults_spec.rb +0 -7
  102. data/spec/integration/http/client_spec.rb +12 -0
  103. data/spec/integration/indirector/direct_file_server_spec.rb +1 -3
  104. data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
  105. data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
  106. data/spec/integration/parser/collection_spec.rb +10 -0
  107. data/spec/integration/resource/type_collection_spec.rb +2 -6
  108. data/spec/integration/transaction_spec.rb +4 -9
  109. data/spec/integration/util/windows/adsi_spec.rb +21 -1
  110. data/spec/integration/util/windows/principal_spec.rb +21 -0
  111. data/spec/integration/util/windows/registry_spec.rb +6 -10
  112. data/spec/spec_helper.rb +12 -5
  113. data/spec/unit/agent_spec.rb +8 -6
  114. data/spec/unit/application/agent_spec.rb +0 -1
  115. data/spec/unit/application/facts_spec.rb +58 -7
  116. data/spec/unit/application/filebucket_spec.rb +0 -2
  117. data/spec/unit/application/ssl_spec.rb +23 -0
  118. data/spec/unit/application_spec.rb +17 -9
  119. data/spec/unit/confine/feature_spec.rb +1 -1
  120. data/spec/unit/confine_spec.rb +8 -2
  121. data/spec/unit/environments_spec.rb +164 -88
  122. data/spec/unit/face/node_spec.rb +0 -11
  123. data/spec/unit/file_serving/configuration/parser_spec.rb +8 -1
  124. data/spec/unit/file_serving/metadata_spec.rb +3 -3
  125. data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
  126. data/spec/unit/file_system_spec.rb +9 -0
  127. data/spec/unit/forge/module_release_spec.rb +2 -7
  128. data/spec/unit/http/factory_spec.rb +19 -0
  129. data/spec/unit/indirector/face_spec.rb +0 -1
  130. data/spec/unit/indirector/facts/facter_spec.rb +20 -5
  131. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
  132. data/spec/unit/indirector/indirection_spec.rb +8 -12
  133. data/spec/unit/indirector_spec.rb +2 -2
  134. data/spec/unit/module_spec.rb +1 -1
  135. data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
  136. data/spec/unit/network/formats_spec.rb +41 -0
  137. data/spec/unit/network/http/api/indirected_routes_spec.rb +0 -4
  138. data/spec/unit/network/http/api/master_spec.rb +38 -0
  139. data/spec/unit/network/http/api/{master → server}/v3/environments_spec.rb +2 -2
  140. data/spec/unit/network/http/api/{master → server}/v3_spec.rb +19 -19
  141. data/spec/unit/network/http/api_spec.rb +11 -11
  142. data/spec/unit/parser/compiler_spec.rb +3 -19
  143. data/spec/unit/parser/resource_spec.rb +14 -8
  144. data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
  145. data/spec/unit/pops/loaders/dependency_loader_spec.rb +1 -1
  146. data/spec/unit/pops/parser/lexer2_spec.rb +0 -4
  147. data/spec/unit/pops/types/type_parser_spec.rb +2 -1
  148. data/spec/unit/pops/validator/validator_spec.rb +20 -43
  149. data/spec/unit/property_spec.rb +1 -0
  150. data/spec/unit/provider/group/groupadd_spec.rb +5 -2
  151. data/spec/unit/provider/nameservice_spec.rb +66 -65
  152. data/spec/unit/provider/package/apt_spec.rb +28 -23
  153. data/spec/unit/provider/package/aptitude_spec.rb +1 -1
  154. data/spec/unit/provider/package/base_spec.rb +6 -5
  155. data/spec/unit/provider/package/dnfmodule_spec.rb +10 -1
  156. data/spec/unit/provider/package/pacman_spec.rb +18 -12
  157. data/spec/unit/provider/package/pip_spec.rb +6 -11
  158. data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
  159. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -0
  160. data/spec/unit/provider/service/systemd_spec.rb +11 -0
  161. data/spec/unit/provider/user/hpux_spec.rb +1 -1
  162. data/spec/unit/provider/user/useradd_spec.rb +70 -3
  163. data/spec/unit/provider_spec.rb +6 -8
  164. data/spec/unit/resource/type_spec.rb +1 -1
  165. data/spec/unit/resource_spec.rb +11 -10
  166. data/spec/unit/settings_spec.rb +13 -6
  167. data/spec/unit/ssl/base_spec.rb +0 -1
  168. data/spec/unit/ssl/certificate_request_spec.rb +4 -10
  169. data/spec/unit/ssl/ssl_provider_spec.rb +5 -2
  170. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
  171. data/spec/unit/transaction/event_manager_spec.rb +14 -11
  172. data/spec/unit/transaction_spec.rb +13 -4
  173. data/spec/unit/type/file/content_spec.rb +0 -1
  174. data/spec/unit/type/file/selinux_spec.rb +0 -2
  175. data/spec/unit/type/file_spec.rb +0 -6
  176. data/spec/unit/type/group_spec.rb +13 -6
  177. data/spec/unit/type/resources_spec.rb +7 -7
  178. data/spec/unit/type/service_spec.rb +1 -1
  179. data/spec/unit/type/tidy_spec.rb +0 -1
  180. data/spec/unit/type_spec.rb +2 -2
  181. data/spec/unit/util/at_fork_spec.rb +2 -2
  182. data/spec/unit/util/autoload_spec.rb +5 -1
  183. data/spec/unit/util/backups_spec.rb +1 -2
  184. data/spec/unit/util/execution_spec.rb +15 -11
  185. data/spec/unit/util/inifile_spec.rb +6 -14
  186. data/spec/unit/util/log_spec.rb +8 -7
  187. data/spec/unit/util/logging_spec.rb +3 -3
  188. data/spec/unit/util/posix_spec.rb +16 -10
  189. data/spec/unit/util/selinux_spec.rb +76 -52
  190. data/spec/unit/util/suidmanager_spec.rb +44 -41
  191. data/spec/unit/util/windows/sid_spec.rb +6 -0
  192. data/spec/unit/util_spec.rb +13 -6
  193. metadata +18 -16
  194. data/spec/lib/matchers/include.rb +0 -27
  195. data/spec/lib/matchers/include_spec.rb +0 -32
  196. data/spec/unit/pops/parser/parse_application_spec.rb +0 -13
  197. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -23
  198. data/spec/unit/pops/parser/parse_site_spec.rb +0 -43
@@ -158,6 +158,12 @@ describe "Puppet::Util::Windows::SID", :if => Puppet::Util::Platform.windows? do
158
158
  # this works in French Windows, even though the account is really AUTORITE NT\\Syst\u00E8me
159
159
  expect(subject.name_to_principal('NT AUTHORITY\SYSTEM').sid).to eq(sid)
160
160
  end
161
+
162
+ it "should print a debug message on failures" do
163
+ expect(Puppet).to receive(:debug).with(/Could not retrieve raw SID bytes from 'NonExistingUser'/)
164
+ expect(Puppet).to receive(:debug).with(/No mapping between account names and security IDs was done/)
165
+ subject.name_to_principal('NonExistingUser')
166
+ end
161
167
  end
162
168
 
163
169
  context "#ads_to_principal" do
@@ -309,7 +309,7 @@ describe Puppet::Util do
309
309
 
310
310
  describe "when using platform :posix" do
311
311
  before :each do
312
- allow(Puppet.features).to receive(:posix).and_return(true)
312
+ allow(Puppet.features).to receive(:posix?).and_return(true)
313
313
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
314
314
  end
315
315
 
@@ -322,7 +322,7 @@ describe Puppet::Util do
322
322
 
323
323
  describe "when using platform :windows" do
324
324
  before :each do
325
- allow(Puppet.features).to receive(:posix).and_return(false)
325
+ allow(Puppet.features).to receive(:posix?).and_return(false)
326
326
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
327
327
  end
328
328
 
@@ -456,7 +456,7 @@ describe Puppet::Util do
456
456
 
457
457
  describe "when using platform :posix" do
458
458
  before :each do
459
- allow(Puppet.features).to receive(:posix).and_return(true)
459
+ allow(Puppet.features).to receive(:posix?).and_return(true)
460
460
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
461
461
  end
462
462
 
@@ -495,7 +495,7 @@ describe Puppet::Util do
495
495
 
496
496
  describe "when using platform :windows" do
497
497
  before :each do
498
- allow(Puppet.features).to receive(:posix).and_return(false)
498
+ allow(Puppet.features).to receive(:posix?).and_return(false)
499
499
  allow(Puppet::Util::Platform).to receive(:windows?).and_return(true)
500
500
  end
501
501
 
@@ -533,7 +533,6 @@ describe Puppet::Util do
533
533
  expect(Puppet::Util.uri_to_path(URI.parse('http://foo/bar%20baz'))).to eq('/bar baz')
534
534
  end
535
535
 
536
-
537
536
  [
538
537
  "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E",
539
538
  "http://foo/A%DB%BF%E1%9A%A0%F0%A0%9C%8E".force_encoding(Encoding::ASCII)
@@ -583,7 +582,15 @@ describe Puppet::Util do
583
582
  end
584
583
  end
585
584
 
586
- describe "safe_posix_fork" do
585
+ describe "safe_posix_fork on Windows and JRuby", if: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
586
+ it "raises not implemented error" do
587
+ expect {
588
+ Puppet::Util.safe_posix_fork
589
+ }.to raise_error(NotImplementedError, /fork/)
590
+ end
591
+ end
592
+
593
+ describe "safe_posix_fork", unless: Puppet::Util::Platform.windows? || Puppet::Util::Platform.jruby? do
587
594
  let(:pid) { 5501 }
588
595
 
589
596
  before :each do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.0
4
+ version: 7.6.1
5
5
  platform: universal-darwin
6
6
  authors:
7
7
  - Puppet Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-12-14 00:00:00.000000000 Z
11
+ date: 2021-04-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: facter
@@ -720,6 +720,9 @@ files:
720
720
  - lib/puppet/network/http/api/master.rb
721
721
  - lib/puppet/network/http/api/master/v3.rb
722
722
  - lib/puppet/network/http/api/master/v3/environments.rb
723
+ - lib/puppet/network/http/api/server.rb
724
+ - lib/puppet/network/http/api/server/v3.rb
725
+ - lib/puppet/network/http/api/server/v3/environments.rb
723
726
  - lib/puppet/network/http/connection.rb
724
727
  - lib/puppet/network/http/error.rb
725
728
  - lib/puppet/network/http/handler.rb
@@ -1125,6 +1128,7 @@ files:
1125
1128
  - lib/puppet/scheduler/splay_job.rb
1126
1129
  - lib/puppet/scheduler/timer.rb
1127
1130
  - lib/puppet/settings.rb
1131
+ - lib/puppet/settings/alias_setting.rb
1128
1132
  - lib/puppet/settings/array_setting.rb
1129
1133
  - lib/puppet/settings/autosign_setting.rb
1130
1134
  - lib/puppet/settings/base_setting.rb
@@ -1368,6 +1372,7 @@ files:
1368
1372
  - man/man8/puppet.8
1369
1373
  - spec/fixtures/faulty_face/puppet/face/syntax.rb
1370
1374
  - spec/fixtures/hiera.yaml
1375
+ - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
1371
1376
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
1372
1377
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
1373
1378
  - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -1744,6 +1749,7 @@ files:
1744
1749
  - spec/fixtures/unit/provider/service/smf/svcs_instances.out
1745
1750
  - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
1746
1751
  - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
1752
+ - spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
1747
1753
  - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
1748
1754
  - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
1749
1755
  - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -1831,10 +1837,8 @@ files:
1831
1837
  - spec/integration/util/windows/user_spec.rb
1832
1838
  - spec/integration/util_spec.rb
1833
1839
  - spec/lib/matchers/containment_matchers.rb
1834
- - spec/lib/matchers/include.rb
1835
1840
  - spec/lib/matchers/include_in_order.rb
1836
1841
  - spec/lib/matchers/include_in_order_spec.rb
1837
- - spec/lib/matchers/include_spec.rb
1838
1842
  - spec/lib/matchers/json.rb
1839
1843
  - spec/lib/matchers/match_tokens2.rb
1840
1844
  - spec/lib/matchers/relationship_graph_matchers.rb
@@ -2159,8 +2163,9 @@ files:
2159
2163
  - spec/unit/network/format_support_spec.rb
2160
2164
  - spec/unit/network/formats_spec.rb
2161
2165
  - spec/unit/network/http/api/indirected_routes_spec.rb
2162
- - spec/unit/network/http/api/master/v3/environments_spec.rb
2163
- - spec/unit/network/http/api/master/v3_spec.rb
2166
+ - spec/unit/network/http/api/master_spec.rb
2167
+ - spec/unit/network/http/api/server/v3/environments_spec.rb
2168
+ - spec/unit/network/http/api/server/v3_spec.rb
2164
2169
  - spec/unit/network/http/api_spec.rb
2165
2170
  - spec/unit/network/http/connection_spec.rb
2166
2171
  - spec/unit/network/http/error_spec.rb
@@ -2223,6 +2228,7 @@ files:
2223
2228
  - spec/unit/pops/evaluator/collections_ops_spec.rb
2224
2229
  - spec/unit/pops/evaluator/comparison_ops_spec.rb
2225
2230
  - spec/unit/pops/evaluator/conditionals_spec.rb
2231
+ - spec/unit/pops/evaluator/deferred_resolver_spec.rb
2226
2232
  - spec/unit/pops/evaluator/evaluating_parser_spec.rb
2227
2233
  - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
2228
2234
  - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
@@ -2253,10 +2259,8 @@ files:
2253
2259
  - spec/unit/pops/parser/evaluating_parser_spec.rb
2254
2260
  - spec/unit/pops/parser/lexer2_spec.rb
2255
2261
  - spec/unit/pops/parser/locator_spec.rb
2256
- - spec/unit/pops/parser/parse_application_spec.rb
2257
2262
  - spec/unit/pops/parser/parse_basic_expressions_spec.rb
2258
2263
  - spec/unit/pops/parser/parse_calls_spec.rb
2259
- - spec/unit/pops/parser/parse_capabilities_spec.rb
2260
2264
  - spec/unit/pops/parser/parse_conditionals_spec.rb
2261
2265
  - spec/unit/pops/parser/parse_containers_spec.rb
2262
2266
  - spec/unit/pops/parser/parse_functions_spec.rb
@@ -2264,7 +2268,6 @@ files:
2264
2268
  - spec/unit/pops/parser/parse_lambda_spec.rb
2265
2269
  - spec/unit/pops/parser/parse_plan_spec.rb
2266
2270
  - spec/unit/pops/parser/parse_resource_spec.rb
2267
- - spec/unit/pops/parser/parse_site_spec.rb
2268
2271
  - spec/unit/pops/parser/parser_rspec_helper.rb
2269
2272
  - spec/unit/pops/parser/parser_spec.rb
2270
2273
  - spec/unit/pops/parser/parsing_typed_parameters_spec.rb
@@ -2606,6 +2609,7 @@ summary: Puppet, an automated configuration management tool
2606
2609
  test_files:
2607
2610
  - spec/fixtures/faulty_face/puppet/face/syntax.rb
2608
2611
  - spec/fixtures/hiera.yaml
2612
+ - spec/fixtures/integration/application/agent/cached_deferred_catalog.json
2609
2613
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
2610
2614
  - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
2611
2615
  - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -2982,6 +2986,7 @@ test_files:
2982
2986
  - spec/fixtures/unit/provider/service/smf/svcs_instances.out
2983
2987
  - spec/fixtures/unit/provider/service/smf/svcs_multiple_fmris.out
2984
2988
  - spec/fixtures/unit/provider/service/systemd/list_unit_files_services
2989
+ - spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset
2985
2990
  - spec/fixtures/unit/provider/user/aix/aix_passwd_file.out
2986
2991
  - spec/fixtures/unit/reports/tagmail/tagmail_email.conf
2987
2992
  - spec/fixtures/unit/reports/tagmail/tagmail_failers.conf
@@ -3069,10 +3074,8 @@ test_files:
3069
3074
  - spec/integration/util/windows/user_spec.rb
3070
3075
  - spec/integration/util_spec.rb
3071
3076
  - spec/lib/matchers/containment_matchers.rb
3072
- - spec/lib/matchers/include.rb
3073
3077
  - spec/lib/matchers/include_in_order.rb
3074
3078
  - spec/lib/matchers/include_in_order_spec.rb
3075
- - spec/lib/matchers/include_spec.rb
3076
3079
  - spec/lib/matchers/json.rb
3077
3080
  - spec/lib/matchers/match_tokens2.rb
3078
3081
  - spec/lib/matchers/relationship_graph_matchers.rb
@@ -3397,8 +3400,9 @@ test_files:
3397
3400
  - spec/unit/network/format_support_spec.rb
3398
3401
  - spec/unit/network/formats_spec.rb
3399
3402
  - spec/unit/network/http/api/indirected_routes_spec.rb
3400
- - spec/unit/network/http/api/master/v3/environments_spec.rb
3401
- - spec/unit/network/http/api/master/v3_spec.rb
3403
+ - spec/unit/network/http/api/master_spec.rb
3404
+ - spec/unit/network/http/api/server/v3/environments_spec.rb
3405
+ - spec/unit/network/http/api/server/v3_spec.rb
3402
3406
  - spec/unit/network/http/api_spec.rb
3403
3407
  - spec/unit/network/http/connection_spec.rb
3404
3408
  - spec/unit/network/http/error_spec.rb
@@ -3461,6 +3465,7 @@ test_files:
3461
3465
  - spec/unit/pops/evaluator/collections_ops_spec.rb
3462
3466
  - spec/unit/pops/evaluator/comparison_ops_spec.rb
3463
3467
  - spec/unit/pops/evaluator/conditionals_spec.rb
3468
+ - spec/unit/pops/evaluator/deferred_resolver_spec.rb
3464
3469
  - spec/unit/pops/evaluator/evaluating_parser_spec.rb
3465
3470
  - spec/unit/pops/evaluator/evaluator_rspec_helper.rb
3466
3471
  - spec/unit/pops/evaluator/json_strict_literal_evaluator_spec.rb
@@ -3491,10 +3496,8 @@ test_files:
3491
3496
  - spec/unit/pops/parser/evaluating_parser_spec.rb
3492
3497
  - spec/unit/pops/parser/lexer2_spec.rb
3493
3498
  - spec/unit/pops/parser/locator_spec.rb
3494
- - spec/unit/pops/parser/parse_application_spec.rb
3495
3499
  - spec/unit/pops/parser/parse_basic_expressions_spec.rb
3496
3500
  - spec/unit/pops/parser/parse_calls_spec.rb
3497
- - spec/unit/pops/parser/parse_capabilities_spec.rb
3498
3501
  - spec/unit/pops/parser/parse_conditionals_spec.rb
3499
3502
  - spec/unit/pops/parser/parse_containers_spec.rb
3500
3503
  - spec/unit/pops/parser/parse_functions_spec.rb
@@ -3502,7 +3505,6 @@ test_files:
3502
3505
  - spec/unit/pops/parser/parse_lambda_spec.rb
3503
3506
  - spec/unit/pops/parser/parse_plan_spec.rb
3504
3507
  - spec/unit/pops/parser/parse_resource_spec.rb
3505
- - spec/unit/pops/parser/parse_site_spec.rb
3506
3508
  - spec/unit/pops/parser/parser_rspec_helper.rb
3507
3509
  - spec/unit/pops/parser/parser_spec.rb
3508
3510
  - spec/unit/pops/parser/parsing_typed_parameters_spec.rb
@@ -1,27 +0,0 @@
1
- module Matchers; module Include
2
- extend RSpec::Matchers::DSL
3
-
4
- matcher :include_in_any_order do |*matchers|
5
- match do |enumerable|
6
- @not_matched = []
7
- expected_as_array.each do |matcher|
8
- if enumerable.empty?
9
- break
10
- end
11
-
12
- if found = enumerable.find { |elem| matcher.matches?(elem) }
13
- enumerable = enumerable.reject { |elem| elem == found }
14
- else
15
- @not_matched << matcher
16
- end
17
- end
18
-
19
-
20
- @not_matched.empty? && enumerable.empty?
21
- end
22
-
23
- failure_message do |enumerable|
24
- "did not match #{@not_matched.collect(&:description).join(', ')} in #{enumerable.inspect}: <#{@not_matched.collect(&:failure_message).join('>, <')}>"
25
- end
26
- end
27
- end; end
@@ -1,32 +0,0 @@
1
- require 'spec_helper'
2
- require 'matchers/include'
3
-
4
- describe "include matchers" do
5
- include Matchers::Include
6
-
7
- context :include_in_any_order do
8
- it "matches an empty list" do
9
- expect([]).to include_in_any_order()
10
- end
11
-
12
- it "matches a list with a single element" do
13
- expect([1]).to include_in_any_order(eq(1))
14
- end
15
-
16
- it "does not match when an expected element is missing" do
17
- expect([1]).to_not include_in_any_order(eq(2))
18
- end
19
-
20
- it "matches a list with 2 elements in a different order from the expectation" do
21
- expect([1, 2]).to include_in_any_order(eq(2), eq(1))
22
- end
23
-
24
- it "does not match when there are more than just the expected elements" do
25
- expect([1, 2]).to_not include_in_any_order(eq(1))
26
- end
27
-
28
- it "matches multiple, equal elements when there are multiple, equal exepectations" do
29
- expect([1, 1]).to include_in_any_order(eq(1), eq(1))
30
- end
31
- end
32
- end
@@ -1,13 +0,0 @@
1
- require 'spec_helper'
2
- require 'puppet/pops'
3
- require_relative 'parser_rspec_helper'
4
-
5
- describe "egrammar parsing of 'application'" do
6
- include ParserRspecHelper
7
-
8
- it "raises a syntax error" do
9
- expect {
10
- parse("application foo { }")
11
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'application' \(line: 1, column: 1\)/)
12
- end
13
- end
@@ -1,23 +0,0 @@
1
- require 'spec_helper'
2
- require 'puppet/pops'
3
- require_relative 'parser_rspec_helper'
4
-
5
- describe "egrammar parsing of capability mappings" do
6
- include ParserRspecHelper
7
-
8
- context "when parsing 'produces'" do
9
- it "raises syntax error" do
10
- expect {
11
- parse("Foo produces Sql { name => value }")
12
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'produces' \(line: 1, column: 5\)/)
13
- end
14
- end
15
-
16
- context "when parsing 'consumes'" do
17
- it "raises syntax error" do
18
- expect {
19
- parse("Foo consumes Sql { name => value }")
20
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'consumes' \(line: 1, column: 5\)/)
21
- end
22
- end
23
- end
@@ -1,43 +0,0 @@
1
- require 'spec_helper'
2
- require 'puppet/pops'
3
- require_relative 'parser_rspec_helper'
4
-
5
- describe "egrammar parsing of site expression" do
6
- include ParserRspecHelper
7
-
8
- context "when parsing 'site'" do
9
- it "raises a syntax error" do
10
- expect {
11
- parse("site { }")
12
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at 'site' \(line: 1, column: 1\)/)
13
- end
14
- end
15
-
16
- context 'When parsing collections containing application management specific keywords' do
17
- %w(application site produces consumes).each do |keyword|
18
- it "disallows the keyword '#{keyword}' in a list" do
19
- expect {
20
- parse("$a = [#{keyword}]")
21
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at '#{keyword}' \(line: 1, column: 7\)/)
22
- end
23
-
24
- it "disallows the keyword '#{keyword}' as a key in a hash" do
25
- expect {
26
- parse("$a = {#{keyword}=>'x'}")
27
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at '#{keyword}' \(line: 1, column: 7\)/)
28
- end
29
-
30
- it "disallows the keyword '#{keyword}' as a value in a hash" do
31
- expect {
32
- parse("$a = {'x'=>#{keyword}}")
33
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at '#{keyword}' \(line: 1, column: 12\)/)
34
- end
35
-
36
- it "disallows the keyword '#{keyword}' as an attribute name" do
37
- expect {
38
- parse("foo { 'x': #{keyword} => 'value' } ")
39
- }.to raise_error(Puppet::ParseErrorWithIssue, /Syntax error at '#{keyword}' \(line: 1, column: 12\)/)
40
- end
41
- end
42
- end
43
- end