puppet 7.26.0-universal-darwin → 8.0.1-universal-darwin

data/man/man5/puppet.conf.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPETCONF" "5" "April 2023" "Puppet, Inc." "Puppet manual"
 \fBThis page is autogenerated; any changes will get overwritten\fR
 .
 .SH "Configuration settings"
@@ -66,7 +66,7 @@ Whether to allow a new certificate request to overwrite an existing certificate
 Whether when unable to serialize to JSON or other formats, Puppet falls back to PSON\. This option affects both puppetserver\'s configuration management service responses and when the agent saves its cached catalog\. This option is useful in preventing the loss of data because rich data cannot be serialized via PSON\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBtrue\fR
+\fIDefault\fR: \fBfalse\fR
 .
 .IP "" 0
 .
@@ -392,7 +392,7 @@ Setting a global value for config_version in puppet\.conf is not allowed (but it
 Prints the value of a specific configuration setting\. If the name of a setting is provided for this, then the value is printed and puppet exits\. Comma\-separate multiple values\. For a list of all values, specify \'all\'\. This setting is deprecated, the \'puppet config\' command replaces this functionality\.
 .
 .SS "crl_refresh_interval"
-How often the Puppet agent refreshes its local CRL\. By default the CRL is only downloaded once, and never refreshed\. If a duration is specified, then the agent will refresh its CRL whenever it next runs and the elapsed time since the CRL was last refreshed exceeds the duration\.
+How often the Puppet agent refreshes its local CRL\. By default the CRL is refreshed once every 24 hours\. If a different duration is specified, then the agent will refresh its CRL whenever it next runs and the elapsed time since the CRL was last refreshed exceeds the duration\.
 .
 .P
 In general, the duration should be greater than the \fBruninterval\fR\. Setting it to an equal or lesser value will cause the CRL to be refreshed on every run\.
@@ -401,7 +401,7 @@ In general, the duration should be greater than the \fBruninterval\fR\. Setting
 If the agent downloads a new CRL, the agent will use it for subsequent network requests\. If the refresh request fails or if the CRL is unchanged on the server, then the agent run will continue using the local CRL it already has\.This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: ``
+\fIDefault\fR: \fB1d\fR
 .
 .IP "" 0
 .
@@ -659,7 +659,7 @@ Whether each resource should log when it is being evaluated\. This allows you to
 When set to true, resources that have had no changes after catalog application will not have corresponding unchanged resource status updates listed in the report\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBfalse\fR
+\fIDefault\fR: \fBtrue\fR
 .
 .IP "" 0
 .
@@ -945,7 +945,7 @@ The time to wait for data to be read from an HTTP connection\. If nothing is rea
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBPuppet/7\.26\.0 Ruby/2\.7\.5\-p203 (x86_64\-linux)\fR
+\fIDefault\fR: \fBPuppet/8\.0\.0 Ruby/3\.1\.1\-p18 (x86_64\-linux)\fR
 .
 .IP "" 0
 .
@@ -977,7 +977,7 @@ Boolean; whether puppet agent should ignore schedules\. This is useful for initi
 Whether to include legacy facts when requesting a catalog\. This option can be set to false provided all puppet manifests, hiera\.yaml and hiera configuration layers no longer access legacy facts, such as \fB$osfamily\fR, and instead access structured facts, such as \fB$facts[\'os\'][\'family\']\fR\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBtrue\fR
+\fIDefault\fR: \fBfalse\fR
 .
 .IP "" 0
 .
@@ -1511,10 +1511,10 @@ The preferred means of serializing ruby instances for passing over the wire\. Th
 .IP "" 0
 .
 .SS "preprocess_deferred"
-Whether puppet should call deferred functions before applying the catalog\. If set to \fBtrue\fR, then all prerequisites needed for the deferred function must be satified prior to puppet running\. If set to \fBfalse\fR, then deferred functions will follow puppet relationships and ordering\. This allows puppet to install prerequisites needed for a deferred function and call the deferred function in the same run\.
+Whether puppet should call deferred functions before applying the catalog\. If set to \fBtrue\fR, then all prerequisites needed for the deferred function must be satisfied prior to puppet running\. If set to \fBfalse\fR, then deferred functions will follow puppet relationships and ordering\. This allows puppet to install prerequisites needed for a deferred function and call the deferred function in the same run\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBtrue\fR
+\fIDefault\fR: \fBfalse\fR
 .
 .IP "" 0
 .
@@ -1957,10 +1957,10 @@ The strictness level of puppet\. Allowed values are:
 off \- do not perform extra validation, do not report
 .
 .IP "\(bu" 4
-warning \- perform extra validation, report as warning (default)
+warning \- perform extra validation, report as warning
 .
 .IP "\(bu" 4
-error \- perform extra validation, fail with error
+error \- perform extra validation, fail with error (default)
 .
 .IP "" 0
 .
@@ -1971,7 +1971,7 @@ The strictness level is for both language semantics and runtime evaluation valid
 No new validations will be added to a micro (x\.y\.z) release, but may be added in minor releases (x\.y\.0)\. In major releases it expected that most (if not all) strictness validation become standard behavior\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBwarning\fR
+\fIDefault\fR: \fBerror\fR
 .
 .IP "" 0
 .
@@ -1987,7 +1987,7 @@ Whether the agent specified environment should be considered authoritative, caus
 Causes an evaluation error when referencing unknown variables\. (This does not affect referencing variables that are explicitly set to undef)\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \fBfalse\fR
+\fIDefault\fR: \fBtrue\fR
 .
 .IP "" 0
 .

data/man/man8/puppet-agent.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-AGENT" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-agent\fR \- The puppet agent daemon

data/man/man8/puppet-apply.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-APPLY" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-APPLY" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-apply\fR \- Apply Puppet manifests locally

data/man/man8/puppet-catalog.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CATALOG" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CATALOG" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-catalog\fR \- Compile, save, view, and convert catalogs\.
@@ -31,10 +31,6 @@ Whether to log verbosely\.
 Whether to log debug information\.
 .
 .TP
-\-\-extra HASH
-A terminus can take additional arguments to refine the operation, which are passed as an arbitrary hash to the back\-end\. Anything passed as the extra value is just send direct to the back\-end\.
-.
-.TP
 \-\-terminus _TERMINUS
 Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
 .

data/man/man8/puppet-config.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CONFIG" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CONFIG" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-config\fR \- Interact with Puppet\'s settings\.

data/man/man8/puppet-describe.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DESCRIBE" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-describe\fR \- Display help about resource types

data/man/man8/puppet-device.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DEVICE" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DEVICE" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-device\fR \- Manage remote network devices

data/man/man8/puppet-doc.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DOC" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DOC" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-doc\fR \- Generate Puppet references

data/man/man8/puppet-epp.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-EPP" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-EPP" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-epp\fR \- Interact directly with the EPP template parser/renderer\.

data/man/man8/puppet-facts.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FACTS" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FACTS" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-facts\fR \- Retrieve and store facts\.
@@ -31,10 +31,6 @@ Whether to log verbosely\.
 Whether to log debug information\.
 .
 .TP
-\-\-extra HASH
-A terminus can take additional arguments to refine the operation, which are passed as an arbitrary hash to the back\-end\. Anything passed as the extra value is just send direct to the back\-end\.
-.
-.TP
 \-\-terminus _TERMINUS
 Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
 .

data/man/man8/puppet-filebucket.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FILEBUCKET" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket

data/man/man8/puppet-generate.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-GENERATE" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-GENERATE" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-generate\fR \- Generates Puppet code from Ruby definitions\.

data/man/man8/puppet-help.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-HELP" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-HELP" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-help\fR \- Display Puppet help\.

data/man/man8/puppet-lookup.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-LOOKUP" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-LOOKUP" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-lookup\fR \- Interactive Hiera lookup

data/man/man8/puppet-module.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MODULE" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MODULE" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-module\fR \- Creates, installs and searches for modules on the Puppet Forge\.

data/man/man8/puppet-node.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-NODE" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-node\fR \- View and manage node definitions\.
@@ -31,10 +31,6 @@ Whether to log verbosely\.
 Whether to log debug information\.
 .
 .TP
-\-\-extra HASH
-A terminus can take additional arguments to refine the operation, which are passed as an arbitrary hash to the back\-end\. Anything passed as the extra value is just send direct to the back\-end\.
-.
-.TP
 \-\-terminus _TERMINUS
 Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
 .

data/man/man8/puppet-parser.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PARSER" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-parser\fR \- Interact directly with the parser\.

data/man/man8/puppet-plugin.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PLUGIN" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.

data/man/man8/puppet-report.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-REPORT" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.
@@ -28,10 +28,6 @@ Whether to log verbosely\.
 Whether to log debug information\.
 .
 .TP
-\-\-extra HASH
-A terminus can take additional arguments to refine the operation, which are passed as an arbitrary hash to the back\-end\. Anything passed as the extra value is just send direct to the back\-end\.
-.
-.TP
 \-\-terminus _TERMINUS
 Indirector faces expose indirected subsystems of Puppet\. These subsystems are each able to retrieve and alter a specific type of data (with the familiar actions of \fBfind\fR, \fBsearch\fR, \fBsave\fR, and \fBdestroy\fR) from an arbitrary number of pluggable backends\. In Puppet parlance, these backends are called terminuses\.
 .

data/man/man8/puppet-resource.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

data/man/man8/puppet-script.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SCRIPT" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog

data/man/man8/puppet-ssl.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SSL" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SSL" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-ssl\fR \- Manage SSL keys and certificates for puppet SSL clients

data/man/man8/puppet.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "August 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "April 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
@@ -25,4 +25,4 @@ Specialized:
 catalog Compile, save, view, and convert catalogs\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v7\.26\.0
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v8\.0\.0

data/spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb

@@ -4,7 +4,7 @@ Puppet::Type.type(:a2mod).provide(:debian) do
     commands :encmd => "a2enmod"
     commands :discmd => "a2dismod"
 
-    defaultfor :operatingsystem => [:debian, :ubuntu]
+    defaultfor 'os.name' => [:debian, :ubuntu]
 
     def create
         encmd resource[:name]

data/spec/fixtures/releases/jamtur01-apache/manifests/init.pp

@@ -21,7 +21,7 @@ class apache {
    'headers' : ensure => present;
    'expires' : ensure => present;
   }
-  $vdir = $operatingsystem? {
+  $vdir = $os['name'] ? {
     'ubuntu' => '/etc/apache2/sites-enabled/',
     default => '/etc/httpd/conf.d',
   }

data/spec/fixtures/releases/jamtur01-apache/manifests/params.pp

@@ -2,7 +2,7 @@ class apache::params{
   $user  = 'www-data'
   $group = 'www-data'
 
-  case $operatingsystem {
+  case $os['name'] {
     "centos": {
        $apache_name = httpd
        $ssl_package = mod_ssl

data/spec/fixtures/releases/jamtur01-apache/manifests/ssl.pp

@@ -2,7 +2,7 @@ class apache::ssl {
   include apache
 
 
-  case $operatingsystem {
+  case $facts['os']['name'] {
      "centos": {
         package { $apache::params::ssl_package:
            require => Package['httpd'],

data/spec/fixtures/releases/jamtur01-apache/manifests/vhost.pp

@@ -1,6 +1,6 @@
 define apache::vhost( $port, $docroot, $ssl=true, $template='apache/vhost-default.conf.erb', $priority, $serveraliases = '' ) {
   include apache
-  $vdir = $operatingsystem? {
+  $vdir = $os['name']? {
     'ubuntu' => '/etc/apache2/sites-enabled/',
     default => '/etc/httpd/conf.d',
   }

data/spec/integration/application/agent_spec.rb

@@ -154,7 +154,9 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       end
     end
 
-    it "fails to apply a deferred function with an unsatified prerequisite" do
+    it "fails to apply a deferred function with an unsatisfied prerequisite" do
+      Puppet[:preprocess_deferred] = true
+
       catalog_handler = -> (req, res) {
         catalog = compile_to_catalog(deferred_manifest, node)
         res.body = formatter.render(catalog)
@@ -173,8 +175,6 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
     end
 
     it "applies a deferred function and its prerequisite in the same run" do
-      Puppet[:preprocess_deferred] = false
-
       catalog_handler = -> (req, res) {
         catalog = compile_to_catalog(deferred_manifest, node)
         res.body = formatter.render(catalog)
@@ -908,6 +908,13 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       # `Facter.resolve` to omit legacy facts
       Puppet::Node::Facts.indirection.terminus_class = :facter
 
+      # need to use `Facter::OptionStore.reset` in order to reset
+      # Facter::OptionStore since Facter.clear does not reset it.
+      # Specifically, Options[:show_legacy] needs to be reset to
+      # true for legacy facts test below
+      Facter.clear
+      Facter::OptionStore.reset
+
       facter_dir = File.join(custom_dir, 'facter')
       FileUtils.mkdir_p(facter_dir)
       File.write(File.join(facter_dir, 'custom.rb'), <<~END)
@@ -962,9 +969,10 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       }
     end
 
-    it "includes legacy facts by default" do
+    it "can include legacy facts" do
       server.start_server(mounts: mounts) do |port|
         Puppet[:serverport] = port
+        Puppet[:include_legacy_facts] = true
 
         agent.command_line.args << '--test'
         expect {
@@ -978,21 +986,18 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       end
     end
 
-    it "can exclude legacy facts" do
+    it "excludes legacy facts by default" do
       server.start_server(mounts: mounts) do |port|
         Puppet[:serverport] = port
-        Puppet[:include_legacy_facts] = false
 
         agent.command_line.args << '--test'
         expect {
           agent.run
-        }.to exit_with(2)
+        }.to exit_with(1)
           .and output(
-            match(/defined 'message' as 'legacy '/)
-              .and match(/defined 'message' as 'custom a custom value'/)
-              .and match(/defined 'message' as 'external an external value'/)
-            ).to_stdout
-          .and output(/Warning: Unknown variable: 'osfamily'/).to_stderr
+            match(/Error: Evaluation Error: Unknown variable: 'osfamily'/)
+              .and match(/Error: Could not retrieve catalog from remote server: Error 500 on SERVER:/)
+          ).to_stderr
       end
     end
   end

data/spec/integration/application/apply_spec.rb

@@ -202,15 +202,19 @@ describe "apply", unless: Puppet::Util::Platform.jruby? do
       compile_to_catalog('include mod', node)
     end
 
-    it 'can apply the catalog' do
-      catalog = compile_to_catalog('include mod', node)
-
-      Puppet[:environment] = env_name
-      apply.command_line.args = ['--catalog', file_containing('manifest', catalog.to_json)]
-
-      expect {
-        apply.run
-      }.to output(%r{Notify\[The Street 23\]/message: defined 'message' as 'The Street 23'}).to_stdout
+    it 'can apply the catalog with no warning' do
+      logs = []
+      Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+        catalog = compile_to_catalog('include mod', node)
+        Puppet[:environment] = env_name
+        handler = Puppet::Network::FormatHandler.format(:rich_data_json)
+        apply.command_line.args = ['--catalog', file_containing('manifest', handler.render(catalog))]
+        expect {
+          apply.run
+        }.to output(%r{Notify\[The Street 23\]/message: defined 'message' as 'The Street 23'}).to_stdout
+      end
+      # expected to have no warnings
+      expect(logs.select { |log| log.level == :warning }.map { |log| log.message }).to be_empty
     end
   end
 
@@ -438,6 +442,11 @@ class amod::bad_type {
     end
 
     context 'and the file is not serialized with rich_data' do
+      # do not want to stub out behavior in tests
+      before :each do
+        Puppet[:strict] = :warning
+      end
+
       it 'will notify a string that is the result of Regexp#inspect (from Runtime3xConverter)' do
         catalog = compile_to_catalog(execute, node)
         apply.command_line.args = ['--catalog', file_containing('manifest', catalog.to_json)]
@@ -629,7 +638,7 @@ class amod::bad_type {
           apply.run
         }.to exit_with(0)
          .and output(/Applied catalog/).to_stdout
-         .and output(/Report processor failed: certificate verify failed \[self signed certificate in certificate chain for CN=Unknown CA\]/).to_stderr
+         .and output(/Report processor failed: certificate verify failed \[self.signed certificate in certificate chain for CN=Unknown CA\]/).to_stderr
       end
     end
 
@@ -694,7 +703,9 @@ class amod::bad_type {
        .and output(%r{Notice: /Stage\[main\]/Main/Notify\[deferred4x\]/message: defined 'message' as 'I am deferred'}).to_stdout
     end
 
-    it "fails to apply a deferred function with an unsatified prerequisite" do
+    it "fails to apply a deferred function with an unsatisfied prerequisite" do
+      Puppet[:preprocess_deferred] = true
+
       apply.command_line.args = ['-e', deferred_manifest]
       expect {
         apply.run
@@ -704,8 +715,6 @@ class amod::bad_type {
     end
 
     it "applies a deferred function and its prerequisite in the same run" do
-      Puppet[:preprocess_deferred] = false
-
       apply.command_line.args = ['-e', deferred_manifest]
       expect {
         apply.run
@@ -714,6 +723,7 @@ class amod::bad_type {
     end
 
     it "validates the deferred resource before applying any resources" do
+      Puppet[:preprocess_deferred] = true
       undeferred_file = tmpfile('undeferred')
 
       manifest = <<~END
@@ -738,8 +748,6 @@ class amod::bad_type {
     end
 
     it "evaluates resources before validating the deferred resource" do
-      Puppet[:preprocess_deferred] = false
-
       manifest = <<~END
         notify { 'runs before file': } ->
         file { '#{deferred_file}':
@@ -755,19 +763,5 @@ class amod::bad_type {
         .and output(/Notify\[runs before file\]/).to_stdout
         .and output(/Validation of File.* failed: You cannot specify more than one of content, source, target/).to_stderr
     end
-
-    it "applies deferred sensitive file content" do
-      manifest = <<~END
-      file { '#{deferred_file}':
-        ensure => file,
-        content => Deferred('new', [Sensitive, "hello\n"])
-      }
-      END
-      apply.command_line.args = ['-e', manifest]
-      expect {
-        apply.run
-      }.to exit_with(0)
-        .and output(/ensure: changed \[redacted\] to \[redacted\]/).to_stdout
-    end
   end
 end

data/spec/integration/configurer_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
+require 'puppet_spec/network'
 require 'puppet/configurer'
 
 describe Puppet::Configurer do
   include PuppetSpec::Files
+  include PuppetSpec::Network
 
   describe "when running" do
     before(:each) do
@@ -117,7 +119,7 @@ describe Puppet::Configurer do
                   "values" => {"test_fact" => 'test value',},
                 }),
               headers: {
-                'Accept'=>'application/json, application/x-msgpack, text/pson',
+                'Accept'=>acceptable_content_types_string,
                 'Content-Type'=>'application/json',
               })
 
@@ -150,7 +152,7 @@ describe Puppet::Configurer do
                 "values" => {"test_fact": "test value"},
               }),
               headers: {
-                'Accept'=>'application/json, application/x-msgpack, text/pson',
+                'Accept'=>acceptable_content_types_string,
                 'Content-Type'=>'application/json',
               }).to_return(status: 200)