puppet 4.10.1 → 4.10.4

data/lib/puppet/face/ca.rb

@@ -1,7 +1,7 @@
 require 'puppet/face'
 
 Puppet::Face.define(:ca, '0.1.0') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Local Puppet Certificate Authority management."

data/lib/puppet/face/catalog.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:catalog, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Compile, save, view, and convert catalogs."

data/lib/puppet/face/certificate.rb

@@ -2,7 +2,7 @@ require 'puppet/indirector/face'
 require 'puppet/ssl/host'
 
 Puppet::Indirector::Face.define(:certificate, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Provide access to the CA for certificate management."

data/lib/puppet/face/certificate_request.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:certificate_request, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Manage certificate requests."

data/lib/puppet/face/certificate_revocation_list.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:certificate_revocation_list, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Manage the list of revoked certificates."

data/lib/puppet/face/config.rb

@@ -2,7 +2,7 @@ require 'puppet/face'
 require 'puppet/settings/ini_file'
 
 Puppet::Face.define(:config, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Interact with Puppet's settings."

data/lib/puppet/face/epp.rb

@@ -4,7 +4,7 @@ require 'puppet/parser/files'
 require 'puppet/file_system'
 
 Puppet::Face.define(:epp, '0.0.1') do
-  copyright "Puppet Labs", 2014
+  copyright "Puppet Inc.", 2014
   license   "Apache 2 license; see COPYING"
 
   summary "Interact directly with the EPP template parser/renderer."

data/lib/puppet/face/facts.rb

@@ -2,7 +2,7 @@ require 'puppet/indirector/face'
 require 'puppet/node/facts'
 
 Puppet::Indirector::Face.define(:facts, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Retrieve and store facts."

data/lib/puppet/face/file.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:file, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Retrieve and store files in a filebucket"

data/lib/puppet/face/help.rb

@@ -5,7 +5,7 @@ require 'pathname'
 require 'erb'
 
 Puppet::Face.define(:help, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   _("Apache 2 license; see COPYING")
 
   summary _("Display Puppet help.")

data/lib/puppet/face/key.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:key, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Create, save, and remove certificate keys."

data/lib/puppet/face/man.rb

@@ -4,7 +4,7 @@ require 'pathname'
 require 'erb'
 
 Puppet::Face.define(:man, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Display Puppet manual pages."
@@ -75,7 +75,7 @@ Puppet::Face.define(:man, '0.0.1') do
         # ronn is a stupid about pager selection, we can be smarter. :)
         if pager then ENV['PAGER'] = pager end
 
-        args  = "--man --manual='Puppet Manual' --organization='Puppet Labs, LLC'"
+        args  = "--man --manual='Puppet Manual' --organization='Puppet Inc., LLC'"
         # manual pages could contain UTF-8 text
         IO.popen("#{ronn} #{args}", 'w:UTF-8') do |fh| fh.write text end
 

data/lib/puppet/face/module.rb

@@ -5,7 +5,7 @@ require 'puppet/util/colors'
 Puppet::Face.define(:module, '1.0.0') do
   extend Puppet::Util::Colors
 
-  copyright "Puppet Labs", 2012
+  copyright "Puppet Inc.", 2012
   license   "Apache 2 license; see COPYING"
 
   summary "Creates, installs and searches for modules on the Puppet Forge."

data/lib/puppet/face/node.rb

@@ -1,6 +1,6 @@
 require 'puppet/indirector/face'
 Puppet::Indirector::Face.define(:node, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "View and manage node definitions."

data/lib/puppet/face/parser.rb

@@ -2,7 +2,7 @@ require 'puppet/face'
 require 'puppet/parser'
 
 Puppet::Face.define(:parser, '0.0.1') do
-  copyright "Puppet Labs", 2014
+  copyright "Puppet Inc.", 2014
   license   "Apache 2 license; see COPYING"
 
   summary "Interact directly with the parser."

data/lib/puppet/face/plugin.rb

@@ -3,7 +3,7 @@ require 'puppet/configurer/downloader_factory'
 require 'puppet/configurer/plugin_handler'
 
 Puppet::Face.define(:plugin, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Interact with the Puppet plugin system."

data/lib/puppet/face/report.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:report, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "Create, display, and submit reports."

data/lib/puppet/face/resource.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:resource, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "API only: interact directly with resources via the RAL."

data/lib/puppet/face/resource_type.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:resource_type, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "View classes, defined resource types, and nodes from all manifests."

data/lib/puppet/face/status.rb

@@ -1,7 +1,7 @@
 require 'puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:status, '0.0.1') do
-  copyright "Puppet Labs", 2011
+  copyright "Puppet Inc.", 2011
   license   "Apache 2 license; see COPYING"
 
   summary "View puppet server status."

data/lib/puppet/feature/base.rb

@@ -79,7 +79,7 @@ Puppet.features.add(:manages_symlinks) do
       def self.is_implemented
         begin
           ffi_lib :kernel32
-          attach_function :CreateSymbolicLinkW, [:lpwstr, :lpwstr, :dword], :win32_bool
+          attach_function :CreateSymbolicLinkW, [:lpwstr, :lpwstr, :dword], :boolean
 
           true
         rescue LoadError => err

data/lib/puppet/functions/eyaml_lookup_key.rb

@@ -1,3 +1,7 @@
+# The `eyaml_lookup_key` is a hiera 5 `lookup_key` data provider function.
+# See [the configuration guide documentation](https://docs.puppet.com/puppet/latest/hiera_config_yaml_5.html#configuring-a-hierarchy-level-hiera-eyaml) for
+# how to use this function.
+#
 # @since 5.0.0
 #
 Puppet::Functions.create_function(:eyaml_lookup_key) do
@@ -29,17 +33,11 @@ Puppet::Functions.create_function(:eyaml_lookup_key) do
     # nil key is used to indicate that the cache contains the raw content of the eyaml file
     raw_data = context.cached_value(nil)
     if raw_data.nil?
-      options.each_pair do |k, v|
-        unless k == 'path'
-          Hiera::Backend::Eyaml::Options[k.to_sym] = v
-          context.explain { "Setting Eyaml option '#{k}' to '#{v}'" }
-        end
-      end
       raw_data = load_data_hash(options, context)
       context.cache(nil, raw_data)
     end
     context.not_found unless raw_data.include?(key)
-    context.cache(key, decrypt_value(raw_data[key], context))
+    context.cache(key, decrypt_value(raw_data[key], context, options))
   end
 
   def load_data_hash(options, context)
@@ -61,23 +59,29 @@ Puppet::Functions.create_function(:eyaml_lookup_key) do
     end
   end
 
-  def decrypt_value(value, context)
+  def decrypt_value(value, context, options)
     case value
     when String
-      decrypt(value, context)
+      decrypt(value, context, options)
     when Hash
       result = {}
-      value.each_pair { |k, v| result[context.interpolate(k)] = decrypt_value(v, context) }
+      value.each_pair { |k, v| result[context.interpolate(k)] = decrypt_value(v, context, options) }
       result
     when Array
-      value.map { |v| decrypt_value(v, context) }
+      value.map { |v| decrypt_value(v, context, options) }
     else
       value
     end
   end
 
-  def decrypt(data, context)
+  def decrypt(data, context, options)
     if encrypted?(data)
+      # Options must be set prior to each call to #parse since they end up as static variables in
+      # the Options class. They cannot be set once before #decrypt_value is called, since each #decrypt
+      # might cause a new lookup through interpolation. That lookup in turn, might use a different eyaml
+      # config.
+      #
+      Hiera::Backend::Eyaml::Options.set(options)
       tokens = Hiera::Backend::Eyaml::Parser::ParserFactory.hiera_backend_parser.parse(data)
       data = tokens.map(&:to_plain_text).join.chomp
     end

data/lib/puppet/functions/hiera.rb

@@ -2,6 +2,11 @@ require 'hiera/puppet_function'
 # Performs a standard priority lookup of the hierarchy and returns the most specific value
 # for a given key. The returned value can be any type of data.
 #
+# This function is deprecated in favor of the `lookup` function. While this function
+# continues to work, it does **not** support:
+# * `lookup_options` stored in the data
+# * lookup across global, environment, and module layers
+#
 # The function takes up to three arguments, in this order:
 #
 # 1. A string key that Hiera searches for in the hierarchy. **Required**.
@@ -71,8 +76,10 @@ require 'hiera/puppet_function'
 # above, Hiera matches the 'users' key and returns it as a hash.
 #
 # See
-# [the documentation](https://docs.puppetlabs.com/hiera/latest/puppet.html#hiera-lookup-functions)
-# for more information about Hiera lookup functions.
+# [the 'Using the lookup function' documentation](https://docs.puppet.com/puppet/latest/hiera_use_function.html) for how to perform lookup of data.
+# Also see
+# [the 'Using the deprecated hiera functions' documentation](https://docs.puppet.com/puppet/latest/hiera_use_hiera_functions.html)
+# for more information about the Hiera 3 functions.
 #
 # @since 4.0.0
 #

data/lib/puppet/functions/hiera_array.rb

@@ -5,6 +5,11 @@ require 'hiera/puppet_function'
 # included in the results. This is called an
 # [array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge).
 #
+# This function is deprecated in favor of the `lookup` function. While this function
+# continues to work, it does **not** support:
+# * `lookup_options` stored in the data
+# * lookup across global, environment, and module layers
+#
 # The `hiera_array` function takes up to three arguments, in this order:
 #
 # 1. A string key that Hiera searches for in the hierarchy. **Required**.
@@ -60,8 +65,10 @@ require 'hiera/puppet_function'
 # value is a hash, Puppet raises a type mismatch error.
 #
 # See
-# [the documentation](https://docs.puppetlabs.com/hiera/latest/puppet.html#hiera-lookup-functions)
-# for more information about Hiera lookup functions.
+# [the 'Using the lookup function' documentation](https://docs.puppet.com/puppet/latest/hiera_use_function.html) for how to perform lookup of data.
+# Also see
+# [the 'Using the deprecated hiera functions' documentation](https://docs.puppet.com/puppet/latest/hiera_use_hiera_functions.html)
+# for more information about the Hiera 3 functions.
 #
 # @since 4.0.0
 #

data/lib/puppet/functions/hiera_hash.rb

@@ -1,6 +1,12 @@
 require 'hiera/puppet_function'
 
 # Finds all matches of a key throughout the hierarchy and returns them in a merged hash.
+#
+# This function is deprecated in favor of the `lookup` function. While this function
+# continues to work, it does **not** support:
+# * `lookup_options` stored in the data
+# * lookup across global, environment, and module layers
+#
 # If any of the matched hashes share keys, the final hash uses the value from the
 # highest priority match. This is called a
 # [hash merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#hash-merge).
@@ -70,8 +76,10 @@ require 'hiera/puppet_function'
 # found in the data sources are strings or arrays, Puppet raises a type mismatch error.
 #
 # See
-# [the documentation](https://docs.puppetlabs.com/hiera/latest/puppet.html#hiera-lookup-functions)
-# for more information about Hiera lookup functions.
+# [the 'Using the lookup function' documentation](https://docs.puppet.com/puppet/latest/hiera_use_function.html) for how to perform lookup of data.
+# Also see
+# [the 'Using the deprecated hiera functions' documentation](https://docs.puppet.com/puppet/latest/hiera_use_hiera_functions.html)
+# for more information about the Hiera 3 functions.
 #
 # @since 4.0.0
 #

data/lib/puppet/functions/hiera_include.rb

@@ -4,6 +4,18 @@ require 'hiera/puppet_function'
 # [array merge lookup](https://docs.puppetlabs.com/hiera/latest/lookup_types.html#array-merge)
 # that retrieves the value for a user-specified key from Hiera's data.
 #
+# This function is deprecated in favor of the `lookup` function in combination with `include`.
+# While this function continues to work, it does **not** support:
+# * `lookup_options` stored in the data
+# * lookup across global, environment, and module layers
+#
+# @example Using `lookup` and `include` instead of of the deprecated `hiera_include`
+# 
+# ~~~puppet
+# # In site.pp, outside of any node definitions and below any top-scope variables:
+# lookup('classes', Array[String], 'unique').include
+# ~~~
+#
 # The `hiera_include` function requires:
 #
 # - A string key name to use for classes.
@@ -70,9 +82,11 @@ require 'hiera/puppet_function'
 # # "Key 'classes' not found".
 # ~~~
 #
-# See [the documentation](http://links.puppetlabs.com/hierainclude) for more information
-# and a more detailed example of how `hiera_include` uses array merge lookups to classify
-# nodes.
+# See
+# [the 'Using the lookup function' documentation](https://docs.puppet.com/puppet/latest/hiera_use_function.html) for how to perform lookup of data.
+# Also see
+# [the 'Using the deprecated hiera functions' documentation](https://docs.puppet.com/puppet/latest/hiera_use_hiera_functions.html)
+# for more information about the Hiera 3 functions.
 #
 # @since 4.0.0
 #

data/lib/puppet/functions/hocon_data.rb

@@ -1,3 +1,9 @@
+# The `hocon_data` is a hiera 5 `data_hash` data provider function.
+# See [the configuration guide documentation](https://docs.puppet.com/puppet/latest/hiera_config_yaml_5.html#configuring-a-hierarchy-level-built-in-backends) for
+# how to use this function.
+#
+# Note that this function is not supported without a hocon library being present.
+#
 # @since 4.9.0
 #
 Puppet::Functions.create_function(:hocon_data) do

data/lib/puppet/functions/json_data.rb

@@ -1,3 +1,7 @@
+# The `json_data` is a hiera 5 `data_hash` data provider function.
+# See [the configuration guide documentation](https://docs.puppet.com/puppet/latest/hiera_config_yaml_5.html#configuring-a-hierarchy-level-built-in-backends) for
+# how to use this function.
+#
 # @since 4.8.0
 #
 Puppet::Functions.create_function(:json_data) do

data/lib/puppet/functions/yaml_data.rb

@@ -1,3 +1,7 @@
+# The `yaml_data` is a hiera 5 `data_hash` data provider function.
+# See [the configuration guide documentation](https://docs.puppet.com/puppet/latest/hiera_config_yaml_5.html#configuring-a-hierarchy-level-built-in-backends) for
+# how to use this function.
+#
 # @since 4.8.0
 #
 require 'yaml'

data/lib/puppet/generate/models/type/type.rb

@@ -37,14 +37,15 @@ module Puppet
             @parameters = type.parameters.map do |name|
               Property.new(type.paramclass(name))
             end
+            sc = Puppet::Pops::Types::StringConverter.singleton
             @title_patterns = Hash[type.title_patterns.map do |mapping|
               [
-                "/#{mapping[0].source.gsub(/\//, '\/')}/",
-                mapping[1].map { |names|
+                sc.convert(mapping[0], '%p'),
+                sc.convert(mapping[1].map do |names|
                   next if names.empty?
-                  raise Puppet::Error, 'title patterns that use procs are not supported.' if names.size != 1
-                  Puppet::Pops::Types::StringConverter.convert(names[0].to_s, '%p')
-                }
+                  raise Puppet::Error, _('title patterns that use procs are not supported.') unless names.size == 1
+                  names[0].to_s
+                end, '%p')
               ]
             end]
             @isomorphic = type.isomorphic?

data/lib/puppet/generate/templates/type/pcore.erb

@@ -34,7 +34,7 @@ Puppet::Resource::ResourceType3.new(
   ],
   {
 <%- title_patterns.each_with_index do |mapping, index| -%>
-    <%= mapping[0] %> => [<%= mapping[1].join(', ')%>]<%= "," if index + 1 < title_patterns.size %>
+    <%= mapping[0] %> => <%= mapping[1] %><%= "," if index + 1 < title_patterns.size %>
 <%- end -%>
   },
   <%= isomorphic -%>,