puppet 4.4.0 → 4.5.0

data/spec/integration/resource/type_collection_spec.rb

@@ -12,6 +12,14 @@ describe Puppet::Resource::TypeCollection do
       @dir = tmpfile("autoload_testing")
       FileUtils.mkdir_p @dir
 
+      loader = Object.new
+      loader.stubs(:load).returns nil
+      loader.stubs(:set_entry)
+
+      loaders = Object.new
+      loaders.expects(:runtime3_type_loader).at_most_once.returns loader
+      Puppet::Pops::Loaders.expects(:loaders).at_most_once.returns loaders
+
       environment = Puppet::Node::Environment.create(:env, [@dir])
       @code = environment.known_resource_types
     end

data/spec/integration/util/settings_spec.rb

@@ -44,6 +44,32 @@ describe Puppet::Settings do
     expect(Puppet::FileSystem.stat(settings[:maindir]).mode & 007777).to eq(0750)
   end
 
+  it "will properly parse a UTF-8 configuration file" do
+    rune_utf8 = "\u16A0\u16C7\u16BB" # ᚠᛇᚻ
+    config = tmpfile("config")
+    define_settings(:main,
+      :config => {
+        :type => :file,
+        :default => config,
+        :desc => "a"
+      },
+      :environment => {
+        :default => 'dingos',
+        :desc => 'test',
+      }
+    )
+
+    File.open(config, 'w') do |file|
+      file.puts <<-EOF
+[main]
+environment=#{rune_utf8}
+      EOF
+    end
+
+    settings.initialize_global_settings
+    expect(settings[:environment]).to eq(rune_utf8)
+  end
+
   it "reparses configuration if configuration file is touched", :if => !Puppet.features.microsoft_windows? do
     config = tmpfile("config")
     define_settings(:main,

data/spec/lib/puppet_spec/compiler.rb

@@ -1,14 +1,14 @@
 module PuppetSpec::Compiler
   module_function
 
-  def compile_to_catalog(string, node = Puppet::Node.new('foonode'))
+  def compile_to_catalog(string, node = Puppet::Node.new('test'))
     Puppet[:code] = string
     # see lib/puppet/indirector/catalog/compiler.rb#filter
     Puppet::Parser::Compiler.compile(node).filter { |r| r.virtual? }
   end
 
-  def compile_to_ral(manifest)
-    catalog = compile_to_catalog(manifest)
+  def compile_to_ral(manifest, node = Puppet::Node.new('test'))
+    catalog = compile_to_catalog(manifest, node)
     ral = catalog.to_ral
     ral.finalize
     ral
@@ -60,7 +60,14 @@ module PuppetSpec::Compiler
 
   def eval_and_collect_notices(code, node = Puppet::Node.new('foonode'))
     collect_notices(code, node) do |compiler|
-      compiler.compile
+      if block_given?
+        compiler.compile do |catalog|
+          yield(compiler.topscope, catalog)
+          catalog
+        end
+      else
+        compiler.compile
+      end
     end
   end
 end

data/spec/shared_contexts/types_setup.rb

@@ -32,6 +32,8 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PDefaultType,
       Puppet::Pops::Types::PTypeReferenceType,
       Puppet::Pops::Types::PTypeAliasType,
+      Puppet::Pops::Types::PSemVerType,
+      Puppet::Pops::Types::PSemVerRangeType,
     ]
   end
 
@@ -47,6 +49,8 @@ shared_context 'types_setup' do
       Puppet::Pops::Types::PBooleanType,
       Puppet::Pops::Types::PPatternType,
       Puppet::Pops::Types::PEnumType,
+      Puppet::Pops::Types::PSemVerType,
+      Puppet::Pops::Types::PSemVerRangeType,
     ]
   end
 

data/spec/unit/application/inspect_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 require 'puppet/application/inspect'
 require 'puppet/resource/catalog'
-require 'puppet/indirector/catalog/yaml'
+require 'puppet/indirector/catalog/json'
 require 'puppet/indirector/report/rest'
 require 'puppet/indirector/file_bucket_file/rest'
 
@@ -31,6 +31,17 @@ describe Puppet::Application::Inspect do
       Puppet[:report] = false
       expect { @inspect.setup }.to raise_error(/report=true/)
     end
+
+    it "should default to the json terminus class when catalog_cache_terminus is not set" do
+      Puppet::Resource::Catalog.indirection.expects(:terminus_class=).with(:json)
+      expect { @inspect.setup }.not_to raise_error
+    end
+
+    it "should respect the catalog_cache_terminus if set" do
+      Puppet[:catalog_cache_terminus] = :yaml
+      Puppet::Resource::Catalog.indirection.expects(:terminus_class=).with(:yaml)
+      expect { @inspect.setup }.not_to raise_error
+    end
   end
 
   describe "when executing", :uses_checksums => true do
@@ -42,13 +53,13 @@ describe Puppet::Application::Inspect do
     end
 
     it "should retrieve the local catalog" do
-      Puppet::Resource::Catalog::Yaml.any_instance.expects(:find).with {|request| request.key == Puppet[:certname] }.returns(Puppet::Resource::Catalog.new)
+      Puppet::Resource::Catalog::Json.any_instance.expects(:find).with {|request| request.key == Puppet[:certname] }.returns(Puppet::Resource::Catalog.new)
 
       @inspect.run_command
     end
 
     it "should save the report to REST" do
-      Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(Puppet::Resource::Catalog.new)
+      Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(Puppet::Resource::Catalog.new)
       Puppet::Transaction::Report::Rest.any_instance.expects(:save).with {|request| request.instance.host == Puppet[:certname] }
 
       @inspect.run_command
@@ -63,7 +74,7 @@ describe Puppet::Application::Inspect do
         file.close
         resource = Puppet::Resource.new(:file, file.path, :parameters => {:audit => "all"})
         catalog.add_resource(resource)
-        Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
+        Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(catalog)
 
         events = nil
 
@@ -87,7 +98,7 @@ describe Puppet::Application::Inspect do
       file = Tempfile.new("foo")
       resource = Puppet::Resource.new(:file, file.path, :parameters => {:audit => "all"})
       catalog.add_resource(resource)
-      Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
+      Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(catalog)
 
       events = nil
 
@@ -109,7 +120,7 @@ describe Puppet::Application::Inspect do
       file.close
       file.delete
       catalog.add_resource(resource)
-      Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(catalog)
+      Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(catalog)
 
       events = nil
 
@@ -130,7 +141,7 @@ describe Puppet::Application::Inspect do
         Puppet[:archive_files] = true
         Puppet[:archive_file_server] = "filebucketserver"
         @catalog = Puppet::Resource::Catalog.new
-        Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(@catalog)
       end
 
       describe "when auditing files" do
@@ -236,7 +247,7 @@ describe Puppet::Application::Inspect do
         end
 
         @catalog = Puppet::Resource::Catalog.new
-        Puppet::Resource::Catalog::Yaml.any_instance.stubs(:find).returns(@catalog)
+        Puppet::Resource::Catalog::Json.any_instance.stubs(:find).returns(@catalog)
 
         Puppet::Transaction::Report::Rest.any_instance.expects(:save).with do |request|
           @report = request.instance

data/spec/unit/application/lookup_spec.rb

@@ -30,7 +30,7 @@ describe Puppet::Application::Lookup do
       lookup.options[:merge] = 'hash'
       lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
 
-      expected_error = "The options --knock-out-prefix, --sort-merged-arrays, --unpack-arrays, and --merge-hash-arrays are only available with '--merge deep'\nRun 'puppet lookup --help' for more details"
+      expected_error = "The options --knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays are only available with '--merge deep'\nRun 'puppet lookup --help' for more details"
 
       expect { lookup.run_command }.to raise_error(RuntimeError, expected_error)
     end
@@ -166,7 +166,8 @@ describe Puppet::Application::Lookup do
       lookup.options[:node] = node
       lookup.options[:explain] = true
       lookup.command_line.stubs(:args).returns(['a'])
-      expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+      begin
+        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
 Merge strategy first
   Data Binding "hiera"
     No such key: "a"
@@ -177,13 +178,17 @@ Merge strategy first
         Original path: "common"
         Found key: "a" value: "This is A"
   Merged result: "This is A"
-      EXPLANATION
+        EXPLANATION
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      end
     end
 
     it '--explain produces human readable text of a hash merge when using --explain-options' do
       lookup.options[:node] = node
       lookup.options[:explain_options] = true
-      expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+      begin
+        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
 Merge strategy hash
   Data Binding "hiera"
     No such key: "lookup_options"
@@ -198,7 +203,10 @@ Merge strategy hash
   Merged result: {
     "a" => "first"
   }
-      EXPLANATION
+        EXPLANATION
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      end
     end
 
     it '--explain produces human readable text of a hash merge when using both --explain and --explain-options' do
@@ -206,7 +214,8 @@ Merge strategy hash
       lookup.options[:explain] = true
       lookup.options[:explain_options] = true
       lookup.command_line.stubs(:args).returns(['a'])
-      expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+      begin
+        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
 Searching for "lookup_options"
   Merge strategy hash
     Data Binding "hiera"
@@ -233,7 +242,10 @@ Searching for "a"
           Original path: "common"
           Found key: "a" value: "This is A"
     Merged result: "This is A"
-      EXPLANATION
+        EXPLANATION
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      end
     end
 
     it 'can produce a yaml explanation' do
@@ -247,6 +259,8 @@ Searching for "a"
         $stdout = StringIO.new
         lookup.run_command
         output = $stdout.string
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
       ensure
         $stdout = save_stdout
       end
@@ -264,12 +278,68 @@ Searching for "a"
         $stdout = StringIO.new
         lookup.run_command
         output = $stdout.string
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
       ensure
         $stdout = save_stdout
       end
       expect(JSON.parse(output)).to eq(expected_json_hash)
     end
 
+    it 'can access values using dotted keys' do
+      lookup.options[:node] = node
+      lookup.options[:render_as] = :json
+      lookup.command_line.stubs(:args).returns(['d.one.two.three'])
+      save_stdout = $stdout
+      output = nil
+      begin
+        $stdout = StringIO.new
+        lookup.run_command
+        output = $stdout.string
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      ensure
+        $stdout = save_stdout
+      end
+      expect(JSON.parse("[#{output}]")).to eq(['the value'])
+    end
+
+    it 'can access values using quoted dotted keys' do
+      lookup.options[:node] = node
+      lookup.options[:render_as] = :json
+      lookup.command_line.stubs(:args).returns(['"e.one.two.three"'])
+      save_stdout = $stdout
+      output = nil
+      begin
+        $stdout = StringIO.new
+        lookup.run_command
+        output = $stdout.string
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      ensure
+        $stdout = save_stdout
+      end
+      expect(JSON.parse("[#{output}]")).to eq(['the value'])
+    end
+
+    it 'can access values using mix of dotted keys and quoted dotted keys' do
+      lookup.options[:node] = node
+      lookup.options[:render_as] = :json
+      lookup.command_line.stubs(:args).returns(['"f.one"."two.three".1'])
+      save_stdout = $stdout
+      output = nil
+      begin
+        $stdout = StringIO.new
+        lookup.run_command
+        output = $stdout.string
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      ensure
+        $stdout = save_stdout
+      end
+      expect(JSON.parse("[#{output}]")).to eq(['second value'])
+    end
+
     context 'the global scope' do
       it "is unaffected by global variables unless '--compile' is used" do
         lookup.options[:node] = node
@@ -281,7 +351,11 @@ Searching for "a"
         lookup.options[:node] = node
         lookup.options[:compile] = true
         lookup.command_line.stubs(:args).returns(['c'])
-        expect { lookup.run_command }.to output("--- This is C from site.pp\n...\n").to_stdout
+        begin
+          expect { lookup.run_command }.to output("--- This is C from site.pp\n...\n").to_stdout
+        rescue SystemExit => e
+          expect(e.status).to eq(0)
+        end
       end
     end
 
@@ -291,14 +365,22 @@ Searching for "a"
       it "works OK in the absense of '--compile'" do
         lookup.options[:node] = node
         lookup.command_line.stubs(:args).returns(['c'])
-        expect { lookup.run_command }.to output("--- This is C from data.pp\n...\n").to_stdout
+        begin
+          expect { lookup.run_command }.to output("--- This is C from data.pp\n...\n").to_stdout
+        rescue SystemExit => e
+          expect(e.status).to eq(0)
+        end
       end
 
       it "global scope is affected by global variables when '--compile' is used" do
         lookup.options[:node] = node
         lookup.options[:compile] = true
         lookup.command_line.stubs(:args).returns(['c'])
-        expect { lookup.run_command }.to output("--- This is C from site.pp\n...\n").to_stdout
+        begin
+          expect { lookup.run_command }.to output("--- This is C from site.pp\n...\n").to_stdout
+        rescue SystemExit => e
+          expect(e.status).to eq(0)
+        end
       end
     end
   end