puppet 7.23.0-x86-mingw32 → 7.24.0-x86-mingw32

data/spec/unit/node/environment_spec.rb

@@ -40,6 +40,47 @@ describe Puppet::Node::Environment do
       expect(e.inspect).to match(%r{<Puppet::Node::Environment:\w* @name="test" @manifest="#{File.expand_path('/manifests/path')}" @modulepath="#{File.expand_path('/modules/path')}:#{File.expand_path('/other/modules')}" >})
     end
 
+    describe "externalizing filepaths" do
+      before(:each) do
+        env.resolved_path = "/opt/puppetlabs/envs/prod_123"
+        env.configured_path = "/etc/puppetlabs/envs/prod"
+
+        @vendored_manifest = "/opt/puppetlabs/vendored/modules/foo/manifests/init.pp"
+        @production_manifest = "/opt/puppetlabs/envs/prod_123/modules/foo/manifests/init.pp"
+      end
+
+      it "leaves paths alone if they do not match the resolved path" do
+        expect(env.externalize_path(@vendored_manifest)).to eq(@vendored_manifest)
+      end
+
+      it "leaves paths alone if resolved or configured paths are not set" do
+        env.resolved_path = nil
+        env.configured_path = nil
+        expect(env.externalize_path(@production_manifest)).to eq(@production_manifest)
+      end
+
+      it "replaces resolved paths with configured paths" do
+        externalized_path = env.externalize_path(@production_manifest)
+        expect(externalized_path).to eq("/etc/puppetlabs/envs/prod/modules/foo/manifests/init.pp")
+      end
+
+      it "handles nil" do
+        externalized_path = env.externalize_path(nil)
+        expect(externalized_path).to eq(nil)
+      end
+
+      it "appropriately handles mismatched trailing slashes" do
+        env.resolved_path = "/opt/puppetlabs/envs/prod_123/"
+        externalized_path = env.externalize_path(@production_manifest)
+        expect(externalized_path).to eq("/etc/puppetlabs/envs/prod/modules/foo/manifests/init.pp")
+      end
+
+      it "can be disabled with the `report_configured_environmentpath` setting" do
+        Puppet[:report_configured_environmentpath] = false
+        expect(env.externalize_path(@production_manifest)).to eq(@production_manifest)
+      end
+    end
+
     describe "equality" do
       it "works as a hash key" do
         base = Puppet::Node::Environment.create(:first, ["modules"], "manifests")

data/spec/unit/parser/resource_spec.rb

@@ -108,6 +108,15 @@ describe Puppet::Parser::Resource do
       }.to raise_error(ArgumentError, /Resources require a hash as last argument/)
     end
 
+    it "should attempt to externalize filepaths via the environment" do
+      environment = Puppet::Node::Environment.create(:testing, [])
+      expect(environment).to receive(:externalize_path).at_least(:once).and_return("foo")
+      Puppet[:code] = "notify { 'hello': }"
+      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new 'anyone', environment: environment)
+      notify = catalog.resource('Notify[hello]')
+      expect(notify.file).to eq("foo")
+    end
+
     it "should set the reference correctly" do
       res = Puppet::Parser::Resource.new("resource", "testing", @arguments)
       expect(res.ref).to eq("Resource[testing]")

data/spec/unit/type/file/ctime_spec.rb

@@ -15,7 +15,7 @@ describe Puppet::Type.type(:file).attrclass(:ctime) do
     @resource[:audit] = [:ctime]
 
     # this .to_resource audit behavior is magical :-(
-    expect(@resource.to_resource[:ctime]).to eq(Puppet::FileSystem.stat(@filename).ctime)
+    expect(@resource.to_resource[:ctime]).to eq(Puppet::FileSystem.stat(@filename).ctime.to_s)
   end
 
   it "should return absent if auditing an absent file" do

data/spec/unit/type/file/mtime_spec.rb

@@ -15,7 +15,7 @@ describe Puppet::Type.type(:file).attrclass(:mtime) do
     @resource[:audit] = [:mtime]
 
     # this .to_resource audit behavior is magical :-(
-    expect(@resource.to_resource[:mtime]).to eq(Puppet::FileSystem.stat(@filename).mtime)
+    expect(@resource.to_resource[:mtime]).to eq(Puppet::FileSystem.stat(@filename).mtime.to_s)
   end
 
   it "should return absent if auditing an absent file" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 7.23.0
+  version: 7.24.0
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1329,6 +1329,9 @@ files:
 - spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
+- spec/fixtures/integration/application/module/environments/direnv/modules/nginx/README
+- spec/fixtures/integration/application/module/environments/direnv/modules/nginx/manifests/init.pp
+- spec/fixtures/integration/application/module/environments/direnv/modules/nginx/metadata.json
 - spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile
 - spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile
 - spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb
@@ -2589,6 +2592,9 @@ test_files:
 - spec/fixtures/integration/application/agent/lib/facter/agent_spec_role.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/provider/applytest/applytest.rb
 - spec/fixtures/integration/application/apply/environments/spec/modules/amod/lib/puppet/type/applytest.rb
+- spec/fixtures/integration/application/module/environments/direnv/modules/nginx/README
+- spec/fixtures/integration/application/module/environments/direnv/modules/nginx/manifests/init.pp
+- spec/fixtures/integration/application/module/environments/direnv/modules/nginx/metadata.json
 - spec/fixtures/integration/l10n/envs/prod/modules/demo/Gemfile
 - spec/fixtures/integration/l10n/envs/prod/modules/demo/Rakefile
 - spec/fixtures/integration/l10n/envs/prod/modules/demo/lib/puppet/functions/l10n.rb