puppet 8.2.0-x64-mingw32 → 8.4.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cac44de8d153aa3494c010c5004425f0912b81aa9287747b5e302f2b59550a
-  data.tar.gz: ae6866634e1e346ef8a28a964cfa1552c02f8afe21ca4894682cc850656afb1c
+  metadata.gz: 7ed875940ad4f0b0d29fe70b7a396c1eef2b18fa1d81c3535427489c8dea197f
+  data.tar.gz: 7cd7c8eed9692b698345817323a70943798d31323b4abfe2e92d51e979da0dd2
 SHA512:
-  metadata.gz: b3e63d91ca04d5df03e46ed9949070a25a8fd2364e25a6b813322d92f0a8a62c0778a80e6d3c2b51802ca888f4c87cdf2929953c466866ed95eb6e5117a155cb
-  data.tar.gz: d826de6788fbe4fb802c2ff1be076783669a6c257ba2332ceca5d3e2bae64a576a4a5f8bcccab1f23f983b5b0bd4b2624106de27e6f35199d2beff79e5c6e94d
+  metadata.gz: b89097dc1f289aba96fc2577c300b547df547c86b7f76ed910e2d95cc64cfe530c27cb51c547c50342b6ad0d9d1547a3e357f50f1f6edd489f0cb4a15e919d31
+  data.tar.gz: 2461b4d328e8543a8e491a526d3689c866bd27bd12890ec835ba4e8bee541b73680b36b1ab23cef82665dab29c84636b57f69c32eb7a1be6d6ed7f94b0efd87a

data/Gemfile

@@ -36,7 +36,7 @@ group(:features) do
 end
 
 group(:test) do
-  gem "ffi", require: false
+  gem "ffi", '1.15.5', require: false
   gem "json-schema", "~> 2.0", require: false
   gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 13.0')
   gem "rspec", "~> 3.1", require: false

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/puppetlabs/packaging
-  revision: affecba5dfacc5862fc7199895ccf11b69153570
+  revision: 6c91ebc40b07f2041aa39b21becde6a06684e1b9
   branch: 1.0.x
   specs:
     packaging (0)
@@ -15,7 +15,7 @@ GIT
 PATH
   remote: .
   specs:
-    puppet (8.2.0)
+    puppet (8.4.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -31,17 +31,18 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.8.5)
+    abbrev (0.1.2)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     apt_stage_artifacts (0.11.0)
       docopt
     artifactory (3.0.15)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     crack (0.4.5)
       rexml
-    csv (3.2.7)
+    csv (3.2.8)
     declarative (0.0.20)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
@@ -49,17 +50,17 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     docopt (0.6.1)
     erubi (1.12.0)
-    facter (4.4.2)
+    facter (4.5.1)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
-    faraday (2.7.10)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
     fast_gettext (2.3.0)
     ffi (1.15.5)
     forwardable (1.3.3)
-    gettext (3.4.7)
+    gettext (3.4.9)
       erubi
       locale (>= 2.0.5)
       prime
@@ -69,7 +70,7 @@ GEM
       fast_gettext (~> 2.1)
       gettext (~> 3.4)
       locale
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -77,37 +78,37 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (2.1.0)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.7.0)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.9.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hiera-eyaml (3.4.0)
       highline
       optimist
-    highline (2.1.0)
+    highline (3.0.0)
+      abbrev
     hocon (1.4.0)
     hpricot (0.8.6)
     httpclient (2.8.3)
@@ -115,7 +116,6 @@ GEM
       addressable (>= 2.4)
     jwt (2.7.1)
     locale (2.1.3)
-    memoist (0.16.2)
     memory_profiler (1.0.1)
     method_source (1.0.0)
     mini_mime (1.1.5)
@@ -123,10 +123,12 @@ GEM
     msgpack (1.7.2)
     multi_json (1.15.0)
     mustache (1.1.1)
+    net-http (0.4.1)
+      uri
     optimist (3.1.0)
     os (1.1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
     prime (0.1.2)
@@ -135,17 +137,17 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puppet-resource_api (1.9.0)
       hocon (>= 1.0)
     puppetserver-ca (2.6.0)
       facter (>= 2.0.1, < 5)
     racc (1.5.2)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rdiscount (2.2.7.1)
+    rake (13.1.0)
+    rdiscount (2.2.7.3)
     rdoc (6.3.3)
-    regexp_parser (2.8.1)
+    regexp_parser (2.9.0)
     release-metrics (1.1.0)
       csv
       docopt
@@ -184,28 +186,28 @@ GEM
       rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    ruby-prof (1.6.3)
+    ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     scanf (1.0.0)
     semantic_puppet (1.1.0)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    singleton (0.1.1)
+    singleton (0.2.0)
     text (1.3.1)
-    thor (1.2.2)
+    thor (1.3.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
+    uri (0.13.0)
     vcr (6.2.0)
-    webmock (3.18.1)
+    webmock (3.19.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -218,7 +220,7 @@ PLATFORMS
 DEPENDENCIES
   diff-lcs (~> 1.3)
   facter (~> 4.3)
-  ffi
+  ffi (= 1.15.5)
   gettext-setup (~> 1.0)
   hiera-eyaml
   hocon (~> 1.0)
@@ -248,4 +250,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.12
+   2.4.20

data/README.md

@@ -46,7 +46,7 @@ See [LICENSE](https://github.com/puppetlabs/puppet/blob/main/LICENSE) file. Pupp
 
 ## Support
 
-Please log tickets and issues at our [JIRA tracker](https://tickets.puppetlabs.com). A [mailing
+Please log issues in this project's [GitHub Issues](https://github.com/puppetlabs/puppet/issues). A [mailing
 list](https://groups.google.com/forum/?fromgroups#!forum/puppet-users) is
 available for asking questions and getting help from others, or if you prefer chat, we also have a [Puppet Community slack.](https://puppetcommunity.slack.com/)
 
@@ -58,9 +58,9 @@ Bug fixes and ongoing development will occur in minor releases for the current
 major version. Security fixes will be backported to a previous major version on
 a best-effort basis, until the previous major version is no longer maintained.
 
-For example: If a security vulnerability is discovered in Puppet 6.1.1, we
-would fix it in the 6 series, most likely as 6.1.2. Maintainers would then make
-a best effort to backport that fix onto the latest Puppet 5 release.
+For example: If a security vulnerability is discovered in Puppet 8.1.1, we
+would fix it in the 8 series, most likely as 8.1.2. Maintainers would then make
+a best effort to backport that fix onto the latest Puppet 7 release.
 
 Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:

data/Rakefile

@@ -58,33 +58,6 @@ task(:rubocop) do
   raise "RuboCop detected offenses" if exit_code != 0
 end
 
-desc "verify that commit messages match CONTRIBUTING.md requirements"
-task(:commits) do
-  # This rake task looks at the summary from every commit from this branch not
-  # in the branch targeted for a PR.
-  commit_range = 'HEAD^..HEAD'
-  puts "Checking commits #{commit_range}"
-  %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
-    # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
-    # The exception tries to explain it in more full.
-    if /^\((maint|doc|docs|packaging|l10n|pup-\d+)\)|revert/i.match(commit_summary).nil?
-      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.puppet.com\n" \
-        "\t\t(docs)\n" \
-        "\t\t(docs)(DOCUMENT-<digits>)\n" \
-        "\t\t(maint)\n" \
-        "\t\t(packaging)\n" \
-        "\t\t(L10n)\n" \
-        "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
-    else
-      puts "#{commit_summary}"
-    end
-    puts "...passed"
-  end
-end
-
 desc "verify that changed files are clean of Ruby warnings"
 task(:warnings) do
   # This rake task looks at all files modified in this branch.

data/examples/enc/regexp_nodes/regexp_nodes.rb

@@ -133,7 +133,7 @@ class ExternalNode
     patternlist = []
 
     begin
-      open(filepath).each do |l|
+      File.open(filepath).each do |l|
         l.chomp!
 
         next if l =~ /^$/

data/ext/project_data.yaml

@@ -39,11 +39,11 @@ gem_platform_dependencies:
       CFPropertyList: '~> 2.2'
   x86-mingw32:
     gem_runtime_dependencies:
-      ffi: ['> 1.9.24', '< 2']
+      ffi: '1.15.5'
       minitar: '~> 0.9'
   x64-mingw32:
     gem_runtime_dependencies:
-      ffi: ['> 1.9.24', '< 2']
+      ffi: '1.15.5'
       minitar: '~> 0.9'
 bundle_platforms:
   universal-darwin: all

data/ext/windows/service/daemon.rb

@@ -13,7 +13,7 @@ require 'puppet/util/windows/eventlog'
 require 'puppet/util/windows/monkey_patches/process'
 
 class WindowsDaemon < Puppet::Util::Windows::Daemon
-  CREATE_NEW_CONSOLE          = 0x00000010
+  CREATE_NEW_CONSOLE = 0x00000010
 
   @run_thread = nil
   @LOG_TO_FILE = false
@@ -96,7 +96,6 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
       end
     end
     @run_thread.join
-
   rescue Exception => e
     log_exception(e)
   ensure
@@ -147,9 +146,9 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
       eventlog = nil
       eventlog = Puppet::Util::Windows::EventLog.open("Puppet")
       eventlog.report_event(
-        :event_type  => type,   # EVENTLOG_ERROR_TYPE, etc
-        :event_id    => id,     # 0x01 or 0x02, 0x03 etc.
-        :data        => message # "the message"
+        :event_type => type, # EVENTLOG_ERROR_TYPE, etc
+        :event_id => id, # 0x01 or 0x02, 0x03 etc.
+        :data => message # "the message"
       )
     rescue Exception
       # Ignore all errors

data/lib/hiera/puppet_function.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'hiera_puppet'
 
 # Provides the base class for the puppet functions hiera, hiera_array, hiera_hash, and hiera_include.
@@ -22,7 +23,7 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
       scope_param
       param 'String',:key
       param 'Any',   :default
-      optional_param 'Any',   :override
+      optional_param 'Any', :override
     end
 
     dispatch :hiera_block1 do
@@ -61,7 +62,7 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
 
   def lookup(scope, key, default, has_default, override, &default_block)
     unless Puppet[:strict] == :off
-      #TRANSLATORS 'lookup' is a puppet function and should not be translated
+      # TRANSLATORS 'lookup' is a puppet function and should not be translated
       message = _("The function '%{class_name}' is deprecated in favor of using 'lookup'.") % { class_name: self.class.name }
       message += ' '+ _("See https://puppet.com/docs/puppet/%{minor_version}/deprecated_language.html") %
           { minor_version: Puppet.minor_version }

data/lib/hiera/scope.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'forwardable'
 class Hiera
   class Scope
@@ -45,7 +46,7 @@ class Hiera
         # do nothing
       when :warning
         Puppet.warn_once(Puppet::Parser::Scope::UNDEFINED_VARIABLES_KIND, _("Variable: %{name}") % { name: key },
-        _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason } )
+                         _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason } )
       when :error
         raise ArgumentError, _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason }
       end
@@ -86,6 +87,5 @@ class Hiera
 
     # This is needed for type conversion to work
     def_delegators :@real, :call_function
-
   end
 end

data/lib/hiera_puppet.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet.features.hiera?
 require 'hiera/scope'
 require_relative 'puppet'
@@ -49,9 +50,6 @@ module HieraPuppet
     return [key, default, override]
   end
 
-  private
-  module_function
-
   def hiera
     @hiera ||= Hiera.new(:config => hiera_config)
   end

data/lib/puppet/agent/disabler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/json_lockfile'
 
 # This module is responsible for encapsulating the logic for
@@ -41,10 +42,10 @@ module Puppet::Agent::Disabler
     if data.has_key?(DISABLED_MESSAGE_JSON_KEY)
       return data[DISABLED_MESSAGE_JSON_KEY]
     end
+
     nil
   end
 
-
   def disable_lockfile
     @disable_lockfile ||= Puppet::Util::JsonLockfile.new(Puppet[:agent_disabled_lockfile])
 

data/lib/puppet/agent/locker.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/pidlock'
 require_relative '../../puppet/error'
 
@@ -42,6 +43,4 @@ module Puppet::Agent::Locker
     @lockfile
   end
   private :lockfile
-
-
 end

data/lib/puppet/agent.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet/application'
 require_relative '../puppet/error'
 require_relative '../puppet/util/at_fork'
@@ -18,7 +19,7 @@ class Puppet::Agent
   include Puppet::Util::Splayer
 
   # Special exception class used to signal an agent run has timed out.
-  class RunTimeoutError < Exception
+  class RunTimeoutError < Exception # rubocop:disable Lint/InheritException
   end
 
   attr_reader :client_class, :client, :should_fork