puppet 7.23.0 → 7.24.0

data/lib/puppet/pops/loaders.rb

@@ -11,8 +11,12 @@ module Puppet::Pops
 class Loaders
   class LoaderError < Puppet::Error; end
 
-  attr_reader :static_loader
-  attr_reader :puppet_system_loader
+  # Commented out the :static_loader and :puppet_system_loader
+  # because of rubocop offenses with duplicated definitions of
+  # these generated methods, but keeping them here for visibility
+  # on how the loaders are stacked.
+  # attr_reader :static_loader
+  # attr_reader :puppet_system_loader
   attr_reader :puppet_cache_loader
   attr_reader :public_environment_loader
   attr_reader :private_environment_loader

data/lib/puppet/pops/lookup/context.rb

@@ -92,12 +92,11 @@ class FunctionContext
 
   def cached_entries(&block)
     if block_given?
-      enumerator = @cache.each_pair
-      @cache.size.times do
+      @cache.each_pair do |pair|
         if block.arity == 2
-          yield(*enumerator.next)
+          yield(*pair)
         else
-          yield(enumerator.next)
+          yield(pair)
         end
       end
       nil

data/lib/puppet/pops/lookup/hiera_config.rb

@@ -166,7 +166,7 @@ class HieraConfig
     end
   end
 
-  attr_reader :config_path, :version
+  attr_reader :config_path
 
   # Creates a new HieraConfig from the given _config_root_. This is where the 'lookup.yaml' is expected to be found
   # and is also the base location used when resolving relative paths.

data/lib/puppet/resource.rb

@@ -323,6 +323,10 @@ class Puppet::Resource
         send(attr.to_s + "=", value)
       end
 
+      if environment.is_a?(Puppet::Node::Environment) && environment != Puppet::Node::Environment::NONE
+        self.file = environment.externalize_path(attributes[:file])
+      end
+
       @type, @title = self.class.type_and_title(type, title)
 
       rt = resource_type

data/lib/puppet/settings/base_setting.rb

@@ -3,8 +3,9 @@ require_relative '../../puppet/settings/errors'
 
 # The base setting type
 class Puppet::Settings::BaseSetting
-  attr_accessor :name, :desc, :section, :default, :call_hook
-  attr_reader :short, :deprecated
+  attr_writer :default
+  attr_accessor :name, :desc, :section
+  attr_reader :short, :deprecated, :call_hook
 
   # Hooks are called during different parts of the settings lifecycle:
   #

data/lib/puppet/settings.rb

@@ -40,7 +40,6 @@ class Puppet::Settings
   # local reference for convenience
   PuppetOptionParser = Puppet::Util::CommandLine::PuppetOptionParser
 
-  attr_accessor :files
   attr_reader :timer
 
   # These are the settings that every app is required to specify; there are

data/lib/puppet/type/file/ctime.rb

@@ -10,7 +10,7 @@ module Puppet
       if stat
         current_value = stat.ctime
       end
-      current_value
+      current_value.to_s
     end
 
     validate do |val|

data/lib/puppet/type/file/mtime.rb

@@ -9,7 +9,7 @@ module Puppet
       if stat
         current_value = stat.mtime
       end
-      current_value
+      current_value.to_s
     end
 
     validate do |val|

data/lib/puppet/util/log.rb

@@ -294,8 +294,8 @@ class Puppet::Util::Log
   end
 
 
-  attr_accessor :time, :remote, :file, :line, :pos, :source, :issue_code, :environment, :node, :backtrace
-  attr_reader :level, :message
+  attr_accessor :time, :remote, :file, :line, :pos, :issue_code, :environment, :node, :backtrace
+  attr_reader :level, :message, :source
 
   def initialize(args)
     self.level = args[:level]

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '7.23.0'
+  PUPPETVERSION = '7.24.0'
 
   ##
   # version is a public API method intended to always provide a fast and

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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPETCONF" "5" "March 2023" "Puppet, Inc." "Puppet manual"
 \fBThis page is autogenerated; any changes will get overwritten\fR
 .
 .SH "Configuration settings"
@@ -937,7 +937,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\.23\.0 Ruby/2\.7\.5\-p203 (x86_64\-linux)\fR
+\fIDefault\fR: \fBPuppet/7\.24\.0 Ruby/2\.7\.5\-p203 (x86_64\-linux)\fR
 .
 .IP "" 0
 .
@@ -1599,6 +1599,17 @@ Whether to send reports after every transaction\.
 .
 .IP "" 0
 .
+.SS "report_configured_environmentpath"
+When versioned_environment_dirs is \fBtrue\fR Puppet will readlink the environmentpath when constructing the environment\'s modulepath\. The full readlinked path is referred to as the "resolved path" and the configured path potentially containing symlinks is the "configured path"\. When reporting where resources come from users may choose between the configured or resolved path\.
+.
+.P
+When set to false, the resolved paths are reported instead of the configured paths\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: \fBtrue\fR
+.
+.IP "" 0
+.
 .SS "report_include_system_store"
 Whether the \'http\' report processor should include the system certificate store when submitting reports to HTTPS URLs\. If false, then the \'http\' processor will only trust HTTPS report servers whose certificates are issued by the puppet CA or one of its intermediate CAs\. If true, the processor will additionally trust CA certificates in the system\'s certificate store\.
 .

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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-APPLY" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CATALOG" "8" "March 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-catalog\fR \- Compile, save, view, and convert catalogs\.

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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CONFIG" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DEVICE" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DOC" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-EPP" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FACTS" "8" "March 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-facts\fR \- Retrieve and store facts\.

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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-GENERATE" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-HELP" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-LOOKUP" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MODULE" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "March 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-node\fR \- View and manage node definitions\.

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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "March 2023" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.

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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SSL" "8" "March 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" "February 2023" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "March 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\.23\.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 v7\.24\.0

data/spec/fixtures/integration/application/module/environments/direnv/modules/nginx/README

@@ -0,0 +1,3 @@
+nginx
+
+This is the nginx module.

data/spec/fixtures/integration/application/module/environments/direnv/modules/nginx/manifests/init.pp

@@ -0,0 +1,17 @@
+# Class: nginx
+#
+# This module manages nginx
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+# [Remember: No empty lines between comments and class definition]
+class nginx {
+
+
+}

data/spec/fixtures/integration/application/module/environments/direnv/modules/nginx/metadata.json

@@ -0,0 +1,20 @@
+{
+  "name": "pmtacceptance/nginx",
+  "version": "0.0.1",
+  "source": "UNKNOWN",
+  "author": "pmtacceptance",
+  "license": "UNKNOWN",
+  "summary": "UNKNOWN",
+  "description": "UNKNOWN",
+  "project_page": "UNKNOWN",
+  "dependencies": [
+
+  ],
+  "types": [
+
+  ],
+  "checksums": {
+    "README": "5c4fbf4812d8a4d4b0fe1c13ad640b0e",
+    "manifests/init.pp": "3a8ab171fd609a527ae0b293ced9a014"
+  }
+}

data/spec/integration/application/module_spec.rb

@@ -86,4 +86,145 @@ describe 'puppet module', unless: Puppet::Util::Platform.jruby? do
       end
     end
   end
+
+  context 'install' do
+    it 'lists a module in a non-default directory environment' do
+      Puppet.initialize_settings(['-E', 'direnv'])
+      Puppet[:color] = false
+      Puppet[:environmentpath] = File.join(my_fixture_dir, 'environments')
+
+      expect {
+        app.command_line.args = ['list']
+        app.run
+      }.to exit_with(0)
+       .and output(Regexp.new("└── pmtacceptance-nginx".encode(Encoding.default_external), Regexp::MULTILINE)).to_stdout
+    end
+  end
+
+  context 'changes' do
+    let(:tmp) { tmpdir('module_changes') }
+
+    before :each do
+      Puppet.initialize_settings(['-E', 'direnv'])
+      Puppet[:color] = false
+    end
+
+    def use_local_fixture
+      Puppet[:environmentpath] = File.join(my_fixture_dir, 'environments')
+    end
+
+    def create_working_copy
+      Puppet[:environmentpath] = File.join(tmp, 'environments')
+      FileUtils.cp_r(File.join(my_fixture_dir, 'environments'), tmp)
+    end
+
+    it 'reports an error when the install path is invalid' do
+      use_local_fixture
+
+      pattern = Regexp.new([
+        %Q{.*Error: Could not find a valid module at "#{tmp}/nginx".*},
+        %Q{.*Error: Try 'puppet help module changes' for usage.*},
+      ].join("\n"), Regexp::MULTILINE)
+
+      expect {
+        app.command_line.args = ['changes', File.join(tmp, 'nginx')]
+        app.run
+      }.to exit_with(1)
+       .and output(pattern).to_stderr
+    end
+
+    it 'reports when checksums are missing from metadata.json' do
+      create_working_copy
+
+      # overwrite checksums in metadata.json
+      nginx_dir = File.join(tmp, 'environments', 'direnv', 'modules', 'nginx')
+      File.write(File.join(nginx_dir, 'metadata.json'), <<~END)
+        {
+          "name": "pmtacceptance/nginx",
+          "version": "0.0.1"
+        }
+      END
+
+      pattern = Regexp.new([
+        %Q{.*Error: No file containing checksums found.*},
+        %Q{.*Error: Try 'puppet help module changes' for usage.*},
+      ].join("\n"), Regexp::MULTILINE)
+
+      expect {
+        app.command_line.args = ['changes', nginx_dir]
+        app.run
+      }.to exit_with(1)
+        .and output(pattern).to_stderr
+    end
+
+    it 'reports module not found when metadata.json is missing' do
+      create_working_copy
+
+      # overwrite checksums in metadata.json
+      nginx_dir = File.join(tmp, 'environments', 'direnv', 'modules', 'nginx')
+      File.unlink(File.join(nginx_dir, 'metadata.json'))
+
+      pattern = Regexp.new([
+        %Q{.*Error: Could not find a valid module at.*},
+        %Q{.*Error: Try 'puppet help module changes' for usage.*},
+      ].join("\n"), Regexp::MULTILINE)
+
+      expect {
+        app.command_line.args = ['changes', nginx_dir]
+        app.run
+      }.to exit_with(1)
+        .and output(pattern).to_stderr
+    end
+
+    it 'reports when a file is modified' do
+      create_working_copy
+
+      # overwrite README so checksum doesn't match
+      nginx_dir = File.join(tmp, 'environments', 'direnv', 'modules', 'nginx')
+      File.write(File.join(nginx_dir, 'README'), '')
+
+      pattern = Regexp.new([
+        %Q{.*Warning: 1 files modified.*},
+      ].join("\n"), Regexp::MULTILINE)
+
+      expect {
+        app.command_line.args = ['changes', nginx_dir]
+        app.run
+      }.to exit_with(0)
+        .and output(%r{README}).to_stdout
+        .and output(pattern).to_stderr
+    end
+
+    it 'reports when a file is missing' do
+      create_working_copy
+
+      # delete README so checksum doesn't match
+      nginx_dir = File.join(tmp, 'environments', 'direnv', 'modules', 'nginx')
+      File.unlink(File.join(nginx_dir, 'README'))
+
+      # odd that it says modified
+      pattern = Regexp.new([
+        %Q{.*Warning: 1 files modified.*},
+      ].join("\n"), Regexp::MULTILINE)
+
+      expect {
+        app.command_line.args = ['changes', nginx_dir]
+        app.run
+      }.to exit_with(0)
+        .and output(%r{README}).to_stdout
+        .and output(pattern).to_stderr
+    end
+
+    it 'reports when there are no changes' do
+      use_local_fixture
+
+      nginx_dir = File.join(Puppet[:environmentpath], 'direnv', 'modules', 'nginx')
+
+      expect {
+        app.command_line.args = ['changes', nginx_dir]
+        app.run
+      }.to exit_with(0)
+        .and output(/No modified files/).to_stdout
+    end
+  end
 end

data/spec/unit/environments_spec.rb

@@ -115,6 +115,15 @@ describe Puppet::Environments do
       end
     end
 
+    it "sets the environment's configured and resolved paths set when symlinked" do
+      loader_from(:filesystem => [directory_tree],
+                  :directory => directory_tree.children.first) do |loader|
+        env = loader.get("symlinked_environment")
+        expect(env.resolved_path).to eq("#{FS.path_string(directory_tree)}/versioned_env")
+        expect(env.configured_path).to eq("#{FS.path_string(directory_tree)}/envdir/symlinked_environment")
+      end
+    end
+
     it "ignores symlinked environments when `:versioned_environment_dirs` is false" do
       Puppet[:versioned_environment_dirs] = false
       loader_from(:filesystem => [directory_tree],

data/spec/unit/network/http/api/indirected_routes_spec.rb

@@ -182,6 +182,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
       indirection.save(data, "my data")
       request = a_request_that_finds(data, :accept_header => "application/json, text/pson")
       allow(data).to receive(:to_json).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
+      expect(Puppet).to receive(:warning).with(/Failed to serialize Puppet::IndirectorTesting for 'my data': Could not render to Puppet::Network::Format\[json\]/)
 
       handler.call(request, response)
 
@@ -228,6 +229,7 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
       indirection.save(data, "my data")
       request = a_request_that_searches(Puppet::IndirectorTesting.new("my"), :accept_header => "application/json, text/pson")
       allow(data).to receive(:to_json).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[json]: source sequence is illegal/malformed utf-8')
+      expect(Puppet).to receive(:warning).with(/Failed to serialize Puppet::IndirectorTesting for 'my': Could not render_multiple to Puppet::Network::Format\[json\]/)
 
       handler.call(request, response)