puppet 6.12.0 → 6.13.0

data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_mtime_is_older_on_disk.yml

@@ -132,41 +132,6 @@ http_interactions:
       string: ''
     http_version: 
   recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
-- request:
-    method: head
-    uri: http://my-server/file/
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: ! 'OK '
-    headers:
-      Etag:
-      - 62e0b-184a-550f415e
-      Content-Type:
-      - text/html
-      Content-Length:
-      - '6218'
-      Last-Modified:
-      - Sun, 22 Mar 2015 22:25:34 GMT
-      Server:
-      - WEBrick/1.3.1 (Ruby/1.9.3/2013-11-22)
-      Date:
-      - Sun, 22 Mar 2015 22:57:44 GMT
-      Connection:
-      - Keep-Alive
-    body:
-      encoding: US-ASCII
-      string: ''
-    http_version: 
-  recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
 - request:
     method: get
     uri: http://my-server/file/

data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_no_header_specified.yml

@@ -128,39 +128,6 @@ http_interactions:
       string: ''
     http_version: 
   recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
-- request:
-    method: head
-    uri: http://my-server/file/
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: ! 'OK '
-    headers:
-      Etag:
-      - 62e0b-184a-550f415e
-      Content-Type:
-      - text/html
-      Content-Length:
-      - '6218'
-      Server:
-      - WEBrick/1.3.1 (Ruby/1.9.3/2013-11-22)
-      Date:
-      - Sun, 22 Mar 2015 22:57:44 GMT
-      Connection:
-      - Keep-Alive
-    body:
-      encoding: US-ASCII
-      string: ''
-    http_version: 
-  recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
 - request:
     method: get
     uri: http://my-server/file/

data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_fetch_if_not_on_the_local_disk.yml

@@ -132,41 +132,6 @@ http_interactions:
       string: ''
     http_version: 
   recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
-- request:
-    method: head
-    uri: http://my-server/file/
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: ! 'OK '
-    headers:
-      Etag:
-      - 62e0b-184a-550f415e
-      Content-Type:
-      - text/html
-      Content-Length:
-      - '6218'
-      Last-Modified:
-      - Sun, 22 Mar 2015 22:25:34 GMT
-      Server:
-      - WEBrick/1.3.1 (Ruby/1.9.3/2013-11-22)
-      Date:
-      - Sun, 22 Mar 2015 22:57:44 GMT
-      Connection:
-      - Keep-Alive
-    body:
-      encoding: US-ASCII
-      string: ''
-    http_version: 
-  recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
 - request:
     method: get
     uri: http://my-server/file/

data/spec/fixtures/vcr/cassettes/Puppet_Type_File/when_sourcing/from_http/using_mtime/should_not_update_if_mtime_is_newer_on_disk.yml

@@ -132,41 +132,6 @@ http_interactions:
       string: ''
     http_version: 
   recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
-- request:
-    method: head
-    uri: http://my-server/file/
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: ! 'OK '
-    headers:
-      Etag:
-      - 62e0b-184a-550f415e
-      Content-Type:
-      - text/html
-      Content-Length:
-      - '6218'
-      Last-Modified:
-      - Sun, 22 Mar 2015 22:25:34 GMT
-      Server:
-      - WEBrick/1.3.1 (Ruby/1.9.3/2013-11-22)
-      Date:
-      - Sun, 22 Mar 2015 22:57:44 GMT
-      Connection:
-      - Keep-Alive
-    body:
-      encoding: US-ASCII
-      string: ''
-    http_version: 
-  recorded_at: Sun, 22 Mar 2015 22:57:44 GMT
 - request:
     method: get
     uri: http://my-server/file/

data/spec/integration/configurer_spec.rb

@@ -70,18 +70,26 @@ describe Puppet::Configurer do
       end
 
       context 'when resubmit_facts is set to true' do
-        let(:test_facts) { Puppet::Node::Facts.new('configurer.test') }
-        let(:fact_rest_terminus) { Puppet::Node::Facts.indirection.terminus(:rest) }
+        let(:test_facts) { Puppet::Node::Facts.new('configurer.test', {test_fact: 'test value'}) }
 
         before(:each) do
           Puppet[:resubmit_facts] = true
 
           allow(@configurer).to receive(:find_facts).and_return(test_facts)
-          allow(fact_rest_terminus).to receive(:save)
         end
 
-        it 'sends fact data using the rest terminus' do
-          expect(fact_rest_terminus).to receive(:save)
+        it 'uploads facts as application/json' do
+          stub_request(:put, "https://puppet:8140/puppet/v3/facts/configurer.test?environment=production").
+            with(
+              body: hash_including(
+                {
+                  "name" => "configurer.test",
+                  "values" => {"test_fact" => 'test value',},
+                }),
+              headers: {
+                'Accept'=>'application/json, application/x-msgpack, text/pson',
+                'Content-Type'=>'application/json',
+              })
 
           @configurer.run(catalog: @catalog)
         end
@@ -95,8 +103,8 @@ describe Puppet::Configurer do
         end
 
         it 'logs errors that occur during fact submission' do
-          allow(fact_rest_terminus).to receive(:save).and_raise('error sending facts')
-          expect(Puppet).to receive(:log_exception).with(instance_of(RuntimeError),
+          stub_request(:put, "https://puppet:8140/puppet/v3/facts/configurer.test?environment=production").to_return(status: 502)
+          expect(Puppet).to receive(:log_exception).with(Puppet::HTTP::ResponseError,
                                                          /^Failed to submit facts/)
 
           @configurer.run(catalog: @catalog)
@@ -105,6 +113,17 @@ describe Puppet::Configurer do
         it 'records time spent resubmitting facts' do
           report = Puppet::Transaction::Report.new
 
+          stub_request(:put, "https://puppet:8140/puppet/v3/facts/configurer.test?environment=production").
+            with(
+              body: hash_including({
+                "name" => "configurer.test",
+                "values" => {"test_fact": "test value"},
+              }),
+              headers: {
+                'Accept'=>'application/json, application/x-msgpack, text/pson',
+                'Content-Type'=>'application/json',
+              }).to_return(status: 200)
+
           @configurer.run(catalog: @catalog, report: report)
 
           expect(report.metrics['time'].values).to include(["resubmit_facts", anything, Numeric])

data/spec/integration/indirector/facts/facter_spec.rb

@@ -7,6 +7,10 @@ describe Puppet::Node::Facts::Facter do
   include PuppetSpec::Files
   include PuppetSpec::Compiler
 
+  before :each do
+    Puppet::Node::Facts.indirection.terminus_class = :facter
+  end
+
   it "preserves case in fact values" do
     Facter.add(:downcase_test) do
       setcode do

data/spec/unit/application/apply_spec.rb

@@ -14,14 +14,6 @@ describe Puppet::Application::Apply do
     Puppet[:reports] = "none"
   end
 
-  after :each do
-    Puppet::Node::Facts.indirection.reset_terminus_class
-    Puppet::Node::Facts.indirection.cache_class = nil
-
-    Puppet::Node.indirection.reset_terminus_class
-    Puppet::Node.indirection.cache_class = nil
-  end
-
   [:debug,:loadclasses,:test,:verbose,:use_nodes,:detailed_exitcodes,:catalog, :write_catalog_summary].each do |option|
     it "should declare handle_#{option} method" do
       expect(@apply).to respond_to("handle_#{option}".to_sym)
@@ -182,13 +174,11 @@ describe Puppet::Application::Apply do
         Puppet[:prerun_command] = ''
         Puppet[:postrun_command] = ''
 
-        Puppet::Node::Facts.indirection.terminus_class = :memory
-        Puppet::Node::Facts.indirection.cache_class = :memory
         Puppet::Node.indirection.terminus_class = :memory
         Puppet::Node.indirection.cache_class = :memory
 
-        @facts = Puppet::Node::Facts.new(Puppet[:node_name_value])
-        Puppet::Node::Facts.indirection.save(@facts)
+        facts = Puppet::Node::Facts.new(Puppet[:node_name_value])
+        Puppet::Node::Facts.indirection.save(facts)
 
         @node = Puppet::Node.new(Puppet[:node_name_value])
         Puppet::Node.indirection.save(@node)

data/spec/unit/application/resource_spec.rb

@@ -12,9 +12,9 @@ describe Puppet::Application::Resource do
   end
 
   describe "in preinit" do
-    it "should init extra_params to empty array" do
+    it "should include provider parameter by default" do
       @resource_app.preinit
-      expect(@resource_app.extra_params).to eq([])
+      expect(@resource_app.extra_params).to eq([:provider])
     end
   end
 

data/spec/unit/configurer/fact_handler_spec.rb

@@ -22,10 +22,6 @@ describe Puppet::Configurer::FactHandler do
 
   let(:facthandler) { FactHandlerTester.new('production') }
 
-  before :each do
-    Puppet::Node::Facts.indirection.terminus_class = :memory
-  end
-
   describe "when finding facts" do
     it "should use the node name value to retrieve the facts" do
       foo_facts = Puppet::Node::Facts.new('foo')

data/spec/unit/configurer_spec.rb

@@ -4,9 +4,6 @@ require 'webmock/rspec'
 
 describe Puppet::Configurer do
   before do
-    Puppet::Node::Facts.indirection.terminus_class = :memory
-    Puppet::Node::Facts.indirection.save(facts)
-
     Puppet[:server] = "puppetmaster"
     Puppet[:report] = true
 

data/spec/unit/defaults_spec.rb

@@ -182,7 +182,7 @@ describe "Defaults" do
     end
   end
 
-  describe "facterng", :if => Puppet::Util::Platform.windows? do
+  describe "facterng" do
     it "defaults to false" do
       expect(Puppet[:facterng]).to be_falsey
     end

data/spec/unit/environments_spec.rb

@@ -13,20 +13,28 @@ describe Puppet::Environments do
   before(:each) do
     Puppet.settings.initialize_global_settings
     Puppet[:environment_timeout] = "unlimited"
+    Puppet[:versioned_environment_dirs] = true
   end
 
   let(:directory_tree) do
-    FS::MemoryFile.a_directory(File.expand_path("envdir"), [
-      FS::MemoryFile.a_regular_file_containing("ignored_file", ''),
-      FS::MemoryFile.a_directory("an_environment", [
-        FS::MemoryFile.a_missing_file("environment.conf"),
+    FS::MemoryFile.a_directory(File.expand_path("top_level_dir"), [
+      FS::MemoryFile.a_directory("envdir", [
+        FS::MemoryFile.a_regular_file_containing("ignored_file", ''),
+        FS::MemoryFile.a_directory("an_environment", [
+          FS::MemoryFile.a_missing_file("environment.conf"),
+          FS::MemoryFile.a_directory("modules"),
+          FS::MemoryFile.a_directory("manifests"),
+        ]),
+        FS::MemoryFile.a_directory("another_environment", [
+          FS::MemoryFile.a_missing_file("environment.conf"),
+        ]),
+        FS::MemoryFile.a_missing_file("doesnotexist"),
+        FS::MemoryFile.a_symlink("symlinked_environment", File.expand_path(File.join("top_level_dir", "versioned_env")))]),
+      FS::MemoryFile.a_directory("versioned_env", [
+        FS::MemoryFile.a_regular_file_containing("environment.conf", ''),
         FS::MemoryFile.a_directory("modules"),
         FS::MemoryFile.a_directory("manifests"),
       ]),
-      FS::MemoryFile.a_directory("another_environment", [
-        FS::MemoryFile.a_missing_file("environment.conf"),
-      ]),
-      FS::MemoryFile.a_missing_file("doesnotexist"),
     ])
   end
 
@@ -38,22 +46,27 @@ describe Puppet::Environments do
       global_path_2 = FS::MemoryFile.a_directory(global_path_2_location)
 
       loader_from(:filesystem => [directory_tree, global_path_1, global_path_2],
-                  :directory => directory_tree,
+                  :directory => directory_tree.children.first,
                   :modulepath => [global_path_1_location, global_path_2_location]) do |loader|
         expect(loader.list).to include_in_any_order(
           environment(:an_environment).
-            with_manifest("#{FS.path_string(directory_tree)}/an_environment/manifests").
-            with_modulepath(["#{FS.path_string(directory_tree)}/an_environment/modules",
+            with_manifest("#{FS.path_string(directory_tree)}/envdir/an_environment/manifests").
+            with_modulepath(["#{FS.path_string(directory_tree)}/envdir/an_environment/modules",
                              global_path_1_location,
                              global_path_2_location]),
-          environment(:another_environment))
+          environment(:another_environment),
+          environment(:symlinked_environment).
+            with_manifest("#{FS.path_string(directory_tree)}/versioned_env/manifests").
+            with_modulepath(["#{FS.path_string(directory_tree)}/versioned_env/modules",
+                             global_path_1_location,
+                             global_path_2_location]))
       end
     end
 
     it "has search_paths" do
       loader_from(:filesystem => [directory_tree],
-                  :directory => directory_tree) do |loader|
-        expect(loader.search_paths).to eq(["file://#{directory_tree}"])
+                  :directory => directory_tree.children.first) do |loader|
+        expect(loader.search_paths).to eq(["file://#{directory_tree.children.first}"])
       end
     end
 
@@ -79,14 +92,29 @@ describe Puppet::Environments do
 
     it "gets a particular environment" do
       loader_from(:filesystem => [directory_tree],
-                  :directory => directory_tree) do |loader|
+                  :directory => directory_tree.children.first) do |loader|
         expect(loader.get("an_environment")).to environment(:an_environment)
       end
     end
 
+    it "gets a symlinked environment" do
+      loader_from(:filesystem => [directory_tree],
+                  :directory => directory_tree.children.first) do |loader|
+        expect(loader.get("symlinked_environment")).to environment(: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],
+                  :directory => directory_tree.children.first) do |loader|
+        expect(loader.get("symlinked_environment")).to be_nil
+      end
+    end
+
     it "raises error when environment not found" do
       loader_from(:filesystem => [directory_tree],
-                  :directory => directory_tree) do |loader|
+                  :directory => directory_tree.children.first) do |loader|
         expect do
           loader.get!("doesnotexist")
         end.to raise_error(Puppet::Environments::EnvironmentNotFound)
@@ -95,7 +123,7 @@ describe Puppet::Environments do
 
     it "returns nil if an environment can't be found" do
       loader_from(:filesystem => [directory_tree],
-                  :directory => directory_tree) do |loader|
+                  :directory => directory_tree.children.first) do |loader|
         expect(loader.get("doesnotexist")).to be_nil
       end
     end
@@ -404,7 +432,7 @@ config_version=$vardir/random/scripts
       context "custom cache expiration service" do
         it "consults the custom service to expire the cache" do
           loader_from(:filesystem => [directory_tree],
-                      :directory => directory_tree) do |loader|
+                      :directory => directory_tree.children.first) do |loader|
             service = ReplayExpirationService.new([true])
             using_expiration_service(service) do
 
@@ -541,22 +569,23 @@ config_version=$vardir/random/scripts
 
   describe "cached loaders" do
     it "lists environments" do
-      loader_from(:filesystem => [directory_tree], :directory => directory_tree) do |loader|
+      loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
         expect(Puppet::Environments::Cached.new(loader).list).to include_in_any_order(
           environment(:an_environment),
-          environment(:another_environment))
+          environment(:another_environment),
+          environment(:symlinked_environment))
       end
     end
 
     it "has search_paths" do
-      loader_from(:filesystem => [directory_tree], :directory => directory_tree) do |loader|
-        expect(Puppet::Environments::Cached.new(loader).search_paths).to eq(["file://#{directory_tree}"])
+      loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
+        expect(Puppet::Environments::Cached.new(loader).search_paths).to eq(["file://#{directory_tree.children.first}"])
       end
     end
 
     context "#get" do
       it "gets an environment" do
-        loader_from(:filesystem => [directory_tree], :directory => directory_tree) do |loader|
+        loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
           expect(Puppet::Environments::Cached.new(loader).get(:an_environment)).to environment(:an_environment)
         end
       end
@@ -574,7 +603,7 @@ config_version=$vardir/random/scripts
       end
 
       it "returns nil if env not found" do
-        loader_from(:filesystem => [directory_tree], :directory => directory_tree) do |loader|
+        loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
           expect(Puppet::Environments::Cached.new(loader).get(:doesnotexist)).to be_nil
         end
       end
@@ -582,7 +611,7 @@ config_version=$vardir/random/scripts
 
     context "#get!" do
       it "gets an environment" do
-        loader_from(:filesystem => [directory_tree], :directory => directory_tree) do |loader|
+        loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
           expect(Puppet::Environments::Cached.new(loader).get!(:an_environment)).to environment(:an_environment)
         end
       end
@@ -600,7 +629,7 @@ config_version=$vardir/random/scripts
       end
 
       it "raises error if environment is not found" do
-        loader_from(:filesystem => [directory_tree], :directory => directory_tree) do |loader|
+        loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
           expect do
             Puppet::Environments::Cached.new(loader).get!(:doesnotexist)
           end.to raise_error(Puppet::Environments::EnvironmentNotFound)
@@ -609,9 +638,9 @@ config_version=$vardir/random/scripts
     end
 
     it "gets an environment.conf" do
-      loader_from(:filesystem => [directory_tree], :directory => directory_tree) do |loader|
+      loader_from(:filesystem => [directory_tree], :directory => directory_tree.children.first) do |loader|
         expect(Puppet::Environments::Cached.new(loader).get_conf(:an_environment)).to match_environment_conf(:an_environment).
-          with_env_path(directory_tree).
+          with_env_path(directory_tree.children.first).
           with_global_module_path([])
       end
     end