puppet 7.23.0-x86-mingw32 → 7.25.0-x86-mingw32

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)
 
@@ -209,6 +210,19 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
         handler.call(request, response)
       }.to raise_error(not_found_error)
     end
+
+    it "should raise FormatError if tries to fallback and pson serialization is not allowed" do
+      Puppet[:allow_pson_serialization] = false
+      data = Puppet::IndirectorTesting.new("my data")
+      indirection.save(data, "my data")
+      request = a_request_that_finds(data, :accept_header => "unknown, text/pson")
+      allow(data).to receive(:to_pson).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[pson]: source sequence is illegal/malformed utf-8')
+
+      expect {
+        handler.call(request, response)
+      }.to raise_error(Puppet::Network::FormatHandler::FormatError,
+                       %r{Failed to serialize Puppet::IndirectorTesting for 'my data': Could not render to Puppet::Network::Format\[pson\]})
+    end
   end
 
   describe "when searching for model instances" do
@@ -228,6 +242,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)
 
@@ -248,6 +263,19 @@ describe Puppet::Network::HTTP::API::IndirectedRoutes do
                        %r{No supported formats are acceptable \(Accept: application/json, text/pson\)})
     end
 
+    it "raises FormatError if tries to fallback and pson serialization is not allowed" do
+      Puppet[:allow_pson_serialization] = false
+      data = Puppet::IndirectorTesting.new("my data")
+      indirection.save(data, "my data")
+      request = a_request_that_searches(Puppet::IndirectorTesting.new("my"), :accept_header => "unknown, text/pson")
+      allow(data).to receive(:to_pson).and_raise(Puppet::Network::FormatHandler::FormatError, 'Could not render to Puppet::Network::Format[pson]: source sequence is illegal/malformed utf-8')
+
+      expect {
+        handler.call(request, response)
+      }.to raise_error(Puppet::Network::FormatHandler::FormatError,
+                       %r{Failed to serialize Puppet::IndirectorTesting for 'my': Could not render_multiple to Puppet::Network::Format\[pson\]})
+    end
+
     it "should return [] when searching returns an empty array" do
       request = a_request_that_searches(Puppet::IndirectorTesting.new("nothing"), :accept_header => "unknown, application/json")
 

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.25.0
 platform: x86-mingw32
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -133,9 +133,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -143,9 +140,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -1329,6 +1323,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
@@ -2578,7 +2575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: Puppet, an automated configuration management tool
@@ -2589,6 +2586,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