puppet 6.19.0-x86-mingw32 → 7.3.0-x86-mingw32

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 (513) hide show
  1. checksums.yaml +4 -4
  2. data/CODEOWNERS +2 -16
  3. data/Gemfile +3 -4
  4. data/Gemfile.lock +33 -28
  5. data/README.md +1 -1
  6. data/conf/fileserver.conf +5 -10
  7. data/ext/build_defaults.yaml +1 -1
  8. data/ext/osx/file_mapping.yaml +0 -5
  9. data/ext/project_data.yaml +2 -14
  10. data/ext/redhat/puppet.spec.erb +0 -1
  11. data/ext/windows/service/daemon.rb +6 -5
  12. data/install.rb +21 -17
  13. data/lib/puppet.rb +11 -20
  14. data/lib/puppet/application.rb +182 -104
  15. data/lib/puppet/application/agent.rb +1 -0
  16. data/lib/puppet/application/apply.rb +3 -2
  17. data/lib/puppet/application/device.rb +101 -104
  18. data/lib/puppet/application/filebucket.rb +15 -11
  19. data/lib/puppet/application/script.rb +1 -0
  20. data/lib/puppet/application/ssl.rb +1 -1
  21. data/lib/puppet/application_support.rb +7 -0
  22. data/lib/puppet/configurer.rb +44 -36
  23. data/lib/puppet/configurer/plugin_handler.rb +21 -19
  24. data/lib/puppet/defaults.rb +71 -170
  25. data/lib/puppet/environments.rb +44 -75
  26. data/lib/puppet/face/config.rb +10 -0
  27. data/lib/puppet/face/epp.rb +12 -2
  28. data/lib/puppet/face/facts.rb +80 -6
  29. data/lib/puppet/face/help.rb +1 -1
  30. data/lib/puppet/face/node/clean.rb +8 -0
  31. data/lib/puppet/face/plugin.rb +5 -8
  32. data/lib/puppet/ffi/posix.rb +10 -0
  33. data/lib/puppet/ffi/posix/constants.rb +14 -0
  34. data/lib/puppet/ffi/posix/functions.rb +24 -0
  35. data/lib/puppet/ffi/windows.rb +12 -0
  36. data/lib/puppet/ffi/windows/api_types.rb +311 -0
  37. data/lib/puppet/ffi/windows/constants.rb +404 -0
  38. data/lib/puppet/ffi/windows/functions.rb +628 -0
  39. data/lib/puppet/ffi/windows/structs.rb +338 -0
  40. data/lib/puppet/file_serving/configuration.rb +0 -5
  41. data/lib/puppet/file_serving/configuration/parser.rb +6 -32
  42. data/lib/puppet/file_serving/http_metadata.rb +1 -1
  43. data/lib/puppet/file_serving/mount.rb +1 -2
  44. data/lib/puppet/forge/repository.rb +0 -1
  45. data/lib/puppet/functions/epp.rb +1 -0
  46. data/lib/puppet/functions/inline_epp.rb +1 -0
  47. data/lib/puppet/generate/models/type/type.rb +4 -1
  48. data/lib/puppet/http.rb +22 -13
  49. data/lib/puppet/http/client.rb +164 -114
  50. data/lib/puppet/{network/resolver.rb → http/dns.rb} +2 -2
  51. data/lib/puppet/http/errors.rb +16 -0
  52. data/lib/puppet/http/external_client.rb +5 -7
  53. data/lib/puppet/{network/http → http}/factory.rb +8 -11
  54. data/lib/puppet/{network/http → http}/pool.rb +61 -26
  55. data/lib/puppet/{network/http/session.rb → http/pool_entry.rb} +2 -3
  56. data/lib/puppet/http/proxy.rb +137 -0
  57. data/lib/puppet/http/redirector.rb +4 -12
  58. data/lib/puppet/http/resolver.rb +5 -15
  59. data/lib/puppet/http/resolver/server_list.rb +6 -10
  60. data/lib/puppet/http/resolver/settings.rb +4 -7
  61. data/lib/puppet/http/resolver/srv.rb +7 -11
  62. data/lib/puppet/http/response.rb +36 -54
  63. data/lib/puppet/http/response_converter.rb +24 -0
  64. data/lib/puppet/http/response_net_http.rb +42 -0
  65. data/lib/puppet/http/retry_after_handler.rb +4 -13
  66. data/lib/puppet/http/service.rb +12 -26
  67. data/lib/puppet/http/service/ca.rb +11 -22
  68. data/lib/puppet/http/service/compiler.rb +22 -69
  69. data/lib/puppet/http/service/file_server.rb +18 -27
  70. data/lib/puppet/http/service/puppetserver.rb +26 -12
  71. data/lib/puppet/http/service/report.rb +8 -10
  72. data/lib/puppet/http/session.rb +11 -20
  73. data/lib/puppet/{network/http → http}/site.rb +1 -2
  74. data/lib/puppet/indirector/catalog/rest.rb +2 -4
  75. data/lib/puppet/indirector/fact_search.rb +60 -0
  76. data/lib/puppet/indirector/facts/facter.rb +24 -3
  77. data/lib/puppet/indirector/facts/json.rb +27 -0
  78. data/lib/puppet/indirector/facts/rest.rb +3 -22
  79. data/lib/puppet/indirector/facts/yaml.rb +3 -58
  80. data/lib/puppet/indirector/file_bucket_file/rest.rb +3 -9
  81. data/lib/puppet/indirector/file_content/rest.rb +2 -6
  82. data/lib/puppet/indirector/file_metadata/rest.rb +3 -9
  83. data/lib/puppet/indirector/file_server.rb +1 -8
  84. data/lib/puppet/indirector/generic_http.rb +0 -11
  85. data/lib/puppet/indirector/json.rb +5 -1
  86. data/lib/puppet/indirector/node/json.rb +8 -0
  87. data/lib/puppet/indirector/node/rest.rb +2 -4
  88. data/lib/puppet/indirector/report/json.rb +34 -0
  89. data/lib/puppet/indirector/report/rest.rb +3 -8
  90. data/lib/puppet/indirector/request.rb +0 -101
  91. data/lib/puppet/indirector/rest.rb +12 -263
  92. data/lib/puppet/module_tool/applications.rb +0 -1
  93. data/lib/puppet/module_tool/applications/installer.rb +48 -2
  94. data/lib/puppet/module_tool/errors/shared.rb +17 -2
  95. data/lib/puppet/network/authconfig.rb +2 -96
  96. data/lib/puppet/network/authorization.rb +13 -35
  97. data/lib/puppet/network/formats.rb +69 -1
  98. data/lib/puppet/network/http.rb +3 -3
  99. data/lib/puppet/network/http/api/indirected_routes.rb +2 -20
  100. data/lib/puppet/network/http/api/master/v3.rb +11 -13
  101. data/lib/puppet/network/http/connection.rb +247 -316
  102. data/lib/puppet/network/http/handler.rb +0 -1
  103. data/lib/puppet/network/http_pool.rb +16 -34
  104. data/lib/puppet/node.rb +1 -30
  105. data/lib/puppet/pal/json_catalog_encoder.rb +4 -0
  106. data/lib/puppet/pal/pal_impl.rb +73 -18
  107. data/lib/puppet/parser/ast/leaf.rb +3 -2
  108. data/lib/puppet/parser/ast/pops_bridge.rb +0 -38
  109. data/lib/puppet/parser/compiler.rb +0 -198
  110. data/lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb +14 -39
  111. data/lib/puppet/parser/resource.rb +0 -69
  112. data/lib/puppet/parser/templatewrapper.rb +1 -1
  113. data/lib/puppet/pops/evaluator/deferred_resolver.rb +5 -3
  114. data/lib/puppet/pops/evaluator/evaluator_impl.rb +22 -8
  115. data/lib/puppet/pops/evaluator/runtime3_resource_support.rb +3 -3
  116. data/lib/puppet/pops/evaluator/runtime3_support.rb +1 -1
  117. data/lib/puppet/pops/issues.rb +0 -5
  118. data/lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb +6 -8
  119. data/lib/puppet/pops/model/ast.pp +0 -42
  120. data/lib/puppet/pops/model/ast.rb +0 -290
  121. data/lib/puppet/pops/model/ast_transformer.rb +1 -1
  122. data/lib/puppet/pops/model/factory.rb +0 -45
  123. data/lib/puppet/pops/model/model_label_provider.rb +0 -5
  124. data/lib/puppet/pops/model/model_tree_dumper.rb +0 -22
  125. data/lib/puppet/pops/model/pn_transformer.rb +0 -16
  126. data/lib/puppet/pops/parser/egrammar.ra +0 -56
  127. data/lib/puppet/pops/parser/eparser.rb +1520 -1712
  128. data/lib/puppet/pops/parser/lexer2.rb +4 -4
  129. data/lib/puppet/pops/parser/parser_support.rb +0 -5
  130. data/lib/puppet/pops/resource/resource_type_impl.rb +2 -24
  131. data/lib/puppet/pops/types/type_calculator.rb +0 -7
  132. data/lib/puppet/pops/types/type_parser.rb +0 -4
  133. data/lib/puppet/pops/types/types.rb +0 -1
  134. data/lib/puppet/pops/validation/checker4_0.rb +9 -37
  135. data/lib/puppet/pops/validation/tasks_checker.rb +0 -12
  136. data/lib/puppet/pops/validation/validator_factory_4_0.rb +1 -2
  137. data/lib/puppet/provider.rb +0 -13
  138. data/lib/puppet/provider/nameservice.rb +0 -18
  139. data/lib/puppet/provider/package/apt.rb +4 -0
  140. data/lib/puppet/provider/package/dpkg.rb +0 -10
  141. data/lib/puppet/provider/package/gem.rb +23 -3
  142. data/lib/puppet/provider/package/pip.rb +0 -1
  143. data/lib/puppet/provider/package/pkg.rb +0 -4
  144. data/lib/puppet/provider/package/portage.rb +1 -1
  145. data/lib/puppet/provider/package/puppet_gem.rb +1 -4
  146. data/lib/puppet/provider/service/smf.rb +191 -73
  147. data/lib/puppet/provider/user/aix.rb +2 -2
  148. data/lib/puppet/provider/user/directoryservice.rb +0 -10
  149. data/lib/puppet/reference/configuration.rb +8 -5
  150. data/lib/puppet/reference/indirection.rb +1 -1
  151. data/lib/puppet/resource.rb +1 -89
  152. data/lib/puppet/resource/catalog.rb +1 -14
  153. data/lib/puppet/resource/type.rb +3 -119
  154. data/lib/puppet/resource/type_collection.rb +3 -48
  155. data/lib/puppet/runtime.rb +1 -2
  156. data/lib/puppet/settings.rb +88 -48
  157. data/lib/puppet/settings/alias_setting.rb +37 -0
  158. data/lib/puppet/settings/base_setting.rb +26 -2
  159. data/lib/puppet/settings/integer_setting.rb +17 -0
  160. data/lib/puppet/settings/port_setting.rb +15 -0
  161. data/lib/puppet/settings/priority_setting.rb +5 -4
  162. data/lib/puppet/ssl.rb +10 -6
  163. data/lib/puppet/ssl/base.rb +3 -5
  164. data/lib/puppet/ssl/certificate.rb +0 -6
  165. data/lib/puppet/ssl/certificate_request.rb +1 -12
  166. data/lib/puppet/ssl/certificate_signer.rb +6 -0
  167. data/lib/puppet/ssl/oids.rb +3 -1
  168. data/lib/puppet/ssl/ssl_provider.rb +17 -0
  169. data/lib/puppet/ssl/state_machine.rb +3 -1
  170. data/lib/puppet/ssl/verifier.rb +2 -0
  171. data/lib/puppet/test/test_helper.rb +1 -3
  172. data/lib/puppet/transaction.rb +1 -7
  173. data/lib/puppet/transaction/report.rb +2 -4
  174. data/lib/puppet/type.rb +0 -76
  175. data/lib/puppet/type/file.rb +5 -7
  176. data/lib/puppet/type/file/checksum.rb +1 -1
  177. data/lib/puppet/type/file/source.rb +1 -1
  178. data/lib/puppet/type/filebucket.rb +3 -3
  179. data/lib/puppet/type/package.rb +5 -13
  180. data/lib/puppet/type/user.rb +1 -1
  181. data/lib/puppet/util/autoload.rb +1 -8
  182. data/lib/puppet/util/execution.rb +0 -11
  183. data/lib/puppet/util/http_proxy.rb +2 -215
  184. data/lib/puppet/util/monkey_patches.rb +0 -46
  185. data/lib/puppet/util/posix.rb +54 -5
  186. data/lib/puppet/util/rdoc.rb +0 -7
  187. data/lib/puppet/util/retry_action.rb +1 -1
  188. data/lib/puppet/util/rubygems.rb +5 -1
  189. data/lib/puppet/util/run_mode.rb +9 -1
  190. data/lib/puppet/util/windows.rb +3 -8
  191. data/lib/puppet/util/windows/daemon.rb +360 -0
  192. data/lib/puppet/util/windows/error.rb +1 -0
  193. data/lib/puppet/util/windows/eventlog.rb +4 -9
  194. data/lib/puppet/util/windows/file.rb +8 -242
  195. data/lib/puppet/util/windows/monkey_patches/process.rb +414 -0
  196. data/lib/puppet/util/windows/process.rb +4 -226
  197. data/lib/puppet/util/windows/service.rb +9 -460
  198. data/lib/puppet/util/windows/string.rb +12 -13
  199. data/lib/puppet/util/yaml.rb +0 -22
  200. data/lib/puppet/vendor/require_vendored.rb +0 -1
  201. data/lib/puppet/version.rb +1 -1
  202. data/lib/puppet/x509.rb +5 -1
  203. data/lib/puppet/x509/cert_provider.rb +29 -1
  204. data/locales/puppet.pot +629 -1314
  205. data/man/man5/puppet.conf.5 +39 -99
  206. data/man/man8/puppet-agent.8 +2 -2
  207. data/man/man8/puppet-apply.8 +2 -2
  208. data/man/man8/puppet-catalog.8 +1 -1
  209. data/man/man8/puppet-config.8 +1 -1
  210. data/man/man8/puppet-describe.8 +1 -1
  211. data/man/man8/puppet-device.8 +2 -2
  212. data/man/man8/puppet-doc.8 +1 -1
  213. data/man/man8/puppet-epp.8 +1 -1
  214. data/man/man8/puppet-facts.8 +58 -9
  215. data/man/man8/puppet-filebucket.8 +6 -6
  216. data/man/man8/puppet-generate.8 +1 -1
  217. data/man/man8/puppet-help.8 +1 -1
  218. data/man/man8/puppet-lookup.8 +1 -1
  219. data/man/man8/puppet-module.8 +1 -58
  220. data/man/man8/puppet-node.8 +4 -1
  221. data/man/man8/puppet-parser.8 +1 -1
  222. data/man/man8/puppet-plugin.8 +1 -1
  223. data/man/man8/puppet-report.8 +4 -1
  224. data/man/man8/puppet-resource.8 +1 -1
  225. data/man/man8/puppet-script.8 +2 -2
  226. data/man/man8/puppet-ssl.8 +1 -1
  227. data/man/man8/puppet.8 +2 -2
  228. data/spec/fixtures/integration/application/agent/cached_deferred_catalog.json +91 -0
  229. data/spec/fixtures/unit/provider/service/smf/{svcs.out → svcs_instances.out} +0 -0
  230. data/spec/fixtures/unit/provider/user/aix/aix_passwd_file.out +4 -0
  231. data/spec/integration/application/agent_spec.rb +151 -14
  232. data/spec/integration/application/apply_spec.rb +20 -1
  233. data/spec/integration/application/filebucket_spec.rb +16 -16
  234. data/spec/integration/application/help_spec.rb +2 -0
  235. data/spec/integration/application/plugin_spec.rb +23 -1
  236. data/spec/integration/defaults_spec.rb +7 -10
  237. data/spec/integration/environments/setting_hooks_spec.rb +1 -1
  238. data/spec/integration/indirector/file_content/file_server_spec.rb +0 -2
  239. data/spec/integration/indirector/file_metadata/file_server_spec.rb +0 -2
  240. data/spec/integration/network/http_pool_spec.rb +3 -21
  241. data/spec/integration/parser/catalog_spec.rb +0 -38
  242. data/spec/integration/parser/node_spec.rb +0 -9
  243. data/spec/integration/parser/pcore_resource_spec.rb +0 -37
  244. data/spec/integration/resource/type_collection_spec.rb +2 -6
  245. data/spec/integration/transaction_spec.rb +4 -9
  246. data/spec/integration/type/file_spec.rb +5 -4
  247. data/spec/integration/util/windows/adsi_spec.rb +3 -1
  248. data/spec/integration/util/windows/monkey_patches/process_spec.rb +231 -0
  249. data/spec/integration/util/windows/registry_spec.rb +0 -10
  250. data/spec/integration/util/windows/security_spec.rb +1 -1
  251. data/spec/lib/puppet_spec/puppetserver.rb +1 -1
  252. data/spec/lib/puppet_spec/settings.rb +7 -1
  253. data/spec/spec_helper.rb +3 -4
  254. data/spec/unit/agent_spec.rb +8 -8
  255. data/spec/unit/application/agent_spec.rb +0 -1
  256. data/spec/unit/application/config_spec.rb +224 -4
  257. data/spec/unit/application/facts_spec.rb +35 -0
  258. data/spec/unit/application/filebucket_spec.rb +41 -41
  259. data/spec/unit/application/ssl_spec.rb +2 -2
  260. data/spec/unit/application_spec.rb +51 -9
  261. data/spec/unit/certificate_factory_spec.rb +1 -1
  262. data/spec/unit/configurer/downloader_spec.rb +6 -2
  263. data/spec/unit/configurer/plugin_handler_spec.rb +56 -18
  264. data/spec/unit/configurer_spec.rb +12 -9
  265. data/spec/unit/confine/feature_spec.rb +1 -1
  266. data/spec/unit/confine_spec.rb +8 -2
  267. data/spec/unit/context/trusted_information_spec.rb +2 -6
  268. data/spec/unit/defaults_spec.rb +26 -32
  269. data/spec/unit/environments_spec.rb +96 -22
  270. data/spec/unit/face/config_spec.rb +27 -32
  271. data/spec/unit/face/facts_spec.rb +4 -0
  272. data/spec/unit/face/node_spec.rb +14 -13
  273. data/spec/unit/face/plugin_spec.rb +73 -33
  274. data/spec/unit/file_bucket/file_spec.rb +1 -1
  275. data/spec/unit/file_serving/configuration/parser_spec.rb +22 -19
  276. data/spec/unit/file_serving/configuration_spec.rb +6 -12
  277. data/spec/unit/file_serving/metadata_spec.rb +3 -3
  278. data/spec/unit/file_serving/terminus_helper_spec.rb +11 -4
  279. data/spec/unit/forge/module_release_spec.rb +2 -7
  280. data/spec/unit/functions/camelcase_spec.rb +1 -1
  281. data/spec/unit/functions/capitalize_spec.rb +1 -1
  282. data/spec/unit/functions/downcase_spec.rb +1 -1
  283. data/spec/unit/functions/inline_epp_spec.rb +26 -1
  284. data/spec/unit/functions/upcase_spec.rb +1 -1
  285. data/spec/unit/http/client_spec.rb +7 -8
  286. data/spec/unit/{network/resolver_spec.rb → http/dns_spec.rb} +3 -3
  287. data/spec/unit/http/external_client_spec.rb +4 -4
  288. data/spec/unit/{network/http → http}/factory_spec.rb +5 -11
  289. data/spec/unit/{network/http/session_spec.rb → http/pool_entry_spec.rb} +3 -3
  290. data/spec/unit/{network/http → http}/pool_spec.rb +12 -17
  291. data/spec/unit/{util/http_proxy_spec.rb → http/proxy_spec.rb} +2 -69
  292. data/spec/unit/http/resolver_spec.rb +13 -13
  293. data/spec/unit/http/service/compiler_spec.rb +49 -62
  294. data/spec/unit/http/service/file_server_spec.rb +3 -3
  295. data/spec/unit/http/service/puppetserver_spec.rb +34 -4
  296. data/spec/unit/http/service_spec.rb +1 -2
  297. data/spec/unit/http/session_spec.rb +16 -14
  298. data/spec/unit/{network/http → http}/site_spec.rb +3 -3
  299. data/spec/unit/indirector/face_spec.rb +0 -1
  300. data/spec/unit/indirector/facts/facter_spec.rb +104 -1
  301. data/spec/unit/indirector/facts/json_spec.rb +255 -0
  302. data/spec/unit/indirector/file_bucket_file/file_spec.rb +5 -3
  303. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +26 -8
  304. data/spec/unit/indirector/file_content/rest_spec.rb +0 -4
  305. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -4
  306. data/spec/unit/indirector/file_server_spec.rb +1 -15
  307. data/spec/unit/indirector/indirection_spec.rb +8 -12
  308. data/spec/unit/indirector/node/json_spec.rb +33 -0
  309. data/spec/{integration/indirector/report/yaml.rb → unit/indirector/report/json_spec.rb} +13 -24
  310. data/spec/unit/indirector/report/rest_spec.rb +2 -17
  311. data/spec/unit/indirector/report/yaml_spec.rb +72 -8
  312. data/spec/unit/indirector/request_spec.rb +0 -264
  313. data/spec/unit/indirector/rest_spec.rb +98 -752
  314. data/spec/unit/indirector_spec.rb +2 -2
  315. data/spec/unit/module_tool/applications/installer_spec.rb +66 -0
  316. data/spec/unit/network/authconfig_spec.rb +2 -132
  317. data/spec/unit/network/authorization_spec.rb +2 -55
  318. data/spec/unit/network/formats_spec.rb +45 -4
  319. data/spec/unit/network/http/api/indirected_routes_spec.rb +1 -101
  320. data/spec/unit/network/http/api/master/v3_spec.rb +28 -7
  321. data/spec/unit/network/http/api_spec.rb +10 -0
  322. data/spec/unit/network/http/connection_spec.rb +19 -41
  323. data/spec/unit/network/http/handler_spec.rb +0 -6
  324. data/spec/unit/network/http_pool_spec.rb +0 -4
  325. data/spec/unit/node/environment_spec.rb +33 -21
  326. data/spec/unit/node_spec.rb +2 -54
  327. data/spec/unit/parser/compiler_spec.rb +3 -19
  328. data/spec/unit/parser/functions/create_resources_spec.rb +2 -20
  329. data/spec/unit/parser/resource_spec.rb +14 -8
  330. data/spec/unit/parser/templatewrapper_spec.rb +4 -3
  331. data/spec/unit/pops/evaluator/deferred_resolver_spec.rb +20 -0
  332. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +4 -7
  333. data/spec/unit/pops/loaders/loaders_spec.rb +6 -21
  334. data/spec/unit/pops/parser/parse_application_spec.rb +4 -22
  335. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  336. data/spec/unit/pops/parser/parse_capabilities_spec.rb +8 -21
  337. data/spec/unit/pops/parser/parse_site_spec.rb +20 -24
  338. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -71
  339. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  340. data/spec/unit/pops/types/type_calculator_spec.rb +6 -6
  341. data/spec/unit/pops/types/type_factory_spec.rb +1 -1
  342. data/spec/unit/pops/validator/validator_spec.rb +61 -46
  343. data/spec/unit/pops/visitor_spec.rb +1 -1
  344. data/spec/unit/property_spec.rb +1 -0
  345. data/spec/unit/provider/nameservice_spec.rb +66 -122
  346. data/spec/unit/provider/package/apt_spec.rb +4 -8
  347. data/spec/unit/provider/package/base_spec.rb +6 -5
  348. data/spec/unit/provider/package/dpkg_spec.rb +0 -48
  349. data/spec/unit/provider/package/gem_spec.rb +32 -0
  350. data/spec/unit/provider/package/pacman_spec.rb +18 -12
  351. data/spec/unit/provider/package/pip_spec.rb +6 -11
  352. data/spec/unit/provider/package/pkgdmg_spec.rb +0 -4
  353. data/spec/unit/provider/package/puppet_gem_spec.rb +3 -2
  354. data/spec/unit/provider/service/smf_spec.rb +401 -165
  355. data/spec/unit/provider/service/windows_spec.rb +0 -1
  356. data/spec/unit/provider/user/aix_spec.rb +5 -0
  357. data/spec/unit/provider/user/hpux_spec.rb +1 -1
  358. data/spec/unit/provider/user/pw_spec.rb +2 -0
  359. data/spec/unit/provider/user/useradd_spec.rb +1 -0
  360. data/spec/unit/provider_spec.rb +6 -20
  361. data/spec/unit/puppet_pal_catalog_spec.rb +45 -0
  362. data/spec/unit/resource/type_collection_spec.rb +2 -22
  363. data/spec/unit/resource/type_spec.rb +1 -1
  364. data/spec/unit/resource_spec.rb +11 -66
  365. data/spec/unit/settings/http_extra_headers_spec.rb +2 -4
  366. data/spec/unit/settings/integer_setting_spec.rb +42 -0
  367. data/spec/unit/settings/port_setting_spec.rb +31 -0
  368. data/spec/unit/settings/priority_setting_spec.rb +4 -4
  369. data/spec/unit/settings_spec.rb +560 -228
  370. data/spec/unit/ssl/base_spec.rb +36 -4
  371. data/spec/unit/ssl/certificate_request_spec.rb +15 -45
  372. data/spec/unit/ssl/certificate_spec.rb +2 -11
  373. data/spec/unit/ssl/ssl_provider_spec.rb +14 -8
  374. data/spec/unit/ssl/state_machine_spec.rb +0 -1
  375. data/spec/unit/ssl/verifier_spec.rb +0 -21
  376. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -7
  377. data/spec/unit/transaction/event_manager_spec.rb +14 -11
  378. data/spec/unit/transaction/report_spec.rb +0 -2
  379. data/spec/unit/transaction/resource_harness_spec.rb +2 -2
  380. data/spec/unit/transaction_spec.rb +57 -82
  381. data/spec/unit/type/file/checksum_spec.rb +6 -6
  382. data/spec/unit/type/file/content_spec.rb +1 -2
  383. data/spec/unit/type/file/ensure_spec.rb +1 -1
  384. data/spec/unit/type/file/mode_spec.rb +1 -1
  385. data/spec/unit/type/file/selinux_spec.rb +0 -2
  386. data/spec/unit/type/file/source_spec.rb +0 -1
  387. data/spec/unit/type/file_spec.rb +12 -12
  388. data/spec/unit/type/group_spec.rb +13 -6
  389. data/spec/unit/type/package_spec.rb +1 -1
  390. data/spec/unit/type/resources_spec.rb +7 -7
  391. data/spec/unit/type/service_spec.rb +1 -1
  392. data/spec/unit/type/tidy_spec.rb +0 -1
  393. data/spec/unit/type_spec.rb +22 -2
  394. data/spec/unit/util/at_fork_spec.rb +2 -2
  395. data/spec/unit/util/autoload_spec.rb +5 -1
  396. data/spec/unit/util/backups_spec.rb +1 -4
  397. data/spec/unit/util/execution_spec.rb +15 -40
  398. data/spec/unit/util/inifile_spec.rb +6 -14
  399. data/spec/unit/util/log_spec.rb +8 -7
  400. data/spec/unit/util/logging_spec.rb +3 -3
  401. data/spec/unit/util/monkey_patches_spec.rb +0 -6
  402. data/spec/unit/util/posix_spec.rb +363 -15
  403. data/spec/unit/util/rubygems_spec.rb +2 -2
  404. data/spec/unit/util/run_mode_spec.rb +21 -121
  405. data/spec/unit/util/selinux_spec.rb +76 -52
  406. data/spec/unit/util/storage_spec.rb +3 -1
  407. data/spec/unit/util/suidmanager_spec.rb +44 -41
  408. data/spec/unit/util/windows/string_spec.rb +1 -3
  409. data/spec/unit/util/yaml_spec.rb +0 -54
  410. data/spec/unit/util_spec.rb +13 -24
  411. metadata +66 -226
  412. data/conf/auth.conf +0 -150
  413. data/lib/puppet/application/cert.rb +0 -76
  414. data/lib/puppet/application/key.rb +0 -4
  415. data/lib/puppet/application/man.rb +0 -4
  416. data/lib/puppet/application/status.rb +0 -4
  417. data/lib/puppet/face/key.rb +0 -16
  418. data/lib/puppet/face/man.rb +0 -145
  419. data/lib/puppet/face/module/build.rb +0 -14
  420. data/lib/puppet/face/module/generate.rb +0 -14
  421. data/lib/puppet/face/module/search.rb +0 -103
  422. data/lib/puppet/face/status.rb +0 -51
  423. data/lib/puppet/indirector/certificate/file.rb +0 -9
  424. data/lib/puppet/indirector/certificate/rest.rb +0 -18
  425. data/lib/puppet/indirector/certificate_request/file.rb +0 -9
  426. data/lib/puppet/indirector/certificate_request/memory.rb +0 -7
  427. data/lib/puppet/indirector/certificate_request/rest.rb +0 -11
  428. data/lib/puppet/indirector/file_content/http.rb +0 -22
  429. data/lib/puppet/indirector/key/file.rb +0 -46
  430. data/lib/puppet/indirector/key/memory.rb +0 -7
  431. data/lib/puppet/indirector/ssl_file.rb +0 -162
  432. data/lib/puppet/indirector/status.rb +0 -3
  433. data/lib/puppet/indirector/status/local.rb +0 -12
  434. data/lib/puppet/indirector/status/rest.rb +0 -27
  435. data/lib/puppet/module_tool/applications/searcher.rb +0 -29
  436. data/lib/puppet/network/auth_config_parser.rb +0 -90
  437. data/lib/puppet/network/authstore.rb +0 -283
  438. data/lib/puppet/network/http/api/master/v3/authorization.rb +0 -18
  439. data/lib/puppet/network/http/api/master/v3/environment.rb +0 -88
  440. data/lib/puppet/network/http/base_pool.rb +0 -36
  441. data/lib/puppet/network/http/compression.rb +0 -127
  442. data/lib/puppet/network/http/connection_adapter.rb +0 -184
  443. data/lib/puppet/network/http/nocache_pool.rb +0 -28
  444. data/lib/puppet/network/rest_controller.rb +0 -2
  445. data/lib/puppet/network/rights.rb +0 -210
  446. data/lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb +0 -66
  447. data/lib/puppet/parser/compiler/catalog_validator/site_validator.rb +0 -22
  448. data/lib/puppet/parser/environment_compiler.rb +0 -202
  449. data/lib/puppet/pops/types/enumeration.rb +0 -16
  450. data/lib/puppet/resource/capability_finder.rb +0 -154
  451. data/lib/puppet/rest/errors.rb +0 -15
  452. data/lib/puppet/rest/response.rb +0 -35
  453. data/lib/puppet/rest/route.rb +0 -85
  454. data/lib/puppet/rest/routes.rb +0 -135
  455. data/lib/puppet/ssl/host.rb +0 -505
  456. data/lib/puppet/ssl/key.rb +0 -61
  457. data/lib/puppet/ssl/validator.rb +0 -61
  458. data/lib/puppet/ssl/validator/default_validator.rb +0 -209
  459. data/lib/puppet/ssl/validator/no_validator.rb +0 -22
  460. data/lib/puppet/ssl/verifier_adapter.rb +0 -58
  461. data/lib/puppet/status.rb +0 -40
  462. data/lib/puppet/util/connection.rb +0 -88
  463. data/lib/puppet/util/ssl.rb +0 -83
  464. data/lib/puppet/util/windows/api_types.rb +0 -309
  465. data/lib/puppet/util/windows/monkey_patches/dir.rb +0 -40
  466. data/lib/puppet/vendor/load_pathspec.rb +0 -1
  467. data/lib/puppet/vendor/pathspec/CHANGELOG.md +0 -2
  468. data/lib/puppet/vendor/pathspec/LICENSE +0 -201
  469. data/lib/puppet/vendor/pathspec/PUPPET_README.md +0 -6
  470. data/lib/puppet/vendor/pathspec/README.md +0 -53
  471. data/lib/puppet/vendor/pathspec/lib/pathspec.rb +0 -122
  472. data/lib/puppet/vendor/pathspec/lib/pathspec/gitignorespec.rb +0 -275
  473. data/lib/puppet/vendor/pathspec/lib/pathspec/regexspec.rb +0 -17
  474. data/lib/puppet/vendor/pathspec/lib/pathspec/spec.rb +0 -14
  475. data/man/man8/puppet-key.8 +0 -126
  476. data/man/man8/puppet-man.8 +0 -76
  477. data/man/man8/puppet-status.8 +0 -108
  478. data/spec/integration/application/config_spec.rb +0 -74
  479. data/spec/integration/network/authconfig_spec.rb +0 -256
  480. data/spec/integration/util/windows/monkey_patches/dir_spec.rb +0 -11
  481. data/spec/unit/application/man_spec.rb +0 -52
  482. data/spec/unit/capability_spec.rb +0 -414
  483. data/spec/unit/face/catalog_spec.rb +0 -6
  484. data/spec/unit/face/key_spec.rb +0 -9
  485. data/spec/unit/face/module/search_spec.rb +0 -231
  486. data/spec/unit/face/module_spec.rb +0 -3
  487. data/spec/unit/face/status_spec.rb +0 -9
  488. data/spec/unit/indirector/certificate/file_spec.rb +0 -14
  489. data/spec/unit/indirector/certificate/rest_spec.rb +0 -61
  490. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -14
  491. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -25
  492. data/spec/unit/indirector/key/file_spec.rb +0 -79
  493. data/spec/unit/indirector/ssl_file_spec.rb +0 -305
  494. data/spec/unit/indirector/status/local_spec.rb +0 -10
  495. data/spec/unit/indirector/status/rest_spec.rb +0 -50
  496. data/spec/unit/module_tool/applications/searcher_spec.rb +0 -38
  497. data/spec/unit/network/auth_config_parser_spec.rb +0 -115
  498. data/spec/unit/network/authstore_spec.rb +0 -422
  499. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +0 -57
  500. data/spec/unit/network/http/api/master/v3/environment_spec.rb +0 -185
  501. data/spec/unit/network/http/compression_spec.rb +0 -240
  502. data/spec/unit/network/http/nocache_pool_spec.rb +0 -64
  503. data/spec/unit/network/http_spec.rb +0 -9
  504. data/spec/unit/network/rights_spec.rb +0 -439
  505. data/spec/unit/parser/environment_compiler_spec.rb +0 -730
  506. data/spec/unit/pops/types/enumeration_spec.rb +0 -51
  507. data/spec/unit/resource/capability_finder_spec.rb +0 -143
  508. data/spec/unit/rest/route_spec.rb +0 -132
  509. data/spec/unit/ssl/host_spec.rb +0 -650
  510. data/spec/unit/ssl/key_spec.rb +0 -173
  511. data/spec/unit/ssl/validator_spec.rb +0 -278
  512. data/spec/unit/status_spec.rb +0 -45
  513. data/spec/unit/util/ssl_spec.rb +0 -91
@@ -257,31 +257,13 @@ describe 'function for dynamically creating resources' do
257
257
  expect(catalog.resource(:class, "bar")).not_to be_nil
258
258
  end
259
259
 
260
- [:off, :warning].each do | strictness |
261
- it "should warn if strict = #{strictness} and class is exported" do
262
- Puppet[:strict] = strictness
263
- collect_notices('class test{} create_resources("@@class", {test => {}})')
264
- expect(warnings).to include(/Classes are not virtualizable/)
265
- end
266
- end
267
-
268
- it 'should error if strict = error and class is exported' do
269
- Puppet[:strict] = :error
260
+ it 'should error if class is exported' do
270
261
  expect{
271
262
  compile_to_catalog('class test{} create_resources("@@class", {test => {}})')
272
263
  }.to raise_error(/Classes are not virtualizable/)
273
264
  end
274
265
 
275
- [:off, :warning].each do | strictness |
276
- it "should warn if strict = #{strictness} and class is virtual" do
277
- Puppet[:strict] = strictness
278
- collect_notices('class test{} create_resources("@class", {test => {}})')
279
- expect(warnings).to include(/Classes are not virtualizable/)
280
- end
281
- end
282
-
283
- it 'should error if strict = error and class is virtual' do
284
- Puppet[:strict] = :error
266
+ it 'should error if class is virtual' do
285
267
  expect{
286
268
  compile_to_catalog('class test{} create_resources("@class", {test => {}})')
287
269
  }.to raise_error(/Classes are not virtualizable/)
@@ -418,22 +418,27 @@ describe Puppet::Parser::Resource do
418
418
  end
419
419
 
420
420
  describe "when merging overrides" do
421
+ def resource_type(name)
422
+ double(name, :child_of? => false)
423
+ end
424
+
421
425
  before do
422
- @source = "source1"
426
+ @source = resource_type("source1")
423
427
  @resource = mkresource :source => @source
424
428
  @override = mkresource :source => @source
425
429
  end
426
430
 
427
431
  it "should fail when the override was not created by a parent class" do
428
- @override.source = "source2"
429
- expect(@override.source).to receive(:child_of?).with("source1").and_return(false)
432
+ @override.source = resource_type("source2")
433
+ expect(@override.source).to receive(:child_of?).with(@source).and_return(false)
430
434
  expect { @resource.merge(@override) }.to raise_error(Puppet::ParseError)
431
435
  end
432
436
 
433
437
  it "should succeed when the override was created in the current scope" do
434
- @resource.source = "source3"
438
+ @source3 = resource_type("source3")
439
+ @resource.source = @source3
435
440
  @override.source = @resource.source
436
- expect(@override.source).not_to receive(:child_of?).with("source3")
441
+ expect(@override.source).not_to receive(:child_of?).with(@source3)
437
442
  params = {:a => :b, :c => :d}
438
443
  expect(@override).to receive(:parameters).and_return(params)
439
444
  expect(@resource).to receive(:override_parameter).with(:b)
@@ -442,9 +447,10 @@ describe Puppet::Parser::Resource do
442
447
  end
443
448
 
444
449
  it "should succeed when a parent class created the override" do
445
- @resource.source = "source3"
446
- @override.source = "source4"
447
- expect(@override.source).to receive(:child_of?).with("source3").and_return(true)
450
+ @source3 = resource_type("source3")
451
+ @resource.source = @source3
452
+ @override.source = resource_type("source4")
453
+ expect(@override.source).to receive(:child_of?).with(@source3).and_return(true)
448
454
  params = {:a => :b, :c => :d}
449
455
  expect(@override).to receive(:parameters).and_return(params)
450
456
  expect(@resource).to receive(:override_parameter).with(:b)
@@ -57,9 +57,10 @@ describe Puppet::Parser::TemplateWrapper do
57
57
  expect(tw.all_tags).to eq(["tag1","tag2"])
58
58
  end
59
59
 
60
- it "provides the tags defined in the current scope with #tags" do
61
- expect(scope).to receive(:tags).and_return(["tag1", "tag2"])
62
- expect(tw.tags).to eq(["tag1","tag2"])
60
+ it "raises not implemented error" do
61
+ expect {
62
+ tw.tags
63
+ }.to raise_error(NotImplementedError, /Call 'all_tags' instead/)
63
64
  end
64
65
 
65
66
  it "raises error on access to removed in-scope variables via method calls" do
@@ -0,0 +1,20 @@
1
+ require 'spec_helper'
2
+ require 'puppet_spec/compiler'
3
+
4
+ describe Puppet::Pops::Evaluator::DeferredResolver do
5
+ include PuppetSpec::Compiler
6
+
7
+ let(:environment) { Puppet::Node::Environment.create(:testing, []) }
8
+ let(:facts) { Puppet::Node::Facts.new('node.example.com') }
9
+
10
+ it 'resolves deferred values in a catalog' do
11
+ catalog = compile_to_catalog(<<~END)
12
+ notify { "deferred":
13
+ message => Deferred("join", [[1,2,3], ":"])
14
+ }
15
+ END
16
+ described_class.resolve_and_replace(facts, catalog)
17
+
18
+ expect(catalog.resource(:notify, 'deferred')[:message]).to eq('1:2:3')
19
+ end
20
+ end
@@ -818,14 +818,11 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
818
818
  end
819
819
  end
820
820
 
821
- # Integer for >= 2.4.0, otherwise Fixnum
822
- int_class_name = 0.class.name
823
-
824
821
  # Errors when wrong number/type of keys are used
825
822
  {
826
- "Array[0]" => "Array-Type[] arguments must be types. Got #{int_class_name}",
827
- "Hash[0]" => "Hash-Type[] arguments must be types. Got #{int_class_name}",
828
- "Hash[Integer, 0]" => "Hash-Type[] arguments must be types. Got #{int_class_name}",
823
+ "Array[0]" => "Array-Type[] arguments must be types. Got Integer",
824
+ "Hash[0]" => "Hash-Type[] arguments must be types. Got Integer",
825
+ "Hash[Integer, 0]" => "Hash-Type[] arguments must be types. Got Integer",
829
826
  "Array[Integer,1,2,3]" => 'Array-Type[] accepts 1 to 3 arguments. Got 4',
830
827
  "Array[Integer,String]" => "A Type's size constraint arguments must be a single Integer type, or 1-2 integers (or default). Got a String-Type",
831
828
  "Hash[Integer,String, 1,2,3]" => 'Hash-Type[] accepts 2 to 4 arguments. Got 5',
@@ -833,7 +830,7 @@ describe 'Puppet::Pops::Evaluator::EvaluatorImpl' do
833
830
  "'abc'[1.0]" => "A substring operation does not accept a Float as a character index. Expected an Integer",
834
831
  "'abc'[1, x]" => "A substring operation does not accept a String as a character index. Expected an Integer",
835
832
  "'abc'[1,2,3]" => "String supports [] with one or two arguments. Got 3",
836
- "NotUndef[0]" => "NotUndef-Type[] argument must be a Type or a String. Got #{int_class_name}",
833
+ "NotUndef[0]" => "NotUndef-Type[] argument must be a Type or a String. Got Integer",
837
834
  "NotUndef[a,b]" => 'NotUndef-Type[] accepts 0 to 1 arguments. Got 2',
838
835
  "Resource[0]" => 'First argument to Resource[] must be a resource type or a String. Got Integer',
839
836
  "Resource[a, 0]" => 'Error creating type specialization of a Resource-Type, Cannot use Integer where a resource title String is expected',
@@ -575,27 +575,6 @@ describe 'loaders' do
575
575
  end
576
576
  end
577
577
 
578
- context 'when a 3x load has illegal construct and --func3x_check is false' do
579
- let(:env) { environment_for(mix_4x_and_3x_functions) }
580
- let(:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new("test", :environment => env)) }
581
- let(:scope) { compiler.topscope }
582
- let(:loader) { compiler.loaders.private_loader_for_module('user') }
583
-
584
- before(:each) do
585
- Puppet.push_context(:current_environment => scope.environment, :global_scope => scope, :loaders => compiler.loaders)
586
- Puppet[:func3x_check] = false
587
- end
588
- after(:each) do
589
- Puppet.pop_context
590
- Puppet[:func3x_check] = true
591
- end
592
-
593
- it "an illegal function is loaded" do
594
- f = loader.load_typed(typed_name(:function, 'bad_func_load3')).value
595
- expect(f.call(scope)).to eql("some return value")
596
- end
597
- end
598
-
599
578
  context 'when causing a 3x load followed by a 4x load' do
600
579
  let(:env) { environment_for(mix_4x_and_3x_functions) }
601
580
  let(:compiler) { Puppet::Parser::Compiler.new(Puppet::Node.new("test", :environment => env)) }
@@ -623,6 +602,12 @@ end
623
602
  function = loader.load_typed(typed_name(:function, 'callee_ws')).value
624
603
  expect(function.call(scope, 'passed in scope')).to eql("usee::callee_ws() got 'value'")
625
604
  end
605
+
606
+ it "an illegal function is loaded" do
607
+ expect {
608
+ loader.load_typed(typed_name(:function, 'bad_func_load3')).value
609
+ }.to raise_error(SecurityError, /Illegal method definition of method 'bad_func_load3_illegal_method' on line 8 in legacy function/)
610
+ end
626
611
  end
627
612
 
628
613
  context 'loading' do
@@ -5,27 +5,9 @@ require_relative 'parser_rspec_helper'
5
5
  describe "egrammar parsing of 'application'" do
6
6
  include ParserRspecHelper
7
7
 
8
- it "an empty body" do
9
- expect(dump(parse("application foo { }"))).to eq("(application foo () ())")
10
- end
11
-
12
- it "an empty body" do
13
- prog = <<-EPROG
14
- application foo {
15
- db { one:
16
- password => 'secret'
17
- }
18
- }
19
- EPROG
20
- expect(dump(parse(prog))).to eq( [
21
- "(application foo () (block",
22
- " (resource db",
23
- " (one",
24
- " (password => 'secret')))", "))" ].join("\n"))
25
- end
26
-
27
- it "accepts parameters" do
28
- s = "application foo($p1 = 'yo', $p2) { }"
29
- expect(dump(parse(s))).to eq("(application foo ((= p1 'yo') p2) ())")
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\)/)
30
12
  end
31
13
  end
@@ -191,7 +191,6 @@ describe "egrammar parsing basic expressions" do
191
191
 
192
192
  {
193
193
  'keyword' => %w(type function),
194
- 'reserved word' => %w(application site produces consumes)
195
194
  }.each_pair do |word_type, words|
196
195
  words.each do |word|
197
196
  it "allows the #{word_type} '#{word}' in a list" do
@@ -6,31 +6,18 @@ describe "egrammar parsing of capability mappings" do
6
6
  include ParserRspecHelper
7
7
 
8
8
  context "when parsing 'produces'" do
9
- it "the ast contains produces and attributes" do
10
- prog = "Foo produces Sql { name => value }"
11
- ast = "(produces Foo Sql ((name => value)))"
12
- expect(dump(parse(prog))).to eq(ast)
13
- end
14
-
15
- it "optional end comma is allowed" do
16
- prog = "Foo produces Sql { name => value, }"
17
- ast = "(produces Foo Sql ((name => value)))"
18
- expect(dump(parse(prog))).to eq(ast)
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\)/)
19
13
  end
20
14
  end
21
15
 
22
16
  context "when parsing 'consumes'" do
23
- it "the ast contains consumes and attributes" do
24
- prog = "Foo consumes Sql { name => value }"
25
- ast = "(consumes Foo Sql ((name => value)))"
26
- expect(dump(parse(prog))).to eq(ast)
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\)/)
27
21
  end
28
-
29
- it "optional end comma is allowed" do
30
- prog = "Foo consumes Sql { name => value, }"
31
- ast = "(consumes Foo Sql ((name => value)))"
32
- expect(dump(parse(prog))).to eq(ast)
33
- end
34
-
35
22
  end
36
23
  end
@@ -6,41 +6,37 @@ describe "egrammar parsing of site expression" do
6
6
  include ParserRspecHelper
7
7
 
8
8
  context "when parsing 'site'" do
9
- it "an empty body is allowed" do
10
- prog = "site { }"
11
- ast = "(site ())"
12
- expect(dump(parse(prog))).to eq(ast)
13
- end
14
-
15
- it "a body with one expression is allowed" do
16
- prog = "site { $x = 1 }"
17
- ast = "(site (block\n (= $x 1)\n))"
18
- expect(dump(parse(prog))).to eq(ast)
19
- end
20
-
21
- it "a body with more than one expression is allowed" do
22
- prog = "site { $x = 1 $y = 2}"
23
- ast = "(site (block\n (= $x 1)\n (= $y 2)\n))"
24
- expect(dump(parse(prog))).to eq(ast)
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\)/)
25
13
  end
26
14
  end
27
15
 
28
16
  context 'When parsing collections containing application management specific keywords' do
29
17
  %w(application site produces consumes).each do |keyword|
30
- it "allows the keyword '#{keyword}' in a list" do
31
- expect(dump(parse("$a = [#{keyword}]"))).to(eq("(= $a ([] '#{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\)/)
32
22
  end
33
23
 
34
- it "allows the keyword '#{keyword}' as a key in a hash" do
35
- expect(dump(parse("$a = {#{keyword}=>'x'}"))).to(eq("(= $a ({} ('#{keyword}' 'x')))"))
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\)/)
36
28
  end
37
29
 
38
- it "allows the keyword '#{keyword}' as a value in a hash" do
39
- expect(dump(parse("$a = {'x'=>#{keyword}}"))).to(eq("(= $a ({} ('x' '#{keyword}')))"))
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\)/)
40
34
  end
41
35
 
42
- it "allows the keyword '#{keyword}' as an attribute name" do
43
- expect(dump(parse("foo { 'x': #{keyword} => 'value' } "))).to eql("(resource foo\n ('x'\n (#{keyword} => 'value')))")
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\)/)
44
40
  end
45
41
  end
46
42
  end
@@ -32,77 +32,6 @@ describe "Puppet::Pops::Resource" do
32
32
  expect(rt.valid_parameter?(:loglevel)).to be_truthy
33
33
  end
34
34
  end
35
-
36
-
37
- context 'when used with capability resource with producers/consumers' do
38
- include PuppetSpec::Files
39
-
40
- let!(:env_name) { 'spec' }
41
- let!(:env_dir) { tmpdir('environments') }
42
- let!(:populated_env_dir) do
43
- dir_contained_in(env_dir, env_name => {
44
- '.resource_types' => {
45
- 'capability.pp' => <<-PUPPET
46
- Puppet::Resource::ResourceType3.new(
47
- 'capability',
48
- [],
49
- [Puppet::Resource::Param(Any, 'name', true)],
50
- { /(.*)/ => ['name'] },
51
- true,
52
- true)
53
- PUPPET
54
- },
55
- 'modules' => {
56
- 'test' => {
57
- 'lib' => {
58
- 'puppet' => {
59
- 'type' => { 'capability.rb' => <<-RUBY
60
- Puppet::Type.newtype(:capability, :is_capability => true) do
61
- newparam :name, :namevar => true
62
- raise Puppet::Error, 'Ruby resource was loaded'
63
- end
64
- RUBY
65
- }
66
- }
67
- }
68
- }
69
- }
70
- })
71
- end
72
-
73
- let!(:code) { <<-PUPPET }
74
- define producer() {
75
- notify { "producer":}
76
- }
77
-
78
- define consumer() {
79
- notify { $title:}
80
- }
81
-
82
- Producer produces Capability {}
83
-
84
- Consumer consumes Capability {}
85
-
86
- producer {x: export => Capability[cap]}
87
- consumer {x: consume => Capability[cap]}
88
- consumer {y: require => Capability[cap]}
89
- PUPPET
90
-
91
- let(:environments) { Puppet::Environments::Directories.new(populated_env_dir, []) }
92
- let(:env) { Puppet::Node::Environment.create(:'spec', [File.join(env_dir, 'spec', 'modules')]) }
93
- let(:node) { Puppet::Node.new('test', :environment => env) }
94
- around(:each) do |example|
95
- Puppet[:environment] = env_name
96
- Puppet.override(:environments => environments, :current_environment => env) do
97
- example.run
98
- end
99
- Puppet::Type.rmtype(:capability)
100
- end
101
-
102
- it 'does not load the Ruby resource' do
103
- expect { compile_to_catalog(code, node) }.not_to raise_error
104
- end
105
- end
106
35
  end
107
36
  end
108
37
  end
@@ -629,7 +629,7 @@ module Serialization
629
629
  it 'the value of a type description is something other than a String or a Hash' do
630
630
  expect do
631
631
  from_converter.convert({ '__ptype' => { '__ptype' => 'Pcore::TimestampType', '__pvalue' => 12345 }})
632
- end.to raise_error(/Cannot create a Pcore::TimestampType from a (Fixnum|Integer)/)
632
+ end.to raise_error(/Cannot create a Pcore::TimestampType from a Integer/)
633
633
  end
634
634
  end
635
635
  end
@@ -141,11 +141,11 @@ describe 'The type calculator' do
141
141
 
142
142
  context 'when inferring ruby' do
143
143
 
144
- it 'fixnum translates to PIntegerType' do
144
+ it 'integer translates to PIntegerType' do
145
145
  expect(calculator.infer(1).class).to eq(PIntegerType)
146
146
  end
147
147
 
148
- it 'large fixnum (or bignum depending on architecture) translates to PIntegerType' do
148
+ it 'large integer translates to PIntegerType' do
149
149
  expect(calculator.infer(2**33).class).to eq(PIntegerType)
150
150
  end
151
151
 
@@ -329,7 +329,7 @@ describe 'The type calculator' do
329
329
  expect(object_t('name' => 'DerivedObjectArray')).to be_instance(derived_object)
330
330
  end
331
331
 
332
- it 'with fixnum values translates to PArrayType[PIntegerType]' do
332
+ it 'with integer values translates to PArrayType[PIntegerType]' do
333
333
  expect(calculator.infer([1,2]).element_type.class).to eq(PIntegerType)
334
334
  end
335
335
 
@@ -407,7 +407,7 @@ describe 'The type calculator' do
407
407
  expect(et.class).to eq(PEnumType)
408
408
  end
409
409
 
410
- it 'with array of string values and array of fixnums translates to PArrayType[PArrayType[PScalarDataType]]' do
410
+ it 'with array of string values and array of integers translates to PArrayType[PArrayType[PScalarDataType]]' do
411
411
  et = calculator.infer([['first', 'array'], [1,2]])
412
412
  expect(et.class).to eq(PArrayType)
413
413
  et = et.element_type
@@ -425,7 +425,7 @@ describe 'The type calculator' do
425
425
  expect(et.class).to eq(PEnumType)
426
426
  end
427
427
 
428
- it 'with hash of string values and hash of fixnums translates to PArrayType[PHashType[PScalarDataType]]' do
428
+ it 'with hash of string values and hash of integers translates to PArrayType[PHashType[PScalarDataType]]' do
429
429
  et = calculator.infer([{:first => 'first', :second => 'second' }, {:first => 1, :second => 2 }])
430
430
  expect(et.class).to eq(PArrayType)
431
431
  et = et.element_type
@@ -489,7 +489,7 @@ describe 'The type calculator' do
489
489
  expect(calculator.infer({'first' => 1, 'second' => 2}).key_type.class).to eq(PEnumType)
490
490
  end
491
491
 
492
- it 'with fixnum values translates to PHashType[key, PIntegerType]' do
492
+ it 'with integer values translates to PHashType[key, PIntegerType]' do
493
493
  expect(calculator.infer({:first => 1, :second => 2}).value_type.class).to eq(PIntegerType)
494
494
  end
495
495