puppet 4.10.12-x86-mingw32 → 5.0.0-x86-mingw32

data/CONTRIBUTING.md

@@ -22,17 +22,18 @@ be added in modules. Exceptions would be things like new cross-OS providers
 and updates to existing core types.
 
 If you are unsure of whether your contribution should be implemented as a
-module or part of Puppet Core, you may visit [#puppet-dev on slack](https://puppetcommunity.slack.com/), or ask on
-the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev) for advice.
+module or part of Puppet Core, you may visit
+[#puppet-dev on Freenode IRC](https://freenode.net) or ask on the
+[puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
+for advice.
 
 ## Getting Started
 
 * Make sure you have a [Jira account](https://tickets.puppetlabs.com)
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a Jira ticket for your issue if one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug
+* Submit a ticket for your issue, assuming one does not already exist.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
   * Make sure you fill in the earliest version that you know has the issue.
-  * A ticket is not necessary for [trivial changes](https://docs.puppet.com/community/trivial_patch_exemption.html)
 * Fork the repository on GitHub
 
 ## Making Changes
@@ -44,7 +45,7 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
   * To quickly create a topic branch based on master; `git checkout -b
     fix/master/my_contribution master`. Please avoid working directly on the
     `master` branch.
-* Make commits of logical and atomic units.
+* Make commits of logical units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are in the proper format.
 
@@ -63,20 +64,36 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
 ````
 
 * Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken. First
-  install all the test dependencies with `bundle install --path .bundle`. Then
-  either run all the tests serially with `bundle exec rspec spec` or in parallel
-  with `bundle exec rake parallel:spec[process_count]`
+* Run _all_ the tests to assure nothing else was accidentally broken.
+
+## Writing Translatable Code
+
+We use [gettext tooling](https://github.com/puppetlabs/gettext-setup-gem) to
+extract user-facing strings and pull in translations based on the user's locale
+at runtime. In order for this tooling to work, all user-facing strings must be
+wrapped in the `_()` translation function, so they can be extracted into files
+for the translators.
+
+When adding user-facing strings to your work, follow these guidelines:
+* Use full sentences. Strings built up out of concatenated bits are hard to translate.
+* Use string formatting instead of interpolation.
+    Ex. `_('Creating new user %{name}.') % { name: user.name }`
+* Use `n_()` for pluralization. (see gettext gem docs linked above for details)
+
+It is the responsibility of contributors and code reviewers to ensure that all
+user-facing strings are marked in new PRs before merging.
 
 ## Making Trivial Changes
 
-For [changes of a trivial nature](https://docs.puppet.com/community/trivial_patch_exemption.html), it is not always necessary to create a new
-ticket in Jira. In this case, it is appropriate to start the first line of a
-commit with one of  `(docs)`, `(maint)`, or `(packaging)` instead of a ticket
-number.
+### Documentation
+
+For changes of a trivial nature to comments and documentation, it is not
+always necessary to create a new ticket in Jira. In this case, it is
+appropriate to start the first line of a commit with '(doc)' instead of
+a ticket number.
 
 ````
-    (docs) Add documentation commit example to CONTRIBUTING
+    (doc) Add documentation commit example to CONTRIBUTING
 
     There is no example for contributing a documentation commit
     to the Puppet repository. This is a problem because the contributor

data/Gemfile

@@ -1,7 +1,5 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-gemspec
-
 def location_for(place, fake_version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
@@ -24,17 +22,16 @@ platforms :ruby do
   #gem 'ruby-augeas', :group => :development
 end
 
-# override .gemspec deps - may issue warning depending on Bundler version
-gem "facter", *location_for(ENV['FACTER_LOCATION']) if ENV.has_key?('FACTER_LOCATION')
-gem "hiera", *location_for(ENV['HIERA_LOCATION']) if ENV.has_key?('HIERA_LOCATION')
+gem "puppet", :path => File.dirname(__FILE__), :require => false
+gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 2.0', '< 4'])
+gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['>= 3.2.1', '< 4'])
 # PUP-7115 - return to a gem dependency in Puppet 5
 # gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ['>= 0.1.3', '< 2'])
+# i18n support (gettext-setup and dependencies)
+gem 'gettext-setup', '>= 0.10', '< 1.0', :require => false
+gem 'locale', '~> 2.1', :require => false
 
 group(:development, :test) do
-  # rake is in .gemspec as a development dependency but cannot
-  # be removed here *yet* due to TravisCI / AppVeyor which call:
-  # bundle install --without development
-  # PUP-7433 describes work necessary to restructure this
   gem "rake", "10.1.1", :require => false
   gem "rspec", "~> 3.1", :require => false
   gem "rspec-its", "~> 1.1", :require => false
@@ -54,25 +51,23 @@ group(:development, :test) do
   gem "json-schema", "2.1.1", :require => false, :platforms => [:ruby, :jruby]
 
   gem "rubocop", "~> 0.39.0", :platforms => [:ruby]
+  # pin rainbow gem as 2.2.1 requires rubygems 2.6.9+ and (donotwant)
+  gem "rainbow", "< 2.2.1", :platforms => [:ruby]
 
   gem 'rdoc', "~> 4.1", :platforms => [:ruby]
   gem 'yard'
 
-  # ronn is used for generating manpages.
-  gem 'ronn', '~> 0.7.3', :platforms => [:ruby]
-
   # webmock requires addressable as as of 2.5.0 addressable started
   # requiring the public_suffix gem which requires Ruby 2
   gem 'addressable', '< 2.5.0'
   gem 'webmock', '~> 1.24'
   gem 'vcr', '~> 2.9'
-  gem "hocon", :require => false
   gem "hiera-eyaml", :require => false
 end
 
 group(:development) do
   if RUBY_PLATFORM != 'java'
-    gem 'ruby-prof', :require => false
+    gem 'ruby-prof', '>= 0.16.0', :require => false
   end
 end
 
@@ -82,6 +77,28 @@ group(:extra) do
   gem "msgpack", :require => false
 end
 
+require 'yaml'
+data = YAML.load_file(File.join(File.dirname(__FILE__), 'ext', 'project_data.yaml'))
+bundle_platforms = data['bundle_platforms']
+x64_platform = Gem::Platform.local.cpu == 'x64'
+data['gem_platform_dependencies'].each_pair do |gem_platform, info|
+  next if gem_platform == 'x86-mingw32' && x64_platform
+  next if gem_platform == 'x64-mingw32' && !x64_platform
+  if bundle_deps = info['gem_runtime_dependencies']
+    bundle_platform = bundle_platforms[gem_platform] or raise "Missing bundle_platform"
+    if bundle_platform == "all"
+      bundle_deps.each_pair do |name, version|
+        gem(name, version, :require => false)
+      end
+    else
+      platform(bundle_platform.intern) do
+        bundle_deps.each_pair do |name, version|
+          gem(name, version, :require => false)
+        end
+      end
+    end
+  end
+end
 
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)

data/MAINTAINERS

@@ -29,11 +29,6 @@
       "email": "branan@puppet.com",
       "name": "Branan Riley"
     },
-    {
-      "github": "whopper",
-      "email": "whopper@puppet.com",
-      "name": "Will Hopper"
-    },
     {
       "github": "Iristyle",
       "name": "Ethan J. Brown"

data/README.md

@@ -12,41 +12,41 @@ Documentation
 -------------
 
 Documentation for Puppet and related projects can be found online at the
-[Puppet Docs site](https://puppet.com/docs).
+[Puppet Docs site](https://docs.puppetlabs.com).
 
 HTTP API
 --------
-[HTTP API Index](https://puppet.com/docs/puppet/4.10/http_api/http_api_index.html)
+[HTTP API Index](https://docs.puppetlabs.com/puppet/latest/reference/http_api/http_api_index.html)
 
 Installation
 ------------
 
-The best way to run Puppet is with [Puppet Enterprise](https://puppet.com/puppet/puppet-enterprise),
+The best way to run Puppet is with [Puppet Enterprise](https://puppetlabs.com/puppet/puppet-enterprise),
 which also includes orchestration features, a web console, and professional support.
-[The PE documentation is available here.](https://puppet.com/docs/pe/latest)
+[The PE documentation is available here.](https://docs.puppetlabs.com/pe/latest)
 
 To install an open source release of Puppet,
-[see the installation guide on the docs site.](http://puppet.com/docs/puppet/4.10/install_pre.html)
+[see the installation guide on the docs site.](http://docs.puppetlabs.com/puppet/latest/reference/install_pre.html)
 
 If you need to run Puppet from source as a tester or developer,
-[see the running from source guide on the docs site.](https://docs.puppet.com/puppet/3.8/from_source.html)
+[see the running from source guide on the docs site.](https://docs.puppetlabs.com/guides/from_source.html)
 
 Developing and Contributing
 ------
 
 We'd love to get contributions from you! For a quick guide to getting your
 system setup for developing take a look at our [Quickstart
-Guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md). Once you are up and running, take a look at the
-[Contribution Documents](https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md) to see how to get your changes merged
+Guide](docs/quickstart.md). Once you are up and running, take a look at the
+[Contribution Documents](CONTRIBUTING.md) to see how to get your changes merged
 in.
 
 For more complete docs on developing with puppet you can take a look at the
-rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/master/docs/index.md).
+rest of the [developer documents](docs/index.md).
 
 License
 -------
 
-See [LICENSE](https://github.com/puppetlabs/puppet/blob/master/LICENSE) file.
+See [LICENSE](LICENSE) file.
 
 Support
 -------
@@ -71,4 +71,4 @@ a best effort to backport that fix onto the latest Puppet 3 release.
 Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:
 
-[Puppet Enterprise Support Lifecycle](https://puppet.com/misc/puppet-enterprise-lifecycle)
+[Puppet Enterprise Support Lifecycle](https://puppetlabs.com/misc/puppet-enterprise-lifecycle)

data/Rakefile

@@ -92,8 +92,9 @@ task(:commits) do
       raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
         "\n\t\t#{commit_summary}\n" \
         "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
-        "\t\t(pup-<digits>) # this is most common and should be a ticket at tickets.puppetlabs.com\n" \
+        "\t\t(PUP-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \
         "\t\t(docs)\n" \
+        "\t\t(docs)(DOCUMENT-<digits>)\n" \
         "\t\t(maint)\n" \
         "\t\t(packaging)\n" \
         "\n\tThis test for the commit summary is case-insensitive.\n\n\n"

data/conf/auth.conf

@@ -57,6 +57,27 @@
 # (ie exactly as if auth yes was present).
 #
 
+# CONTROLLING FILE ACCESS (previously in fileserver.conf)
+
+# In previous versions of Puppet, you controlled file access by adding
+# rules to fileserver.conf. In Puppet 5 with Puppet Server, you can control
+# file access in auth.conf by controlling the /file_metadata(s)/<mount point>,
+# /file_content(s)/<mount point>, and /static_file_content/<file> paths. See the
+# Puppet Server documentation at
+# https://docs.puppet.com/puppetserver/latest/config_file_auth.html.
+#
+# If you are not using Puppet Server, or are using Puppet Server but with the
+# "jruby-puppet.use-legacy-auth-conf" setting set to "true", you could set the
+# desired file access in a new rule in this file. For example:
+#
+# path ~ ^/file_(metadata|content)s?/extra_files/
+# auth yes
+# allow /^(.+)\.example\.com$/
+# allow_ip 192.168.100.0/24
+#
+# If added to auth.conf BEFORE the default "path /file" rule, this rule
+# will add stricter restrictions to the extra_files mount point.
+
 ### Authenticated ACLs - these rules apply only when the client
 ### has a valid certificate and is thus authenticated
 

data/conf/fileserver.conf

@@ -27,16 +27,11 @@
 
 # PERMISSIONS
 
-# Every static mount point should have an `allow *` line; setting more
-# granular permissions in this file is deprecated. Instead, you can
-# control file access in auth.conf by controlling the
-# /file_metadata(s)/<mount point> and /file_content(s)/<mount point> paths.
-# For example:
+# The ability to set permissions - for example, using the allow, allow_ip, or
+# deny directives - has been removed. Instead, you can control file access in
+# auth.conf by controlling the /file_metadata(s)/<mount point> and
+# /file_content(s)/<mount point> paths.
 #
-# path ~ ^/file_(metadata|content)s?/extra_files/
-# auth yes
-# allow /^(.+)\.example\.com$/
-# allow_ip 192.168.100.0/24
-#
-# If added to auth.conf BEFORE the default "path /file" rule, this rule
-# will add stricter restrictions to the extra_files mount point.
+# For details and an example, see the auth.conf file. If you're using Puppet
+# Server, see the Puppet Server documentation at
+# https://docs.puppet.com/puppetserver/latest/config_file_auth.html.

data/conf/hiera.yaml

@@ -0,0 +1,11 @@
+---
+# Hiera 5 Global configuration file
+
+version: 5
+
+# defaults:
+#   data_hash: yaml_data
+# hierarchy:
+#  - name: Common
+#    data_hash: yaml_data
+hierarchy: []

data/ext/debian/puppet-common.install

@@ -1,4 +1,3 @@
 debian/puppet.conf etc/puppet
 debian/tmp/usr/bin/puppet usr/bin
-debian/tmp/usr/bin/extlookup2hiera usr/bin
 debian/tmp/usr/lib/ruby/vendor_ruby/* usr/lib/ruby/vendor_ruby

data/ext/debian/puppet-common.manpages

@@ -1,5 +1,4 @@
 man/man5/puppet.conf.5
-man/man8/extlookup2hiera.8
 man/man8/puppet.8
 man/man8/puppet-agent.8
 man/man8/puppet-apply.8
@@ -26,5 +25,4 @@ man/man8/puppet-parser.8
 man/man8/puppet-plugin.8
 man/man8/puppet-report.8
 man/man8/puppet-resource.8
-man/man8/puppet-resource_type.8
 man/man8/puppet-status.8

data/ext/hiera/hiera.yaml

@@ -0,0 +1,15 @@
+---
+version: 5
+defaults:
+  # The default value for "datadir" is "data" under the same directory as the hiera.yaml
+  # file (this file)
+  # When specifying a datadir, make sure the directory exists.
+  # See https://docs.puppet.com/puppet/latest/environments.html for further details on environments.
+  # datadir: data
+  # data_hash: yaml_data
+hierarchy:
+  - name: "Per-node data (yaml version)"
+    path: "nodes/%{::trusted.certname}.yaml"
+  - name: "Other YAML hierarchy levels"
+    paths:
+      - "common.yaml"

data/ext/logcheck/puppet

@@ -1,6 +1,6 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: (Handled resources in|Resource comparison took|Searched for (host|resources|resource params and tags) in) [0-9.]+ seconds
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Starting Puppet server version [.0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in environment [_[:alnum:]]+ in [.[:digit:]]+ seconds$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Caught TERM; shutting down$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Shutting down$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Starting Puppet client version [.0-9]+$

data/ext/project_data.yaml

@@ -18,8 +18,7 @@ gem_required_ruby_version: '>= 1.9.3'
 gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
   facter: ['> 2.0', '< 4']
-  hiera: ['>= 2.0', '< 4']
-  json_pure: '~> 1.8'
+  hiera: ['>= 3.2.1', '< 4']
   # PUP-7115 - return to a gem dependency in Puppet 5
   # semantic_puppet: ['>= 0.1.3', '< 2']
   gettext-setup: ['>= 0.10', '< 1']
@@ -33,15 +32,13 @@ gem_rdoc_options:
 gem_platform_dependencies:
   universal-darwin:
     gem_runtime_dependencies:
-      CFPropertyList: '~> 2.2.6'
+      CFPropertyList: '~> 2.2'
   x86-mingw32:
     gem_runtime_dependencies:
       # Pinning versions that require native extensions
-      # ffi is pinned due to PUP-8438
-      ffi: '<= 1.9.18'
+      ffi: '~> 1.9.6'
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
-      win32-eventlog: '= 0.6.5'
       win32-process: '= 0.7.5'
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'
@@ -49,11 +46,9 @@ gem_platform_dependencies:
       minitar: '~> 0.6.1'
   x64-mingw32:
     gem_runtime_dependencies:
-      # ffi is pinned due to PUP-8438
-      ffi: '<= 1.9.18'
+      ffi: '~> 1.9.6'
       # win32-xxxx gems are pinned due to PUP-6445
       win32-dir: '= 0.4.9'
-      win32-eventlog: '= 0.6.5'
       win32-process: '= 0.7.5'
       # Use of win32-security is deprecated
       win32-security: '= 0.2.5'

data/ext/puppet-test

@@ -235,30 +235,6 @@ Suite.new :local_catalog, "Local catalog handling" do
     end
 end
 
-Suite.new :resource_type, "Managing resource types" do
-    newtest :find, "Find a type" do
-        Puppet::Resource::Type.terminus_class = :parser
-        ARGV.each do |name|
-            json = Puppet::Resource::Type.find(name).to_pson
-            data = PSON.parse(json)
-            p Puppet::Resource::Type.from_data_hash(data)
-        end
-    end
-
-    newtest :search_types, "Find all types" do
-        Puppet::Resource::Type.terminus_class = :rest
-        result = Puppet::Resource::Type.search("*")
-        result.each { |r| p r }
-    end
-
-    newtest :restful_type, "Find a type and return it via REST" do
-        Puppet::Resource::Type.terminus_class = :rest
-        ARGV.each do |name|
-            p Puppet::Resource::Type.find(name)
-        end
-    end
-end
-
 Suite.new :remote_catalog, "Remote catalog handling" do
     def prepare
         $args[:cache] = false

data/ext/rack/config.ru

@@ -20,10 +20,10 @@ ARGV << "--logdir"  << "/var/log/puppetlabs/puppetmaster"
 ARGV << "--rundir"  << "/var/run/puppetlabs/puppetmaster"
 ARGV << "--codedir"  << "/etc/puppetlabs/code"
 
-# always_cache_features is a performance improvement and safe for a master to
+# disable always_retry_plugsin as a performance improvement. This is safe for a master to
 # apply. This is intended to allow agents to recognize new features that may be
 # delivered during catalog compilation.
-ARGV << "--always_cache_features"
+ARGV << "--no-always_retry_plugins"
 
 # NOTE: it's unfortunate that we have to use the "CommandLine" class
 #  here to launch the app, but it contains some initialization logic