puppet 6.21.0-x86-mingw32 → 6.24.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 (217) hide show
  1. checksums.yaml +4 -4
  2. data/CONTRIBUTING.md +5 -5
  3. data/Gemfile +1 -1
  4. data/Gemfile.lock +29 -23
  5. data/README.md +4 -4
  6. data/ext/osx/puppet.plist +2 -0
  7. data/ext/project_data.yaml +3 -2
  8. data/lib/puppet.rb +3 -3
  9. data/lib/puppet/application/agent.rb +12 -5
  10. data/lib/puppet/application/apply.rb +2 -1
  11. data/lib/puppet/application/device.rb +2 -1
  12. data/lib/puppet/application/filebucket.rb +1 -0
  13. data/lib/puppet/application/resource.rb +17 -3
  14. data/lib/puppet/application/script.rb +2 -1
  15. data/lib/puppet/application/ssl.rb +12 -0
  16. data/lib/puppet/configurer/downloader.rb +2 -1
  17. data/lib/puppet/defaults.rb +27 -5
  18. data/lib/puppet/environments.rb +26 -1
  19. data/lib/puppet/face/facts.rb +128 -30
  20. data/lib/puppet/face/help/action.erb +1 -0
  21. data/lib/puppet/face/help/face.erb +1 -0
  22. data/lib/puppet/face/node/clean.rb +11 -0
  23. data/lib/puppet/file_serving/fileset.rb +14 -2
  24. data/lib/puppet/file_system/file_impl.rb +1 -1
  25. data/lib/puppet/file_system/memory_file.rb +8 -1
  26. data/lib/puppet/file_system/windows.rb +4 -2
  27. data/lib/puppet/forge.rb +3 -3
  28. data/lib/puppet/functions/all.rb +1 -1
  29. data/lib/puppet/functions/camelcase.rb +1 -1
  30. data/lib/puppet/functions/capitalize.rb +2 -2
  31. data/lib/puppet/functions/downcase.rb +2 -2
  32. data/lib/puppet/functions/empty.rb +8 -0
  33. data/lib/puppet/functions/get.rb +5 -5
  34. data/lib/puppet/functions/group_by.rb +13 -5
  35. data/lib/puppet/functions/lest.rb +1 -1
  36. data/lib/puppet/functions/new.rb +100 -100
  37. data/lib/puppet/functions/partition.rb +12 -4
  38. data/lib/puppet/functions/require.rb +5 -5
  39. data/lib/puppet/functions/sort.rb +3 -3
  40. data/lib/puppet/functions/strftime.rb +1 -0
  41. data/lib/puppet/functions/tree_each.rb +7 -9
  42. data/lib/puppet/functions/type.rb +4 -4
  43. data/lib/puppet/functions/unwrap.rb +17 -2
  44. data/lib/puppet/functions/upcase.rb +2 -2
  45. data/lib/puppet/http/resolver/server_list.rb +15 -4
  46. data/lib/puppet/http/service/compiler.rb +69 -0
  47. data/lib/puppet/http/service/file_server.rb +2 -1
  48. data/lib/puppet/indirector/catalog/compiler.rb +1 -0
  49. data/lib/puppet/indirector/facts/facter.rb +24 -3
  50. data/lib/puppet/indirector/file_metadata/rest.rb +1 -0
  51. data/lib/puppet/indirector/resource/ral.rb +6 -1
  52. data/lib/puppet/interface/documentation.rb +1 -0
  53. data/lib/puppet/module_tool/applications/installer.rb +4 -0
  54. data/lib/puppet/module_tool/errors/shared.rb +17 -0
  55. data/lib/puppet/network/formats.rb +67 -0
  56. data/lib/puppet/network/http/factory.rb +4 -0
  57. data/lib/puppet/parser/functions/fqdn_rand.rb +14 -6
  58. data/lib/puppet/pops/types/p_sem_ver_type.rb +8 -2
  59. data/lib/puppet/pops/types/p_sensitive_type.rb +10 -0
  60. data/lib/puppet/pops/types/type_mismatch_describer.rb +1 -1
  61. data/lib/puppet/provider/exec/posix.rb +16 -4
  62. data/lib/puppet/provider/package/dnfmodule.rb +1 -1
  63. data/lib/puppet/provider/package/nim.rb +11 -6
  64. data/lib/puppet/provider/package/pip.rb +15 -3
  65. data/lib/puppet/provider/parsedfile.rb +3 -0
  66. data/lib/puppet/provider/service/systemd.rb +14 -4
  67. data/lib/puppet/provider/service/windows.rb +38 -0
  68. data/lib/puppet/provider/user/directoryservice.rb +25 -12
  69. data/lib/puppet/provider/user/useradd.rb +9 -2
  70. data/lib/puppet/reference/configuration.rb +1 -1
  71. data/lib/puppet/settings.rb +30 -7
  72. data/lib/puppet/settings/environment_conf.rb +1 -0
  73. data/lib/puppet/transaction/additional_resource_generator.rb +1 -1
  74. data/lib/puppet/type/exec.rb +16 -3
  75. data/lib/puppet/type/file.rb +19 -1
  76. data/lib/puppet/type/file/mode.rb +6 -0
  77. data/lib/puppet/type/file/selcontext.rb +1 -1
  78. data/lib/puppet/type/service.rb +18 -38
  79. data/lib/puppet/type/tidy.rb +22 -3
  80. data/lib/puppet/type/user.rb +38 -20
  81. data/lib/puppet/util/fact_dif.rb +36 -17
  82. data/lib/puppet/util/monkey_patches.rb +7 -0
  83. data/lib/puppet/util/selinux.rb +30 -4
  84. data/lib/puppet/util/symbolic_file_mode.rb +29 -17
  85. data/lib/puppet/util/windows/adsi.rb +46 -0
  86. data/lib/puppet/util/windows/api_types.rb +1 -1
  87. data/lib/puppet/util/windows/principal.rb +9 -2
  88. data/lib/puppet/util/windows/sid.rb +6 -2
  89. data/lib/puppet/version.rb +1 -1
  90. data/locales/puppet.pot +360 -280
  91. data/man/man5/puppet.conf.5 +279 -251
  92. data/man/man8/puppet-agent.8 +1 -1
  93. data/man/man8/puppet-apply.8 +1 -1
  94. data/man/man8/puppet-catalog.8 +9 -9
  95. data/man/man8/puppet-config.8 +1 -1
  96. data/man/man8/puppet-describe.8 +1 -1
  97. data/man/man8/puppet-device.8 +1 -1
  98. data/man/man8/puppet-doc.8 +1 -1
  99. data/man/man8/puppet-epp.8 +1 -1
  100. data/man/man8/puppet-facts.8 +65 -7
  101. data/man/man8/puppet-filebucket.8 +1 -1
  102. data/man/man8/puppet-generate.8 +1 -1
  103. data/man/man8/puppet-help.8 +1 -1
  104. data/man/man8/puppet-key.8 +7 -7
  105. data/man/man8/puppet-lookup.8 +1 -1
  106. data/man/man8/puppet-man.8 +1 -1
  107. data/man/man8/puppet-module.8 +1 -1
  108. data/man/man8/puppet-node.8 +5 -5
  109. data/man/man8/puppet-parser.8 +1 -1
  110. data/man/man8/puppet-plugin.8 +1 -1
  111. data/man/man8/puppet-report.8 +5 -5
  112. data/man/man8/puppet-resource.8 +1 -1
  113. data/man/man8/puppet-script.8 +1 -1
  114. data/man/man8/puppet-ssl.8 +5 -1
  115. data/man/man8/puppet-status.8 +4 -4
  116. data/man/man8/puppet.8 +2 -2
  117. data/spec/fixtures/ssl/127.0.0.1-key.pem +107 -57
  118. data/spec/fixtures/ssl/127.0.0.1.pem +52 -31
  119. data/spec/fixtures/ssl/bad-basic-constraints.pem +57 -35
  120. data/spec/fixtures/ssl/bad-int-basic-constraints.pem +57 -35
  121. data/spec/fixtures/ssl/ca.pem +57 -35
  122. data/spec/fixtures/ssl/crl.pem +28 -18
  123. data/spec/fixtures/ssl/ec-key.pem +11 -11
  124. data/spec/fixtures/ssl/ec.pem +33 -24
  125. data/spec/fixtures/ssl/encrypted-ec-key.pem +12 -12
  126. data/spec/fixtures/ssl/encrypted-key.pem +108 -58
  127. data/spec/fixtures/ssl/intermediate-agent-crl.pem +28 -19
  128. data/spec/fixtures/ssl/intermediate-agent.pem +57 -36
  129. data/spec/fixtures/ssl/intermediate-crl.pem +31 -21
  130. data/spec/fixtures/ssl/intermediate.pem +57 -36
  131. data/spec/fixtures/ssl/oid-key.pem +117 -0
  132. data/spec/fixtures/ssl/oid.pem +69 -0
  133. data/spec/fixtures/ssl/pluto-key.pem +107 -57
  134. data/spec/fixtures/ssl/pluto.pem +52 -30
  135. data/spec/fixtures/ssl/request-key.pem +107 -57
  136. data/spec/fixtures/ssl/request.pem +47 -26
  137. data/spec/fixtures/ssl/revoked-key.pem +107 -57
  138. data/spec/fixtures/ssl/revoked.pem +52 -30
  139. data/spec/fixtures/ssl/signed-key.pem +107 -57
  140. data/spec/fixtures/ssl/signed.pem +52 -30
  141. data/spec/fixtures/ssl/tampered-cert.pem +52 -30
  142. data/spec/fixtures/ssl/tampered-csr.pem +47 -26
  143. data/spec/fixtures/ssl/trusted_oid_mapping.yaml +5 -0
  144. data/spec/fixtures/ssl/unknown-127.0.0.1-key.pem +107 -57
  145. data/spec/fixtures/ssl/unknown-127.0.0.1.pem +50 -29
  146. data/spec/fixtures/ssl/unknown-ca-key.pem +107 -57
  147. data/spec/fixtures/ssl/unknown-ca.pem +55 -33
  148. data/spec/fixtures/unit/provider/service/systemd/list_unit_files_services_vendor_preset +9 -0
  149. data/spec/integration/application/filebucket_spec.rb +11 -0
  150. data/spec/integration/application/module_spec.rb +21 -0
  151. data/spec/integration/application/plugin_spec.rb +1 -1
  152. data/spec/integration/application/resource_spec.rb +64 -0
  153. data/spec/integration/application/ssl_spec.rb +20 -0
  154. data/spec/integration/environments/settings_interpolation_spec.rb +0 -4
  155. data/spec/integration/http/client_spec.rb +12 -0
  156. data/spec/integration/indirector/direct_file_server_spec.rb +1 -3
  157. data/spec/integration/indirector/facts/facter_spec.rb +90 -36
  158. data/spec/integration/type/exec_spec.rb +70 -45
  159. data/spec/integration/util/windows/adsi_spec.rb +18 -0
  160. data/spec/integration/util/windows/principal_spec.rb +21 -0
  161. data/spec/integration/util/windows/registry_spec.rb +6 -0
  162. data/spec/lib/puppet/test_ca.rb +7 -2
  163. data/spec/lib/puppet_spec/settings.rb +1 -0
  164. data/spec/spec_helper.rb +11 -1
  165. data/spec/unit/application/agent_spec.rb +7 -2
  166. data/spec/unit/application/facts_spec.rb +482 -3
  167. data/spec/unit/application/ssl_spec.rb +23 -0
  168. data/spec/unit/configurer/downloader_spec.rb +6 -0
  169. data/spec/unit/configurer_spec.rb +23 -0
  170. data/spec/unit/defaults_spec.rb +16 -0
  171. data/spec/unit/environments_spec.rb +199 -88
  172. data/spec/unit/face/facts_spec.rb +4 -0
  173. data/spec/unit/file_serving/fileset_spec.rb +60 -0
  174. data/spec/unit/file_system_spec.rb +15 -0
  175. data/spec/unit/functions/assert_type_spec.rb +1 -1
  176. data/spec/unit/functions/empty_spec.rb +10 -0
  177. data/spec/unit/functions/unwrap_spec.rb +8 -0
  178. data/spec/unit/functions4_spec.rb +2 -2
  179. data/spec/unit/gettext/config_spec.rb +12 -0
  180. data/spec/unit/http/service/compiler_spec.rb +123 -0
  181. data/spec/unit/indirector/catalog/compiler_spec.rb +14 -10
  182. data/spec/unit/indirector/facts/facter_spec.rb +95 -0
  183. data/spec/unit/indirector/resource/ral_spec.rb +40 -75
  184. data/spec/unit/module_tool/applications/installer_spec.rb +12 -0
  185. data/spec/unit/network/formats_spec.rb +41 -0
  186. data/spec/unit/network/http/factory_spec.rb +19 -0
  187. data/spec/unit/parser/functions/fqdn_rand_spec.rb +15 -1
  188. data/spec/unit/parser/templatewrapper_spec.rb +12 -2
  189. data/spec/unit/pops/types/p_sem_ver_type_spec.rb +18 -0
  190. data/spec/unit/pops/types/p_sensitive_type_spec.rb +18 -0
  191. data/spec/unit/provider/package/dnfmodule_spec.rb +10 -1
  192. data/spec/unit/provider/package/nim_spec.rb +42 -0
  193. data/spec/unit/provider/package/pip_spec.rb +37 -0
  194. data/spec/unit/provider/parsedfile_spec.rb +10 -0
  195. data/spec/unit/provider/service/init_spec.rb +1 -0
  196. data/spec/unit/provider/service/openwrt_spec.rb +3 -1
  197. data/spec/unit/provider/service/systemd_spec.rb +53 -8
  198. data/spec/unit/provider/service/windows_spec.rb +202 -0
  199. data/spec/unit/provider/user/directoryservice_spec.rb +67 -35
  200. data/spec/unit/provider/user/useradd_spec.rb +21 -6
  201. data/spec/unit/resource/catalog_spec.rb +1 -1
  202. data/spec/unit/settings_spec.rb +97 -56
  203. data/spec/unit/ssl/state_machine_spec.rb +19 -5
  204. data/spec/unit/transaction/additional_resource_generator_spec.rb +0 -2
  205. data/spec/unit/transaction_spec.rb +18 -20
  206. data/spec/unit/type/exec_spec.rb +76 -29
  207. data/spec/unit/type/file/selinux_spec.rb +3 -3
  208. data/spec/unit/type/file/source_spec.rb +4 -4
  209. data/spec/unit/type/service_spec.rb +59 -188
  210. data/spec/unit/type/tidy_spec.rb +24 -7
  211. data/spec/unit/type/user_spec.rb +45 -0
  212. data/spec/unit/util/selinux_spec.rb +87 -16
  213. data/spec/unit/util/windows/sid_spec.rb +41 -0
  214. data/tasks/generate_cert_fixtures.rake +12 -3
  215. metadata +24 -9
  216. data/spec/lib/matchers/include.rb +0 -27
  217. data/spec/lib/matchers/include_spec.rb +0 -32
@@ -4,14 +4,22 @@
4
4
  # the second containing the rest.
5
5
  Puppet::Functions.create_function(:partition) do
6
6
  # @param collection A collection of things to partition.
7
- # @example Partition array of empty strings, results in e.g. [[''], [b, c]]
7
+ # @example Partition array of empty strings, results in e.g. `[[''], [b, c]]`
8
+ # ```puppet
8
9
  # ['', b, c].partition |$s| { $s.empty }
9
- # @example Partition array of strings using index, results in e.g. [['', 'ab'], ['b']]
10
+ # ```
11
+ # @example Partition array of strings using index, results in e.g. `[['', 'ab'], ['b']]`
12
+ # ```puppet
10
13
  # ['', b, ab].partition |$i, $s| { $i == 2 or $s.empty }
11
- # @example Partition hash of strings by key-value pair, results in e.g. [[['b', []]], [['a', [1, 2]]]]
14
+ # ```
15
+ # @example Partition hash of strings by key-value pair, results in e.g. `[[['b', []]], [['a', [1, 2]]]]`
16
+ # ```puppet
12
17
  # { a => [1, 2], b => [] }.partition |$kv| { $kv[1].empty }
13
- # @example Partition hash of strings by key and value, results in e.g. [[['b', []]], [['a', [1, 2]]]]
18
+ # ```
19
+ # @example Partition hash of strings by key and value, results in e.g. `[[['b', []]], [['a', [1, 2]]]]`
20
+ # ```puppet
14
21
  # { a => [1, 2], b => [] }.partition |$k, $v| { $v.empty }
22
+ # ```
15
23
  dispatch :partition_1 do
16
24
  required_param 'Collection', :collection
17
25
  block_param 'Callable[1,1]', :block
@@ -4,13 +4,13 @@
4
4
  # The relationship metaparameters work well for specifying relationships
5
5
  # between individual resources, but they can be clumsy for specifying
6
6
  # relationships between classes. This function is a superset of the
7
- # 'include' function, adding a class relationship so that the requiring
7
+ # `include` function, adding a class relationship so that the requiring
8
8
  # class depends on the required class.
9
9
  #
10
- # Warning: using require in place of include can lead to unwanted dependency cycles.
10
+ # Warning: using `require` in place of `include` can lead to unwanted dependency cycles.
11
11
  #
12
- # For instance the following manifest, with 'require' instead of 'include' would produce a nasty
13
- # dependence cycle, because notify imposes a before between File[/foo] and Service[foo]:
12
+ # For instance, the following manifest, with `require` instead of `include`, would produce a nasty
13
+ # dependence cycle, because `notify` imposes a `before` between `File[/foo]` and `Service[foo]`:
14
14
  #
15
15
  # ```puppet
16
16
  # class myservice {
@@ -32,7 +32,7 @@
32
32
  # resource and relationship expressions.
33
33
  #
34
34
  # - Since 4.0.0 Class and Resource types, absolute names
35
- # - Since 4.7.0 Returns an Array[Type[Class]] with references to the required classes
35
+ # - Since 4.7.0 Returns an `Array[Type[Class]]` with references to the required classes
36
36
  #
37
37
  Puppet::Functions.create_function(:require, Puppet::Functions::InternalFunction) do
38
38
  dispatch :require_impl do
@@ -2,9 +2,9 @@
2
2
  # Please note: This function is based on Ruby String comparison and as such may not be entirely UTF8 compatible.
3
3
  # To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.
4
4
  #
5
- # This function is compatible with the function sort() in stdlib.
5
+ # This function is compatible with the function `sort()` in `stdlib`.
6
6
  # * Comparison of characters in a string always uses a system locale and may not be what is expected for a particular locale
7
- # * Sorting is based on Ruby's <=> operator unless a lambda is given that performs the comparison.
7
+ # * Sorting is based on Ruby's `<=>` operator unless a lambda is given that performs the comparison.
8
8
  # * comparison of strings is case dependent (use lambda with `compare($a,$b)` to ignore case)
9
9
  # * comparison of mixed data types raises an error (if there is the need to sort mixed data types use a lambda)
10
10
  #
@@ -49,7 +49,7 @@
49
49
  # }
50
50
  # })
51
51
  # ```
52
- # Would notice [2,3,'a','b']
52
+ # Would notice `[2,3,'a','b']`
53
53
  #
54
54
  # @since 6.0.0 - supporting a lambda to do compare
55
55
  #
@@ -105,6 +105,7 @@
105
105
  # **Seconds since the Epoch:**
106
106
  #
107
107
  # | Format | Meaning |
108
+ # | ------ | ------- |
108
109
  # | s | Number of seconds since 1970-01-01 00:00:00 UTC. |
109
110
  #
110
111
  # **Literal string:**
@@ -6,13 +6,13 @@
6
6
  #
7
7
  # 1. An `Array`, `Hash`, `Iterator`, or `Object` that the function will iterate over.
8
8
  # 2. An optional hash with the options:
9
- # * `include_containers` => `Optional[Boolean]` # default true - if containers should be given to the lambda
10
- # * `include_values` => `Optional[Boolean]` # default true - if non containers should be given to the lambda
11
- # * `include_root` => `Optional[Boolean]` # default true - if the root container should be given to the lambda
9
+ # * `include_containers` => `Optional[Boolean]` # default `true` - if containers should be given to the lambda
10
+ # * `include_values` => `Optional[Boolean]` # default `true` - if non containers should be given to the lambda
11
+ # * `include_root` => `Optional[Boolean]` # default `true` - if the root container should be given to the lambda
12
12
  # * `container_type` => `Optional[Type[Variant[Array, Hash, Object]]]` # a type that determines what a container is - can only
13
13
  # be set to a type that matches the default `Variant[Array, Hash, Object]`.
14
14
  # * `order` => `Enum[depth_first, breadth_first]` # default ´depth_first`, the order in which elements are visited
15
- # * `include_refs` => Optional[Boolean] # default `false`, if attributes in objects marked as bing of `reference` kind
15
+ # * `include_refs` => `Optional[Boolean]` # default `false`, if attributes in objects marked as bing of `reference` kind
16
16
  # should be included.
17
17
  # 3. An optional lambda, which the function calls for each element in the first argument. It must
18
18
  # accept one or two arguments; either `$path`, and `$value`, or just `$value`.
@@ -46,14 +46,12 @@
46
46
  # [1, [2, 3], 4]
47
47
  # ```
48
48
  #
49
- # Results in:
50
- #
51
- # If containers are skipped:
49
+ # If containers are skipped, results in:
52
50
  #
53
51
  # * `depth_first` order `1`, `2`, `3`, `4`
54
52
  # * `breadth_first` order `1`, `4`,`2`, `3`
55
53
  #
56
- # If containers and root, are included:
54
+ # If containers and root are included, results in:
57
55
  #
58
56
  # * `depth_first` order `[1, [2, 3], 4]`, `1`, `[2, 3]`, `2`, `3`, `4`
59
57
  # * `breadth_first` order `[1, [2, 3], 4]`, `1`, `[2, 3]`, `4`, `2`, `3`
@@ -96,7 +94,7 @@
96
94
  #
97
95
  # Any Puppet Type system data type can be used to filter what is
98
96
  # considered to be a container, but it must be a narrower type than one of
99
- # the default Array, Hash, Object types - for example it is not possible to make a
97
+ # the default `Array`, `Hash`, `Object` types - for example it is not possible to make a
100
98
  # `String` be a container type.
101
99
  #
102
100
  # @example Only `Array` as container type
@@ -35,10 +35,10 @@
35
35
  #
36
36
  # Would notice the four values:
37
37
  #
38
- # 1. 'Array[Numeric]'
39
- # 2. 'Array[Numeric, 2, 2]'
40
- # 3. 'Tuple[Float[3.14], Integer[42,42]]]'
41
- # 4. 'Tuple[Float[3.14], Integer[42,42]]]'
38
+ # 1. `Array[Numeric]`
39
+ # 2. `Array[Numeric, 2, 2]`
40
+ # 3. `Tuple[Float[3.14], Integer[42,42]]]`
41
+ # 4. `Tuple[Float[3.14], Integer[42,42]]]`
42
42
  #
43
43
  # @since 4.4.0
44
44
  #
@@ -1,4 +1,5 @@
1
1
  # Unwraps a Sensitive value and returns the wrapped object.
2
+ # Returns the Value itself, if it is not Sensitive.
2
3
  #
3
4
  # @example Usage of unwrap
4
5
  #
@@ -28,12 +29,17 @@
28
29
  # @since 4.0.0
29
30
  #
30
31
  Puppet::Functions.create_function(:unwrap) do
31
- dispatch :unwrap do
32
+ dispatch :from_sensitive do
32
33
  param 'Sensitive', :arg
33
34
  optional_block_param
34
35
  end
35
36
 
36
- def unwrap(arg)
37
+ dispatch :from_any do
38
+ param 'Any', :arg
39
+ optional_block_param
40
+ end
41
+
42
+ def from_sensitive(arg)
37
43
  unwrapped = arg.unwrap
38
44
  if block_given?
39
45
  yield(unwrapped)
@@ -41,4 +47,13 @@ Puppet::Functions.create_function(:unwrap) do
41
47
  unwrapped
42
48
  end
43
49
  end
50
+
51
+ def from_any(arg)
52
+ unwrapped = arg
53
+ if block_given?
54
+ yield(unwrapped)
55
+ else
56
+ unwrapped
57
+ end
58
+ end
44
59
  end
@@ -22,14 +22,14 @@
22
22
  # 'hello'.upcase()
23
23
  # upcase('hello')
24
24
  # ```
25
- # Would both result in "HELLO"
25
+ # Would both result in `"HELLO"`
26
26
  #
27
27
  # @example Converting an Array to upper case
28
28
  # ```puppet
29
29
  # ['a', 'b'].upcase()
30
30
  # upcase(['a', 'b'])
31
31
  # ```
32
- # Would both result in ['A', 'B']
32
+ # Would both result in `['A', 'B']`
33
33
  #
34
34
  # @example Converting a Hash to upper case
35
35
  # ```puppet
@@ -54,7 +54,7 @@ class Puppet::HTTP::Resolver::ServerList < Puppet::HTTP::Resolver
54
54
  end
55
55
 
56
56
  # Return the first simple service status endpoint we can connect to
57
- @server_list_setting.value.each do |server|
57
+ @server_list_setting.value.each_with_index do |server, index|
58
58
  host = server[0]
59
59
  port = server[1] || @default_port
60
60
 
@@ -64,10 +64,21 @@ class Puppet::HTTP::Resolver::ServerList < Puppet::HTTP::Resolver
64
64
  @resolved_url = service.url
65
65
  return Puppet::HTTP::Service.create_service(@client, session, name, @resolved_url.host, @resolved_url.port)
66
66
  rescue Puppet::HTTP::ResponseError => detail
67
- Puppet.log_exception(detail, _("Puppet server %{host}:%{port} is unavailable: %{code} %{reason}") %
68
- { host: service.url.host, port: service.url.port, code: detail.response.code, reason: detail.response.reason })
67
+ if index < @server_list_setting.value.length - 1
68
+ Puppet.warning(_("Puppet server %{host}:%{port} is unavailable: %{code} %{reason}") %
69
+ { host: service.url.host, port: service.url.port, code: detail.response.code, reason: detail.response.reason } +
70
+ ' ' + _("Trying with next server from server_list."))
71
+ else
72
+ Puppet.log_exception(detail, _("Puppet server %{host}:%{port} is unavailable: %{code} %{reason}") %
73
+ { host: service.url.host, port: service.url.port, code: detail.response.code, reason: detail.response.reason })
74
+ end
69
75
  rescue Puppet::HTTP::HTTPError => detail
70
- Puppet.log_exception(detail, _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail})
76
+ if index < @server_list_setting.value.length - 1
77
+ Puppet.warning(_("Unable to connect to server from server_list setting: %{detail}") % {detail: detail} +
78
+ ' ' + _("Trying with next server from server_list."))
79
+ else
80
+ Puppet.log_exception(detail, _("Unable to connect to server from server_list setting: %{detail}") % {detail: detail})
81
+ end
71
82
  end
72
83
  end
73
84
 
@@ -129,6 +129,75 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
129
129
  [response, deserialize(response, Puppet::Resource::Catalog)]
130
130
  end
131
131
 
132
+ #
133
+ # @api private
134
+ #
135
+ # Submit a POST request to request a catalog to the server using v4 endpoint
136
+ #
137
+ # @param [String] certname The name of the node for which to compile the catalog.
138
+ # @param [Hash] persistent A hash containing two required keys, facts and catalog,
139
+ # which when set to true will cause the facts and reports to be stored in
140
+ # PuppetDB, or discarded if set to false.
141
+ # @param [String] environment The name of the environment for which to compile the catalog.
142
+ # @param [Hash] facts A hash with a required values key, containing a hash of all the
143
+ # facts for the node. If not provided, Puppet will attempt to fetch facts for the node
144
+ # from PuppetDB.
145
+ # @param [Hash] trusted_facts A hash with a required values key containing a hash of
146
+ # the trusted facts for a node
147
+ # @param [String] transaction_uuid The id for tracking the catalog compilation and
148
+ # report submission.
149
+ # @param [String] job_id The id of the orchestrator job that triggered this run.
150
+ # @param [Hash] options A hash of options beyond direct input to catalogs. Options:
151
+ # - prefer_requested_environment Whether to always override a node's classified
152
+ # environment with the one supplied in the request. If this is true and no environment
153
+ # is supplied, fall back to the classified environment, or finally, 'production'.
154
+ # - capture_logs Whether to return the errors and warnings that occurred during
155
+ # compilation alongside the catalog in the response body.
156
+ # - log_level The logging level to use during the compile when capture_logs is true.
157
+ # Options are 'err', 'warning', 'info', and 'debug'.
158
+ #
159
+ # @return [Array<Puppet::HTTP::Response, Puppet::Resource::Catalog, Array<String>>] An array
160
+ # containing the request response, the deserialized catalog returned by
161
+ # the server and array containing logs (log array will be empty if capture_logs is false)
162
+ #
163
+ def post_catalog4(certname, persistence:, environment:, facts: nil, trusted_facts: nil, transaction_uuid: nil, job_id: nil, options: nil)
164
+ unless persistence.is_a?(Hash) && (missing = [:facts, :catalog] - persistence.keys.map(&:to_sym)).empty?
165
+ raise ArgumentError.new("The 'persistence' hash is missing the keys: #{missing.join(', ')}")
166
+ end
167
+ raise ArgumentError.new("Facts must be a Hash not a #{facts.class}") unless facts.nil? || facts.is_a?(Hash)
168
+ body = {
169
+ certname: certname,
170
+ persistence: persistence,
171
+ environment: environment,
172
+ transaction_uuid: transaction_uuid,
173
+ job_id: job_id,
174
+ options: options
175
+ }
176
+ body[:facts] = { values: facts } unless facts.nil?
177
+ body[:trusted_facts] = { values: trusted_facts } unless trusted_facts.nil?
178
+ headers = add_puppet_headers(
179
+ 'Accept' => get_mime_types(Puppet::Resource::Catalog).join(', '),
180
+ 'Content-Type' => 'application/json'
181
+ )
182
+
183
+ url = URI::HTTPS.build(host: @url.host, port: @url.port, path: Puppet::Util.uri_encode("/puppet/v4/catalog"))
184
+ response = @client.post(
185
+ url,
186
+ body.to_json,
187
+ headers: headers
188
+ )
189
+ process_response(response)
190
+ begin
191
+ response_body = JSON.parse(response.body)
192
+ catalog = Puppet::Resource::Catalog.from_data_hash(response_body['catalog'])
193
+ rescue => err
194
+ raise Puppet::HTTP::SerializationError.new("Failed to deserialize catalog from puppetserver response: #{err.message}", err)
195
+ end
196
+
197
+ logs = response_body['logs'] || []
198
+ [response, catalog, logs]
199
+ end
200
+
132
201
  #
133
202
  # @api private
134
203
  #
@@ -106,7 +106,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
106
106
  # An array with the request response and an array of the deserialized
107
107
  # metadata for each file returned from the server
108
108
  #
109
- def get_file_metadatas(path: nil, environment:, recurse: :false, recurselimit: nil, ignore: nil, links: :manage, checksum_type: Puppet[:digest_algorithm], source_permissions: :ignore)
109
+ def get_file_metadatas(path: nil, environment:, recurse: :false, recurselimit: nil, max_files: nil, ignore: nil, links: :manage, checksum_type: Puppet[:digest_algorithm], source_permissions: :ignore)
110
110
  validate_path(path)
111
111
 
112
112
  headers = add_puppet_headers('Accept' => get_mime_types(Puppet::FileServing::Metadata).join(', '))
@@ -117,6 +117,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
117
117
  params: {
118
118
  recurse: recurse,
119
119
  recurselimit: recurselimit,
120
+ max_files: max_files,
120
121
  ignore: ignore,
121
122
  links: links,
122
123
  checksum_type: checksum_type,
@@ -194,6 +194,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
194
194
  :source_permissions => resource[:source_permissions] ? resource[:source_permissions].to_sym : :ignore,
195
195
  :recurse => true,
196
196
  :recurselimit => resource[:recurselimit],
197
+ :max_files => resource[:max_files],
197
198
  :ignore => resource[:ignore],
198
199
  }
199
200
 
@@ -32,8 +32,14 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
32
32
  # Initialize core Puppet facts, such as puppetversion
33
33
  Puppet.initialize_facts
34
34
 
35
- result = Puppet::Node::Facts.new(request.key, Facter.to_hash)
36
- result.add_local_facts
35
+ result = if request.options[:resolve_options]
36
+ raise(Puppet::Error, _("puppet facts show requires version 4.0.40 or greater of Facter.")) unless Facter.respond_to?(:resolve)
37
+ find_with_options(request)
38
+ else
39
+ Puppet::Node::Facts.new(request.key, Facter.to_hash)
40
+ end
41
+
42
+ result.add_local_facts unless request.options[:resolve_options]
37
43
  result.sanitize
38
44
  result
39
45
  end
@@ -61,7 +67,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
61
67
 
62
68
  true
63
69
  end
64
-
70
+ dirs << request.options[:custom_dir] if request.options[:custom_dir]
65
71
  Facter.search(*dirs)
66
72
  end
67
73
 
@@ -83,6 +89,21 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
83
89
  dirs << dir
84
90
  end
85
91
 
92
+ dirs << request.options[:external_dir] if request.options[:external_dir]
86
93
  Facter.search_external dirs
87
94
  end
95
+
96
+ private
97
+
98
+ def find_with_options(request)
99
+ options = request.options
100
+ options_for_facter = String.new
101
+ options_for_facter += options[:user_query].join(' ')
102
+ options_for_facter += " --config #{options[:config_file]}" if options[:config_file]
103
+ options_for_facter += " --show-legacy" if options[:show_legacy]
104
+ options_for_facter += " --no-block" if options[:no_block] == false
105
+ options_for_facter += " --no-cache" if options[:no_cache] == false
106
+
107
+ Puppet::Node::Facts.new(request.key, Facter.resolve(options_for_facter))
108
+ end
88
109
  end
@@ -46,6 +46,7 @@ class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
46
46
  environment: request.environment.to_s,
47
47
  recurse: request.options[:recurse],
48
48
  recurselimit: request.options[:recurselimit],
49
+ max_files: request.options[:max_files],
49
50
  ignore: request.options[:ignore],
50
51
  links: request.options[:links],
51
52
  checksum_type: request.options[:checksum_type],
@@ -24,7 +24,12 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
24
24
  type(request).instances.map do |res|
25
25
  res.to_resource
26
26
  end.find_all do |res|
27
- conditions.all? {|property, value| res.to_resource[property].to_s == value.to_s}
27
+ conditions.all? do |property, value|
28
+ # even though `res` is an instance of Puppet::Resource, calling
29
+ # `res[:name]` on it returns nil, and for some reason it is necessary
30
+ # to invoke the Puppet::Resource#copy_as_resource copy constructor...
31
+ res.copy_as_resource[property].to_s == value.to_s
32
+ end
28
33
  end.sort_by(&:title)
29
34
  end
30
35
 
@@ -76,6 +76,7 @@ class Puppet::Interface
76
76
  s.text(" ")
77
77
 
78
78
  options.each do |option|
79
+ next if option == :extra
79
80
  option = get_option(option)
80
81
  wrap = option.required? ? %w{ < > } : %w{ [ ] }
81
82
 
@@ -59,6 +59,10 @@ module Puppet::ModuleTool
59
59
  results = { :action => :install, :module_name => name, :module_version => version }
60
60
 
61
61
  begin
62
+ if !@local_tarball && name !~ /-/
63
+ raise InvalidModuleNameError.new(module_name: @name, suggestion: "puppetlabs-#{@name}", action: :install)
64
+ end
65
+
62
66
  installed_module = installed_modules[name]
63
67
  if installed_module
64
68
  unless forced?
@@ -127,6 +127,23 @@ module Puppet::ModuleTool::Errors
127
127
  end
128
128
  end
129
129
 
130
+ class InvalidModuleNameError < ModuleToolError
131
+ def initialize(options)
132
+ @module_name = options[:module_name]
133
+ @suggestion = options[:suggestion]
134
+ @action = options[:action]
135
+ super _("Could not %{action} '%{module_name}', did you mean '%{suggestion}'?") % { action: @action, module_name: @module_name, suggestion: @suggestion }
136
+ end
137
+
138
+ def multiline
139
+ message = []
140
+ message << _("Could not %{action} module '%{module_name}'") % { action: @action, module_name: @module_name }
141
+ message << _(" The name '%{module_name}' is invalid") % { module_name: @module_name }
142
+ message << _(" Did you mean `puppet module %{action} %{suggestion}`?") % { action: @action, suggestion: @suggestion }
143
+ message.join("\n")
144
+ end
145
+ end
146
+
130
147
  class NotInstalledError < ModuleToolError
131
148
  def initialize(options)
132
149
  @module_name = options[:module_name]