puppet 4.0.0 → 4.5.0

data/spec/unit/application/apply_spec.rb

@@ -120,6 +120,13 @@ describe Puppet::Application::Apply do
       expect { @apply.setup }.to exit_with 1
     end
 
+    it "should use :main, :puppetd, and :ssl" do
+      Puppet.settings.unstub(:use)
+      Puppet.settings.expects(:use).with(:main, :agent, :ssl)
+
+      @apply.setup
+    end
+
     it "should tell the report handler to cache locally as yaml" do
       Puppet::Transaction::Report.indirection.expects(:cache_class=).with(:yaml)
 
@@ -243,6 +250,12 @@ describe Puppet::Application::Apply do
         expect(msg.level).to eq(:warning)
       end
 
+      it "should splay" do
+        @apply.expects(:splay)
+
+        expect { @apply.main }.to exit_with 0
+      end
+
       it "should raise an error if we can't find the node" do
         Puppet::Node.indirection.expects(:find).returns(nil)
 
@@ -346,7 +359,7 @@ describe Puppet::Application::Apply do
         it "should raise an error if we can't find the facts" do
           Puppet::Node::Facts.indirection.expects(:find).returns(nil)
 
-          expect { @apply.main }.to raise_error
+          expect { @apply.main }.to raise_error(RuntimeError, /Could not find facts/)
         end
       end
 
@@ -457,4 +470,21 @@ describe Puppet::Application::Apply do
       @apply.send(:apply_catalog, catalog)
     end
   end
+
+  it "should honor the catalog_cache_terminus setting" do
+    Puppet.settings[:catalog_cache_terminus] = "json"
+    Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:json)
+
+    @apply.initialize_app_defaults
+    @apply.setup
+  end
+
+  it "should set catalog cache class to nil during a noop run" do
+    Puppet[:catalog_cache_terminus] = "json"
+    Puppet[:noop] = true
+    Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(nil)
+
+    @apply.initialize_app_defaults
+    @apply.setup
+  end
 end

data/spec/unit/application/filebucket_spec.rb

@@ -21,7 +21,15 @@ describe Puppet::Application::Filebucket do
     expect(@filebucket).to respond_to(:restore)
   end
 
-  [:bucket, :debug, :local, :remote, :verbose].each do |option|
+  it "should declare a diff command" do
+    expect(@filebucket).to respond_to(:diff)
+  end
+
+  it "should declare a list command" do
+    expect(@filebucket).to respond_to(:list)
+  end
+
+  [:bucket, :debug, :local, :remote, :verbose, :fromdate, :todate].each do |option|
     it "should declare handle_#{option} method" do
       expect(@filebucket).to respond_to("handle_#{option}".to_sym)
     end
@@ -173,7 +181,7 @@ describe Puppet::Application::Filebucket do
     describe "the command backup" do
       it "should fail if no arguments are specified" do
         @filebucket.stubs(:args).returns([])
-        expect { @filebucket.backup }.to raise_error
+        expect { @filebucket.backup }.to raise_error(RuntimeError, /You must specify a file to back up/)
       end
 
       it "should call the client backup method for each given parameter" do
@@ -201,6 +209,84 @@ describe Puppet::Application::Filebucket do
       end
     end
 
+    describe "the command diff" do
+      it "should call the client diff method with 2 given checksums" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).returns(false)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(md5a,md5b, nil, nil)
+
+        @filebucket.diff
+      end
+
+      it "should call the clien diff with a path if the second argument is a file" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).with(md5a).returns(false)
+        Puppet::FileSystem.stubs(:exist?).with(md5b).returns(true)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(md5a, nil, nil, md5b)
+
+        @filebucket.diff
+      end
+
+      it "should call the clien diff with a path if the first argument is a file" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).with(md5a).returns(true)
+        Puppet::FileSystem.stubs(:exist?).with(md5b).returns(false)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(nil, md5b, md5a, nil)
+
+        @filebucket.diff
+      end
+
+      it "should call the clien diff with paths if the both arguments are files" do
+        md5a="DEADBEEF"
+        md5b="BEEF"
+        Puppet::FileSystem.stubs(:exist?).with(md5a).returns(true)
+        Puppet::FileSystem.stubs(:exist?).with(md5b).returns(true)
+        @filebucket.stubs(:args).returns([md5a, md5b])
+
+        @client.expects(:diff).with(nil, nil, md5a, md5b)
+
+        @filebucket.diff
+      end
+
+      it "should fail if only one checksum is given" do
+        md5a="DEADBEEF"
+        @filebucket.stubs(:args).returns([md5a])
+
+        expect { @filebucket.diff }.to raise_error Puppet::Error
+      end
+    end
+    describe "the command list" do
+      it "should call the client list method with nil dates" do
+        @client.expects(:list).with(nil, nil)
+
+        @filebucket.list
+      end
+      it "should call the client list method with the given dates" do
+        # 3 Hours ago
+        threehours = 60*60*3
+        fromdate = (Time.now - threehours).strftime("%F %T")
+        # 1 Hour ago
+        onehour = 60*60
+        todate = (Time.now - onehour).strftime("%F %T")
+
+        @filebucket.options.stubs(:[]).with(:fromdate).returns(fromdate)
+        @filebucket.options.stubs(:[]).with(:todate).returns(todate)
+
+        @client.expects(:list).with(fromdate, todate)
+
+        @filebucket.list
+      end
+    end
+
   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

@@ -0,0 +1,387 @@
+require 'spec_helper'
+require 'puppet/application/lookup'
+require 'puppet/pops/lookup'
+
+describe Puppet::Application::Lookup do
+
+  context "when running with incorrect command line options" do
+    let (:lookup) { Puppet::Application[:lookup] }
+
+    it "errors if no keys are given via the command line" do
+      lookup.options[:node] = 'dantooine.local'
+      expected_error = "No keys were given to lookup."
+
+      expect { lookup.run_command }.to raise_error(RuntimeError, expected_error)
+    end
+
+    it "does not allow invalid arguments for '--merge'" do
+      lookup.options[:node] = 'dantooine.local'
+      lookup.options[:merge] = 'something_bad'
+      lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
+
+      expected_error = "The --merge option only accepts 'first', 'hash', 'unique', or 'deep'\nRun 'puppet lookup --help' for more details"
+
+      expect { lookup.run_command }.to raise_error(RuntimeError, expected_error)
+    end
+
+    it "does not allow deep merge options if '--merge' was not set to deep" do
+      lookup.options[:node] = 'dantooine.local'
+      lookup.options[:merge_hash_arrays] = true
+      lookup.options[:merge] = 'hash'
+      lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
+
+      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
+  end
+
+  context "when running with correct command line options" do
+    let (:lookup) { Puppet::Application[:lookup] }
+
+    it "calls the lookup method with the correct arguments" do
+      lookup.options[:node] = 'dantooine.local'
+      lookup.options[:render_as] = :s;
+      lookup.options[:merge_hash_arrays] = true
+      lookup.options[:merge] = 'deep'
+      lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
+      lookup.stubs(:generate_scope).yields('scope')
+
+      expected_merge = { "strategy" => "deep", "sort_merge_arrays" => false, "merge_hash_arrays" => true }
+
+      (Puppet::Pops::Lookup).expects(:lookup).with(['atton', 'kreia'], nil, nil, false, expected_merge, anything).returns('rand')
+
+      expect { lookup.run_command }.to output("rand\n").to_stdout
+    end
+
+    %w(first unique hash deep).each do |opt|
+
+      it "accepts --merge #{opt}" do
+        lookup.options[:node] = 'dantooine.local'
+        lookup.options[:merge] = opt
+        lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
+        lookup.stubs(:generate_scope).yields('scope')
+        Puppet::Pops::Lookup.stubs(:lookup).returns('rand')
+        expect { lookup.run_command }.to output("--- rand\n...\n").to_stdout
+      end
+    end
+
+    it "prints the value found by lookup" do
+      lookup.options[:node] = 'dantooine.local'
+      lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
+      lookup.stubs(:generate_scope).yields('scope')
+
+      Puppet::Pops::Lookup.stubs(:lookup).returns('rand')
+
+      expect { lookup.run_command }.to output("--- rand\n...\n").to_stdout
+    end
+  end
+
+
+  context 'when given a valid configuration' do
+    let (:lookup) { Puppet::Application[:lookup] }
+
+    # There is a fully configured 'sample' environment in fixtures at this location
+    let(:environmentpath) { File.absolute_path(File.join(my_fixture_dir(), '../environments')) }
+
+    let(:facts) { Puppet::Node::Facts.new("facts", {}) }
+
+    let(:node) { Puppet::Node.new("testnode", :facts => facts, :environment => 'production') }
+
+    let(:expected_json_hash) { {
+      'type' => 'merge',
+      'merge' => 'first',
+      'event' => 'result',
+      'value' => 'This is A',
+      'branches' => [
+      { 'key' => 'a',
+        'event' => 'not_found',
+        'type' => 'global',
+        'name' => 'hiera'
+      },
+      {
+        'type' => 'data_provider',
+        'name' => 'Hiera Data Provider, version 4',
+        'configuration_path' => "#{environmentpath}/production/hiera.yaml",
+        'branches' => [
+        {
+          'name' => 'common',
+          'type' => 'data_provider',
+          'branches' => [
+          {
+            'key' => 'a',
+            'value' => 'This is A',
+            'event' => 'found',
+            'type' => 'path',
+            'original_path' => 'common',
+            'path' => "#{environmentpath}/production/data/common.yaml",
+          }]
+        }]
+      }]
+    } }
+
+    let(:expected_yaml_hash) { {
+      :type => :merge,
+      :merge => :first,
+      :event => :result,
+      :value => 'This is A',
+      :branches => [
+        { :key => 'a',
+          :event => :not_found,
+          :type => :global,
+          :name => :hiera
+        },
+        {
+          :type => :data_provider,
+          :name => 'Hiera Data Provider, version 4',
+          :configuration_path => "#{environmentpath}/production/hiera.yaml",
+          :branches => [
+            {
+              :type => :data_provider,
+              :name => 'common',
+              :branches => [
+                {
+                  :key => 'a',
+                  :value => 'This is A',
+                  :event => :found,
+                  :type => :path,
+                  :original_path => 'common',
+                  :path => "#{environmentpath}/production/data/common.yaml",
+                }]
+            }]
+        }]
+    } }
+
+    around(:each) do |example|
+      # Initialize settings to get a full compile as close as possible to a real
+      # environment load
+      Puppet.settings.initialize_global_settings
+      loader = Puppet::Environments::Directories.new(environmentpath, [])
+      Puppet.override(:environments => loader) do
+        example.run
+      end
+    end
+
+    it '--explain produces human readable text by default' do
+      lookup.options[:node] = node
+      lookup.options[:explain] = true
+      lookup.command_line.stubs(:args).returns(['a'])
+      begin
+        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+Merge strategy first
+  Data Binding "hiera"
+    No such key: "a"
+  Data Provider "Hiera Data Provider, version 4"
+    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+    Data Provider "common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common"
+        Found key: "a" value: "This is A"
+  Merged result: "This is A"
+        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
+      begin
+        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+Merge strategy hash
+  Data Binding "hiera"
+    No such key: "lookup_options"
+  Data Provider "Hiera Data Provider, version 4"
+    ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+    Data Provider "common"
+      Path "#{environmentpath}/production/data/common.yaml"
+        Original path: "common"
+        Found key: "lookup_options" value: {
+          "a" => "first"
+        }
+  Merged result: {
+    "a" => "first"
+  }
+        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
+      lookup.options[:node] = node
+      lookup.options[:explain] = true
+      lookup.options[:explain_options] = true
+      lookup.command_line.stubs(:args).returns(['a'])
+      begin
+        expect { lookup.run_command }.to output(<<-EXPLANATION).to_stdout
+Searching for "lookup_options"
+  Merge strategy hash
+    Data Binding "hiera"
+      No such key: "lookup_options"
+    Data Provider "Hiera Data Provider, version 4"
+      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+      Data Provider "common"
+        Path "#{environmentpath}/production/data/common.yaml"
+          Original path: "common"
+          Found key: "lookup_options" value: {
+            "a" => "first"
+          }
+    Merged result: {
+      "a" => "first"
+    }
+Searching for "a"
+  Merge strategy first
+    Data Binding "hiera"
+      No such key: "a"
+    Data Provider "Hiera Data Provider, version 4"
+      ConfigurationPath "#{environmentpath}/production/hiera.yaml"
+      Data Provider "common"
+        Path "#{environmentpath}/production/data/common.yaml"
+          Original path: "common"
+          Found key: "a" value: "This is A"
+    Merged result: "This is A"
+        EXPLANATION
+      rescue SystemExit => e
+        expect(e.status).to eq(0)
+      end
+    end
+
+    it 'can produce a yaml explanation' do
+      lookup.options[:node] = node
+      lookup.options[:explain] = true
+      lookup.options[:render_as] = :yaml
+      lookup.command_line.stubs(:args).returns(['a'])
+      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(YAML.load(output)).to eq(expected_yaml_hash)
+    end
+
+    it 'can produce a json explanation' do
+      lookup.options[:node] = node
+      lookup.options[:explain] = true
+      lookup.options[:render_as] = :json
+      lookup.command_line.stubs(:args).returns(['a'])
+      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(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
+        lookup.command_line.stubs(:args).returns(['c'])
+        expect { lookup.run_command }.to output("--- This is\n...\n").to_stdout
+      end
+
+      it "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'])
+        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
+
+    context 'using a puppet function as data provider' do
+      let(:node) { Puppet::Node.new("testnode", :facts => facts, :environment => 'puppet_func_provider') }
+
+      it "works OK in the absense of '--compile'" do
+        lookup.options[:node] = node
+        lookup.command_line.stubs(:args).returns(['c'])
+        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'])
+        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
+end