puppet 7.28.0 → 7.29.1

data/spec/unit/indirector/file_bucket_file/file_spec.rb

@@ -1,426 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/file_bucket_file/file'
-require 'puppet/util/platform'
-
-describe Puppet::FileBucketFile::File, :uses_checksums => true do
-  include PuppetSpec::Files
-
-  describe "non-stubbing tests" do
-    include PuppetSpec::Files
-
-    def save_bucket_file(contents, path = "/who_cares")
-      bucket_file = Puppet::FileBucket::File.new(contents)
-      Puppet::FileBucket::File.indirection.save(bucket_file, "#{bucket_file.name}#{path}")
-      bucket_file.checksum_data
-    end
-
-    describe "when servicing a save request" do
-      it "should return a result whose content is empty" do
-        bucket_file = Puppet::FileBucket::File.new('stuff')
-        result = Puppet::FileBucket::File.indirection.save(bucket_file, "sha256/35bafb1ce99aef3ab068afbaabae8f21fd9b9f02d3a9442e364fa92c0b3eeef0")
-        expect(result.contents).to be_empty
-      end
-
-      it "deals with multiple processes saving at the same time", :unless => Puppet::Util::Platform.windows? || RUBY_PLATFORM == 'java' do
-        bucket_file = Puppet::FileBucket::File.new("contents")
-
-        children = []
-        5.times do |count|
-          children << Kernel.fork do
-            save_bucket_file("contents", "/testing")
-            exit(0)
-          end
-        end
-        children.each { |child| Process.wait(child) }
-
-        paths = File.read("#{Puppet[:bucketdir]}/d/1/b/2/a/5/9/f/d1b2a59fbea7e20077af9f91b27e95e865061b270be03ff539ab3b73587882e8/paths").lines.to_a
-        expect(paths.length).to eq(1)
-        expect(Puppet::FileBucket::File.indirection.head("#{bucket_file.checksum_type}/#{bucket_file.checksum_data}/testing")).to be_truthy
-      end
-
-      it "fails if the contents collide with existing contents" do
-        Puppet[:digest_algorithm] = 'md5'
-
-        # This is the shortest known MD5 collision (little endian). See https://eprint.iacr.org/2010/643.pdf
-        first_contents = [0x6165300e,0x87a79a55,0xf7c60bd0,0x34febd0b,
-                          0x6503cf04,0x854f709e,0xfb0fc034,0x874c9c65,
-                          0x2f94cc40,0x15a12deb,0x5c15f4a3,0x490786bb,
-                          0x6d658673,0xa4341f7d,0x8fd75920,0xefd18d5a].pack("V" * 16)
-
-        collision_contents = [0x6165300e,0x87a79a55,0xf7c60bd0,0x34febd0b,
-                              0x6503cf04,0x854f749e,0xfb0fc034,0x874c9c65,
-                              0x2f94cc40,0x15a12deb,0xdc15f4a3,0x490786bb,
-                              0x6d658673,0xa4341f7d,0x8fd75920,0xefd18d5a].pack("V" * 16)
-
-        checksum_value = save_bucket_file(first_contents, "/foo/bar")
-
-        # We expect Puppet to log an error with the path to the file
-        expect(Puppet).to receive(:err).with(/Unable to verify existing FileBucket backup at '#{Puppet[:bucketdir]}.*#{checksum_value}\/contents'/)
-
-        # But the exception should not contain it
-        expect do
-          save_bucket_file(collision_contents, "/foo/bar")
-        end.to raise_error(Puppet::FileBucket::BucketError, /\AExisting backup and new file have different content but same checksum, {md5}#{checksum_value}\. Verify existing backup and remove if incorrect\.\Z/)
-      end
-
-      # See PUP-1334
-      context "when the contents file exists but is corrupted and does not match the expected checksum" do
-        let(:original_contents) { "a file that will get corrupted" }
-        let(:bucket_file) { Puppet::FileBucket::File.new(original_contents) }
-        let(:contents_file) { "#{Puppet[:bucketdir]}/7/7/4/1/0/2/7/9/77410279bb789b799c2f38bf654b46a509dd27ddad6e47a6684805e9ba390bce/contents" }
-
-        before(:each) do
-          # Ensure we're starting with a clean slate - no pre-existing backup
-          Puppet::FileSystem.unlink(contents_file) if Puppet::FileSystem.exist?(contents_file)
-          # Create initial "correct" backup
-          Puppet::FileBucket::File.indirection.save(bucket_file)
-          # Modify the contents file so that it no longer matches the SHA, simulating a corrupt backup
-          Puppet::FileSystem.unlink(contents_file) # bucket_files are read-only
-          Puppet::Util.replace_file(contents_file, 0600) { |fh| fh.puts "now with corrupted content" }
-        end
-
-        it "issues a warning that the backup will be overwritten" do
-          expect(Puppet).to receive(:warning).with(/Existing backup does not match its expected sum, #{bucket_file.checksum}/)
-          Puppet::FileBucket::File.indirection.save(bucket_file)
-        end
-
-        it "overwrites the existing contents file (backup)" do
-          Puppet::FileBucket::File.indirection.save(bucket_file)
-          expect(Puppet::FileSystem.read(contents_file)).to eq(original_contents)
-        end
-      end
-
-      describe "when supplying a path" do
-        with_digest_algorithms do
-            it "should store the path if not already stored" do
-              if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-                skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-              else
-                save_bucket_file(plaintext, "/foo/bar")
-  
-                dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
-                contents_file = "#{dir_path}/contents"
-                paths_file = "#{dir_path}/paths"
-                expect(Puppet::FileSystem.binread(contents_file)).to eq(plaintext)
-                expect(Puppet::FileSystem.read(paths_file)).to eq("foo/bar\n")
-              end
-            end
-  
-            it "should leave the paths file alone if the path is already stored" do
-              if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-                skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-              else
-                # save it twice
-                save_bucket_file(plaintext, "/foo/bar")
-                save_bucket_file(plaintext, "/foo/bar")
-                dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
-                expect(Puppet::FileSystem.binread("#{dir_path}/contents")).to eq(plaintext)
-                expect(File.read("#{dir_path}/paths")).to eq("foo/bar\n")
-              end
-            end
-  
-            it "should store an additional path if the new path differs from those already stored" do
-              if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-                skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-              else
-                save_bucket_file(plaintext, "/foo/bar")
-                save_bucket_file(plaintext, "/foo/baz")
-                dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
-                expect(Puppet::FileSystem.binread("#{dir_path}/contents")).to eq(plaintext)
-                expect(File.read("#{dir_path}/paths")).to eq("foo/bar\nfoo/baz\n")
-              end
-            end
-          # end
-        end
-      end
-
-      describe "when not supplying a path" do
-        with_digest_algorithms do
-          it "should save the file and create an empty paths file" do
-            if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-              skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-            else
-              save_bucket_file(plaintext, "")
-  
-              dir_path = "#{Puppet[:bucketdir]}/#{bucket_dir}"
-              expect(Puppet::FileSystem.binread("#{dir_path}/contents")).to eq(plaintext)
-              expect(File.read("#{dir_path}/paths")).to eq("")
-            end
-          end
-        end
-      end
-    end
-
-    describe "when servicing a head/find request" do
-      with_digest_algorithms do
-        let(:not_bucketed_plaintext) { "other stuff" }
-        let(:not_bucketed_checksum) { digest(not_bucketed_plaintext) }
-
-        describe "when listing the filebucket" do
-          it "should return false/nil when the bucket is empty" do
-            expect(Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{not_bucketed_checksum}/foo/bar", :list_all => true)).to eq(nil)
-          end
-
-          it "raises when the request is remote" do
-            Puppet[:bucketdir] = tmpdir('bucket')
-
-            request = Puppet::Indirector::Request.new(:file_bucket_file, :find, "#{digest_algorithm}/#{checksum}/foo/bar", nil, :list_all => true)
-            request.node = 'client.example.com'
-
-            expect {
-              Puppet::FileBucketFile::File.new.find(request)
-            }.to raise_error(Puppet::Error, "Listing remote file buckets is not allowed")
-          end
-
-          it "should return the list of bucketed files in a human readable way" do
-            if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-              skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-            else
-              checksum1 = save_bucket_file("I'm the contents of a file", '/foo/bar1')
-              checksum2 = save_bucket_file("I'm the contents of another file", '/foo/bar2')
-              checksum3 = save_bucket_file("I'm the modified content of a existing file", '/foo/bar1')
-  
-              # Use the first checksum as we know it's stored in the bucket
-              find_result = Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{checksum1}/foo/bar1", :list_all => true)
-  
-              # The list is sort order from date and file name, so first and third checksums come before the second
-              date_pattern = '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}'
-              expect(find_result.to_s).to match(Regexp.new("^(#{checksum1}|#{checksum3}) #{date_pattern} foo/bar1\\n(#{checksum3}|#{checksum1}) #{date_pattern} foo/bar1\\n#{checksum2} #{date_pattern} foo/bar2\\n$"))
-            end
-          end
-
-          it "should fail in an informative way when provided dates are not in the right format" do
-            if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-              skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-            else
-              contents = "I'm the contents of a file"
-              save_bucket_file(contents, '/foo/bar1')
-              expect {
-                Puppet::FileBucket::File.indirection.find(
-                  "#{digest_algorithm}/#{not_bucketed_checksum}/foo/bar",
-                  :list_all => true,
-                  :todate => "0:0:0 1-1-1970",
-                  :fromdate => "WEIRD"
-                )
-              }.to raise_error(Puppet::Error, /fromdate/)
-              expect {
-                Puppet::FileBucket::File.indirection.find(
-                  "#{digest_algorithm}/#{not_bucketed_checksum}/foo/bar",
-                  :list_all => true,
-                  :todate => "WEIRD",
-                  :fromdate => Time.now
-                )
-              }.to raise_error(Puppet::Error, /todate/)
-            end
-          end
-        end
-
-        describe "when supplying a path" do
-          it "should return false/nil if the file isn't bucketed" do
-            expect(Puppet::FileBucket::File.indirection.head("#{digest_algorithm}/#{not_bucketed_checksum}/foo/bar")).to eq(false)
-            expect(Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{not_bucketed_checksum}/foo/bar")).to eq(nil)
-          end
-
-          it "should return false/nil if the file is bucketed but with a different path" do
-
-            if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-              skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-            else
-              checksum = save_bucket_file("I'm the contents of a file", '/foo/bar')
-  
-              expect(Puppet::FileBucket::File.indirection.head("#{digest_algorithm}/#{checksum}/foo/baz")).to eq(false)
-              expect(Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{checksum}/foo/baz")).to eq(nil)
-            end
-          end
-
-          it "should return true/file if the file is already bucketed with the given path" do
-            if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-              skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-            else
-              contents = "I'm the contents of a file"
-  
-              checksum = save_bucket_file(contents, '/foo/bar')
-  
-              expect(Puppet::FileBucket::File.indirection.head("#{digest_algorithm}/#{checksum}/foo/bar")).to eq(true)
-              find_result = Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{checksum}/foo/bar")
-              expect(find_result.checksum).to eq("{#{digest_algorithm}}#{checksum}")
-              expect(find_result.to_s).to eq(contents)
-            end
-          end
-        end
-
-        describe "when not supplying a path" do
-          [false, true].each do |trailing_slash|
-            describe "#{trailing_slash ? 'with' : 'without'} a trailing slash" do
-              trailing_string = trailing_slash ? '/' : ''
-
-              it "should return false/nil if the file isn't bucketed" do
-                expect(Puppet::FileBucket::File.indirection.head("#{digest_algorithm}/#{not_bucketed_checksum}#{trailing_string}")).to eq(false)
-                expect(Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{not_bucketed_checksum}#{trailing_string}")).to eq(nil)
-              end
-
-              it "should return true/file if the file is already bucketed" do
-    
-                # this one replaces most of the lets in the "when
-                # digest_digest_algorithm is set..." shared context, but it still needs digest_algorithm
-                if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-                  skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-                else
-                  contents = "I'm the contents of a file"
-  
-                  checksum = save_bucket_file(contents, '/foo/bar')
-  
-                  expect(Puppet::FileBucket::File.indirection.head("#{digest_algorithm}/#{checksum}#{trailing_string}")).to eq(true)
-                  find_result = Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{checksum}#{trailing_string}")
-                  expect(find_result.checksum).to eq("{#{digest_algorithm}}#{checksum}")
-                  expect(find_result.to_s).to eq(contents)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-
-    describe "when diffing files", :unless => Puppet::Util::Platform.windows? do
-      with_digest_algorithms do
-        let(:not_bucketed_plaintext) { "other stuff" }
-        let(:not_bucketed_checksum) { digest(not_bucketed_plaintext) }
-
-        it "should generate an empty string if there is no diff" do
-          skip("usage of fork(1) no supported on this platform") if RUBY_PLATFORM == 'java'
-          if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-            skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-          else
-            checksum = save_bucket_file("I'm the contents of a file")
-            expect(Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{checksum}", :diff_with => checksum)).to eq('')
-          end
-        end
-
-        it "should generate a proper diff if there is a diff" do
-          skip("usage of fork(1) no supported on this platform") if RUBY_PLATFORM == 'java'
-          if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-            skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-          else
-            checksum1 = save_bucket_file("foo\nbar\nbaz")
-            checksum2 = save_bucket_file("foo\nbiz\nbaz")
-  
-            diff = Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{checksum1}", :diff_with => checksum2)
-            expect(diff).to include("-bar\n+biz\n")
-          end
-        end
-
-        it "should raise an exception if the hash to diff against isn't found" do
-          if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-            skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-          else
-            checksum = save_bucket_file("whatever")
-  
-            expect do
-              Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{checksum}", :diff_with => not_bucketed_checksum)
-            end.to raise_error "could not find diff_with #{not_bucketed_checksum}"
-          end
-        end
-
-        it "should return nil if the hash to diff from isn't found" do
-          if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-            skip "PUP-8257: Skip file bucket test on windows for #{digest_algorithm} due to long path names"
-          else
-            checksum = save_bucket_file("whatever")
-  
-            expect(Puppet::FileBucket::File.indirection.find("#{digest_algorithm}/#{not_bucketed_checksum}", :diff_with => checksum)).to eq(nil)
-          end
-        end
-      end
-    end
-  end
-
-  [true, false].each do |override_bucket_path|
-    describe "when bucket path #{override_bucket_path ? 'is' : 'is not'} overridden" do
-      [true, false].each do |supply_path|
-        describe "when #{supply_path ? 'supplying' : 'not supplying'} a path" do
-          with_digest_algorithms do
-            before :each do
-              allow(Puppet.settings).to receive(:use)
-              @store = Puppet::FileBucketFile::File.new
-
-              @bucket_top_dir = tmpdir("bucket")
-
-              if override_bucket_path
-                Puppet[:bucketdir] = "/bogus/path" # should not be used
-              else
-                Puppet[:bucketdir] = @bucket_top_dir
-              end
-
-              @dir = "#{@bucket_top_dir}/#{bucket_dir}"
-              @contents_path = "#{@dir}/contents"
-            end
-
-            describe "when retrieving files" do
-              before :each do
-
-                request_options = {}
-                if override_bucket_path
-                  request_options[:bucket_path] = @bucket_top_dir
-                end
-
-                key = "#{digest_algorithm}/#{checksum}"
-                if supply_path
-                  key += "/path/to/file"
-                end
-
-                @request = Puppet::Indirector::Request.new(:indirection_name, :find, key, nil, request_options)
-              end
-
-              def make_bucketed_file
-                FileUtils.mkdir_p(@dir)
-                File.open(@contents_path, 'wb') { |f| f.write plaintext }
-              end
-
-              it "should return an instance of Puppet::FileBucket::File created with the content if the file exists" do
-                make_bucketed_file
-
-                if supply_path
-                  expect(@store.find(@request)).to eq(nil)
-                  expect(@store.head(@request)).to eq(false) # because path didn't match
-                else
-                  bucketfile = @store.find(@request)
-                  expect(bucketfile).to be_a(Puppet::FileBucket::File)
-                  expect(bucketfile.contents).to eq(plaintext)
-                  expect(@store.head(@request)).to eq(true)
-                end
-              end
-
-              it "should return nil if no file is found" do
-                expect(@store.find(@request)).to be_nil
-                expect(@store.head(@request)).to eq(false)
-              end
-            end
-
-            describe "when saving files" do
-              it "should save the contents to the calculated path" do
-                skip("Windows Long File Name support is incomplete PUP-8257, this doesn't fail reliably so it should be skipped.") if Puppet::Util::Platform.windows? && (['sha512', 'sha384'].include? digest_algorithm)
-                options = {}
-                if override_bucket_path
-                  options[:bucket_path] = @bucket_top_dir
-                end
-
-                key = "#{digest_algorithm}/#{checksum}"
-                if supply_path
-                  key += "//path/to/file"
-                end
-
-                file_instance = Puppet::FileBucket::File.new(plaintext, options)
-                request = Puppet::Indirector::Request.new(:indirection_name, :save, key, file_instance)
-
-                @store.save(request)
-                expect(Puppet::FileSystem.binread("#{@dir}/contents")).to eq(plaintext)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/spec/unit/indirector/file_bucket_file/rest_spec.rb

@@ -1,89 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/file_bucket_file/rest'
-
-describe Puppet::FileBucketFile::Rest do
-  let(:rest_path) {"filebucket://xanadu:8141/"}
-  let(:file_bucket_file) {Puppet::FileBucket::File.new('file contents', :bucket_path => '/some/random/path')}
-  let(:files_original_path) {'/path/to/file'}
-  let(:dest_path) {"#{rest_path}#{file_bucket_file.name}/#{files_original_path}"}
-  let(:file_bucket_path) {"#{rest_path}#{file_bucket_file.checksum_type}/#{file_bucket_file.checksum_data}/#{files_original_path}"}
-  let(:source_path) {"#{rest_path}#{file_bucket_file.checksum_type}/#{file_bucket_file.checksum_data}"}
-
-  let(:uri) { %r{/puppet/v3/file_bucket_file} }
-
-  describe '#head' do
-    it 'includes the environment as a request parameter' do
-      stub_request(:head, uri).with(query: hash_including(environment: 'outerspace'))
-
-      described_class.indirection.head(file_bucket_path, :bucket_path => file_bucket_file.bucket_path, environment: Puppet::Node::Environment.remote('outerspace'))
-    end
-
-    it 'includes bucket path in the request if bucket path is set' do
-      stub_request(:head, uri).with(query: hash_including(bucket_path: '/some/random/path'))
-
-      described_class.indirection.head(file_bucket_path, :bucket_path => file_bucket_file.bucket_path)
-    end
-
-    it "returns nil on 404" do
-      stub_request(:head, uri).to_return(status: 404)
-
-      expect(described_class.indirection.head(file_bucket_path, :bucket_path => file_bucket_file.bucket_path)).to be_falsy
-    end
-
-    it "raises for all other fail codes" do
-      stub_request(:head, uri).to_return(status: [503, 'server unavailable'])
-
-      expect{described_class.indirection.head(file_bucket_path, :bucket_path => file_bucket_file.bucket_path)}.to raise_error(Net::HTTPError, "Error 503 on SERVER: server unavailable")
-    end
-  end
-
-  describe '#find' do
-    it 'includes the environment as a request parameter' do
-      stub_request(:get, uri).with(query: hash_including(environment: 'outerspace')).to_return(status: 200, headers: {'Content-Type' => 'application/octet-stream'})
-
-      described_class.indirection.find(source_path, :bucket_path => nil, environment: Puppet::Node::Environment.remote('outerspace'))
-    end
-
-    {bucket_path: 'path', diff_with: '4aabe1257043bd0', list_all: 'true', fromdate: '20200404', todate: '20200404'}.each do |param, val|
-      it "includes #{param} as a parameter in the request if #{param} is set" do
-        stub_request(:get, uri).with(query: hash_including(param => val)).to_return(status: 200, headers: {'Content-Type' => 'application/octet-stream'})
-
-        options = { param => val }
-        described_class.indirection.find(source_path, **options)
-      end
-    end
-
-    it 'raises if unsuccessful' do
-      stub_request(:get, uri).to_return(status: [503, 'server unavailable'])
-
-      expect{described_class.indirection.find(source_path, :bucket_path => nil)}.to raise_error(Net::HTTPError, "Error 503 on SERVER: server unavailable")
-    end
-
-    it 'raises if Content-Type is not included in the response' do
-      stub_request(:get, uri).to_return(status: 200, headers: {})
-
-      expect{described_class.indirection.find(source_path, :bucket_path => nil)}.to raise_error(RuntimeError, "No content type in http response; cannot parse")
-    end
-  end
-
-  describe '#save' do
-    it 'includes the environment as a request parameter' do
-      stub_request(:put, uri).with(query: hash_including(environment: 'outerspace'))
-
-      described_class.indirection.save(file_bucket_file, dest_path, environment: Puppet::Node::Environment.remote('outerspace'))
-    end
-
-    it 'sends the contents of the file as the request body' do
-      stub_request(:put, uri).with(body: file_bucket_file.contents)
-
-      described_class.indirection.save(file_bucket_file, dest_path)
-    end
-
-    it 'raises if unsuccessful' do
-      stub_request(:put, uri).to_return(status: [503, 'server unavailable'])
-
-      expect{described_class.indirection.save(file_bucket_file, dest_path)}.to raise_error(Net::HTTPError, "Error 503 on SERVER: server unavailable")
-    end
-  end
-end

data/spec/unit/indirector/file_bucket_file/selector_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/file_bucket_file/selector'
-require 'puppet/indirector/file_bucket_file/file'
-require 'puppet/indirector/file_bucket_file/rest'
-
-describe Puppet::FileBucketFile::Selector do
-  let(:model) { Puppet::FileBucket::File.new('') }
-  let(:indirection) { Puppet::FileBucket::File.indirection }
-  let(:terminus) { indirection.terminus(:selector) }
-
-  %w[head find save search destroy].each do |method|
-    describe "##{method}" do
-      it "should proxy to rest terminus for https requests" do
-        key = "https://example.com/path/to/file"
-
-        expect(indirection.terminus(:rest)).to receive(method)
-
-        if method == 'save'
-          terminus.send(method, indirection.request(method, key, model))
-        else
-          terminus.send(method, indirection.request(method, key, nil))
-        end
-      end
-
-      it "should proxy to file terminus for other requests" do
-        key = "file:///path/to/file"
-
-        case method
-        when 'save'
-          expect(indirection.terminus(:file)).to receive(method)
-          terminus.send(method, indirection.request(method, key, model))
-        when 'find', 'head'
-          expect(indirection.terminus(:file)).to receive(method)
-          terminus.send(method, indirection.request(method, key, nil))
-        else
-          # file terminus doesn't implement search or destroy
-          expect {
-            terminus.send(method, indirection.request(method, key, nil))
-          }.to raise_error(NoMethodError)
-        end
-      end
-    end
-  end
-end
-

data/spec/unit/indirector/file_content/file_server_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/file_content/file_server'
-
-describe Puppet::Indirector::FileContent::FileServer do
-  it "should be registered with the file_content indirection" do
-    expect(Puppet::Indirector::Terminus.terminus_class(:file_content, :file_server)).to equal(Puppet::Indirector::FileContent::FileServer)
-  end
-
-  it "should be a subclass of the FileServer terminus" do
-    expect(Puppet::Indirector::FileContent::FileServer.superclass).to equal(Puppet::Indirector::FileServer)
-  end
-end

data/spec/unit/indirector/file_content/file_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/file_content/file'
-
-describe Puppet::Indirector::FileContent::File do
-  it "should be registered with the file_content indirection" do
-    expect(Puppet::Indirector::Terminus.terminus_class(:file_content, :file)).to equal(Puppet::Indirector::FileContent::File)
-  end
-
-  it "should be a subclass of the DirectFileServer terminus" do
-    expect(Puppet::Indirector::FileContent::File.superclass).to equal(Puppet::Indirector::DirectFileServer)
-  end
-end

data/spec/unit/indirector/file_content/rest_spec.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/file_content/rest'
-
-describe Puppet::Indirector::FileContent::Rest do
-  let(:certname) { 'ziggy' }
-  let(:uri) { %r{/puppet/v3/file_content/:mount/path/to/file} }
-  let(:key) { "puppet:///:mount/path/to/file" }
-
-  before :each do
-    described_class.indirection.terminus_class = :rest
-  end
-
-  def file_content_response
-    {body: "some content", headers: { 'Content-Type' => 'application/octet-stream' } }
-  end
-
-  it "returns content as a binary string" do
-    stub_request(:get, uri).to_return(status: 200, **file_content_response)
-
-    file_content = described_class.indirection.find(key)
-    expect(file_content.content.encoding).to eq(Encoding::BINARY)
-    expect(file_content.content).to eq('some content')
-  end
-
-  it "URL encodes special characters" do
-    stub_request(:get, %r{/puppet/v3/file_content/:mount/path%20to%20file}).to_return(status: 200, **file_content_response)
-
-    described_class.indirection.find('puppet:///:mount/path to file')
-  end
-
-  it "returns nil if the content doesn't exist" do
-    stub_request(:get, uri).to_return(status: 404)
-
-    expect(described_class.indirection.find(key)).to be_nil
-  end
-
-  it "raises if fail_on_404 is true" do
-    stub_request(:get, uri).to_return(status: 404, headers: { 'Content-Type' => 'application/json'}, body: "{}")
-
-    expect {
-      described_class.indirection.find(key, fail_on_404: true)
-    }.to raise_error(Puppet::Error, %r{Find /puppet/v3/file_content/:mount/path/to/file resulted in 404 with the message: {}})
-  end
-
-  it "raises an error on HTTP 500" do
-    stub_request(:get, uri).to_return(status: 500, headers: { 'Content-Type' => 'application/json'}, body: "{}")
-
-    expect {
-      described_class.indirection.find(key)
-    }.to raise_error(Net::HTTPError, %r{Error 500 on SERVER: })
-  end
-
-  it "connects to a specific host" do
-    stub_request(:get, %r{https://example.com:8140/puppet/v3/file_content/:mount/path/to/file})
-      .to_return(status: 200, **file_content_response)
-
-    described_class.indirection.find("puppet://example.com:8140/:mount/path/to/file")
-  end
-end

data/spec/unit/indirector/file_content/selector_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-require 'puppet/indirector/file_content/selector'
-
-describe Puppet::Indirector::FileContent::Selector do
-  include PuppetSpec::Files
-
-  it_should_behave_like "Puppet::FileServing::Files", :file_content
-end