puppet 3.2.4 → 3.3.0.rc2

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome/lib/puppetx/awesome/echo_scheme_handler.rb

@@ -0,0 +1,18 @@
+require 'puppetx/puppet/bindings_scheme_handler'
+
+module Puppetx
+  module Awesome
+    # A binding scheme that echos its path
+    # 'echo:/quick/brown/fox' becomes key '::quick::brown::fox' => 'echo: quick brown fox'.
+    # (silly class for testing loading of extension)
+    #
+    class EchoSchemeHandler < Puppetx::Puppet::BindingsSchemeHandler
+      def contributed_bindings(uri, scope, composer)
+        factory = ::Puppet::Pops::Binder::BindingsFactory
+        bindings = factory.named_bindings("echo")
+        bindings.bind.name(uri.path.gsub(/\//, '::')).to("echo: #{uri.path.gsub(/\//, ' ').strip!}")
+        result = factory.contributed_bindings("echo", bindings.model, nil)
+      end
+    end
+  end
+end

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/awesome/localhost.yaml

@@ -0,0 +1 @@
+good_x: 'golden'

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/common.yaml

@@ -0,0 +1,3 @@
+bad_x: 'rotten'
+the_meaning_of_life: 200
+has_funny_hat: 'the syldavians'

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/bad/hiera_config.yaml

@@ -0,0 +1,9 @@
+# BROKEN ON PURPOSE
+---
+hierarchyyyyyy:
+  - ['node', '${fqdn}', '${fqdn}'
+  - ['common', 'true', 'common'
+
+backendsssssss:
+  - yaml
+  - json

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/common.yaml

@@ -0,0 +1,2 @@
+good_x: 'decent'
+the_meaning_of_life: 300

data/spec/fixtures/unit/pops/binder/bindings_composer/ok/modules/good/hiera.yaml

@@ -0,0 +1,11 @@
+---
+version: 2
+
+hierarchy:
+  [ ['node', '${fqdn}', '${fqdn}' ],
+    ['common', 'true', 'common' ]
+  ]
+
+backends:
+  - yaml
+  - json

data/spec/fixtures/unit/pops/binder/config/binder_config/ok/binder_config.yaml

@@ -0,0 +1,9 @@
+---
+version: 1
+layers:
+  - {name: site, include: 'confdir-hiera:/'}
+  - {name: modules, include: 'module-hiera:/*/', exclude: 'module-hiera:/bad/' }
+categories:
+  - ['node', '$fqn']
+  - ['environment', '$environment']
+  - ['common', 'true']

data/spec/fixtures/unit/pops/binder/hiera2/bindings_provider/ok/hiera.yaml

@@ -0,0 +1,9 @@
+---
+version: 2
+
+hierarchy:
+  - ['node', '${node}', '${node}' ]
+
+backends:
+  - yaml
+  - json

data/spec/fixtures/unit/pops/binder/hiera2/bindings_provider/ok/node.example.com.json

@@ -0,0 +1,9 @@
+{
+  "a_json_number": 142,
+  "a_string": "don't want this to override",
+  "a_json_string": "one hundred and forty two",
+  "a_json_eval": "the answer from \"json\" is ${a} and \\${a}.",
+  "a_json_eval2": "the answer\nfrom \\\"json\\\" is $a and \\$a",
+  "a_json_array": ["a", "b", 100],
+  "a_json_hash": { "a": 1, "b": 2 }
+}

data/spec/fixtures/unit/pops/binder/hiera2/bindings_provider/ok/node.example.com.yaml

@@ -0,0 +1,5 @@
+a_number: 42
+a_string: forty two
+an_eval: "the answer from \"yaml\" is ${a}."
+an_eval2: "the answer\nfrom \\\"yaml\\\" is $a and \\$a"
+

data/spec/fixtures/unit/pops/binder/hiera2/config/bad_syntax/hiera.yaml

@@ -0,0 +1,10 @@
+---
+version: 2
+
+hierarchy
+  os:
+    - ${osfamily}
+    - for_${osfamily}
+
+backends:
+  - yaml

data/spec/fixtures/unit/pops/binder/hiera2/config/malformed_hierarchy/hiera.yaml

@@ -0,0 +1,8 @@
+---
+version: 2
+
+hierarchy:
+  ['os', '${osfamily}' ]
+
+backends:
+  - yaml

data/spec/fixtures/unit/pops/binder/hiera2/config/missing/foo.txt

@@ -0,0 +1 @@
+# Do not delete

data/spec/fixtures/unit/pops/binder/hiera2/config/no_backends/hiera.yaml

@@ -0,0 +1,7 @@
+---
+version: 2
+hierarchy:
+  os:
+    - ${osfamily}
+    - for_${osfamily}
+

data/spec/fixtures/unit/pops/binder/hiera2/config/no_hierarchy/hiera.yaml

@@ -0,0 +1,4 @@
+---
+version: 2
+backends:
+  - yaml

data/spec/fixtures/unit/pops/binder/hiera2/config/not_a_hash/hiera.yaml

@@ -0,0 +1,2 @@
+- first
+- second

data/spec/fixtures/unit/pops/binder/hiera2/config/ok/hiera.yaml

@@ -0,0 +1,8 @@
+---
+version: 2
+
+hierarchy:
+  - ['os', '${osfamily}', 'for_${osfamily}' ]
+
+backends:
+  - yaml

data/spec/fixtures/unit/pops/binder/hiera2/yaml_backend/invalid/common.yaml

@@ -0,0 +1 @@
+---

data/spec/fixtures/unit/pops/binder/hiera2/yaml_backend/ok/common.yaml

@@ -0,0 +1,2 @@
+---
+brillig: slithy

data/spec/fixtures/unit/provider/package/openbsd/pkginfo_flavors.list

@@ -0,0 +1,2 @@
+bash-3.1.17-static  GNU Bourne Again Shell
+vim-7.0.42-no_x11   vi clone, many additional features

data/spec/integration/agent/logging_spec.rb

@@ -0,0 +1,178 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+
+require 'puppet'
+require 'puppet/daemon'
+require 'puppet/application/agent'
+
+# The command line flags affecting #20900 and #20919:
+#
+# --onetime
+# --daemonize
+# --no-daemonize
+# --logdest
+# --verbose
+# --debug
+# (no flags)     (-)
+#
+# d and nd are mutally exclusive
+#
+# Combinations without logdest, verbose or debug:
+#
+# --onetime --daemonize
+# --onetime --no-daemonize
+# --onetime
+# --daemonize
+# --no-daemonize
+# -
+#
+# 6 cases X [--logdest=console, --logdest=syslog, --logdest=/some/file, <nothing added>]
+# = 24 cases to test
+#
+# X [--verbose, --debug, <nothing added>]
+# = 72 cases to test
+#
+# Expectations of behavior are defined in the expected_loggers, expected_level methods,
+# so adapting to a change in logging behavior should hopefully be mostly a matter of
+# adjusting the logic in those methods to define new behavior.
+#
+# Note that this test does not have anything to say about what happens to logging after
+# daemonizing.
+describe 'agent logging' do
+  ONETIME  = '--onetime'
+  DAEMONIZE  = '--daemonize'
+  NO_DAEMONIZE  = '--no-daemonize'
+  LOGDEST_FILE = '--logdest=/dev/null/foo'
+  LOGDEST_SYSLOG = '--logdest=syslog'
+  LOGDEST_CONSOLE = '--logdest=console'
+  VERBOSE  = '--verbose'
+  DEBUG  = '--debug'
+
+  DEFAULT_LOG_LEVEL = :notice
+  INFO_LEVEL        = :info
+  DEBUG_LEVEL       = :debug
+  CONSOLE           = :console
+  SYSLOG            = :syslog
+  EVENTLOG          = :eventlog
+  FILE              = :file
+
+  ONETIME_DAEMONIZE_ARGS = [
+    [ONETIME],
+    [ONETIME, DAEMONIZE],
+    [ONETIME, NO_DAEMONIZE],
+    [DAEMONIZE],
+    [NO_DAEMONIZE],
+    [],
+  ]
+  LOG_DEST_ARGS = [LOGDEST_FILE, LOGDEST_SYSLOG, LOGDEST_CONSOLE, nil]
+  LOG_LEVEL_ARGS = [VERBOSE, DEBUG, nil]
+
+  shared_examples "an agent" do |argv, expected|
+    before(:each) do
+      # Don't actually run the agent, bypassing cert checks, forking and the puppet run itself
+      Puppet::Application::Agent.any_instance.stubs(:run_command)
+    end
+
+    def double_of_bin_puppet_agent_call(argv)
+      argv.unshift('agent')
+      command_line = Puppet::Util::CommandLine.new('puppet', argv)
+      command_line.execute
+    end
+
+    if Puppet.features.microsoft_windows? && argv.include?(DAEMONIZE)
+
+      it "should exit on a platform which cannot daemonize if the --daemonize flag is set" do
+        expect { double_of_bin_puppet_agent_call(argv) }.to raise_error(SystemExit)
+      end
+
+    else
+
+      it "when evoked with #{argv}, logs to #{expected[:loggers].inspect} at level #{expected[:level]}" do
+        # This logger is created by the Puppet::Settings object which creates and
+        # applies a catalog to ensure that configuration files and users are in
+        # place.
+        #
+        # It's not something we are specifically testing here since it occurs
+        # regardless of user flags.
+        Puppet::Util::Log.expects(:newdestination).with(instance_of(Puppet::Transaction::Report)).once
+        expected[:loggers].each do |logclass|
+          Puppet::Util::Log.expects(:newdestination).with(logclass).at_least_once
+        end
+        double_of_bin_puppet_agent_call(argv)
+
+        Puppet::Util::Log.level.should == expected[:level]
+      end
+
+    end
+  end
+
+  def self.no_log_dest_set_in(argv)
+    ([LOGDEST_SYSLOG, LOGDEST_CONSOLE, LOGDEST_FILE] & argv).empty?
+  end
+
+  def self.verbose_or_debug_set_in_argv(argv)
+    !([VERBOSE, DEBUG] & argv).empty?
+  end
+
+  def self.log_dest_is_set_to(argv, log_dest)
+    argv.include?(log_dest)
+  end
+
+  # @param argv Array of commandline flags
+  # @return Set<Symbol> of expected loggers
+  def self.expected_loggers(argv)
+    loggers = Set.new
+    loggers << CONSOLE if verbose_or_debug_set_in_argv(argv)
+    loggers << 'console' if log_dest_is_set_to(argv, LOGDEST_CONSOLE)
+    loggers << '/dev/null/foo' if log_dest_is_set_to(argv, LOGDEST_FILE)
+    if Puppet.features.microsoft_windows?
+      # an explicit call to --logdest syslog on windows is swallowed silently with no
+      # logger created (see #suitable() of the syslog Puppet::Util::Log::Destination subclass)
+      # however Puppet::Util::Log.newdestination('syslog') does get called...so we have
+      # to set an expectation
+      loggers << 'syslog' if log_dest_is_set_to(argv, LOGDEST_SYSLOG)
+
+      loggers << EVENTLOG if no_log_dest_set_in(argv)
+    else
+      # posix
+      loggers << 'syslog' if log_dest_is_set_to(argv, LOGDEST_SYSLOG)
+      loggers << SYSLOG if no_log_dest_set_in(argv)
+    end
+    return loggers
+  end
+
+  # @param argv Array of commandline flags
+  # @return Symbol of the expected log level
+  def self.expected_level(argv)
+    case
+      when argv.include?(VERBOSE) then INFO_LEVEL
+      when argv.include?(DEBUG) then DEBUG_LEVEL
+      else DEFAULT_LOG_LEVEL
+    end
+  end
+
+  # @param argv Array of commandline flags
+  # @return Hash of expected loggers and the expected log level
+  def self.with_expectations_based_on(argv)
+    {
+      :loggers => expected_loggers(argv),
+      :level => expected_level(argv),
+    }
+  end
+
+# For running a single spec (by line number): rspec -l150 spec/integration/agent/logging_spec.rb
+#  debug_argv = []
+#  it_should_behave_like( "an agent", [debug_argv], with_expectations_based_on([debug_argv]))
+
+  ONETIME_DAEMONIZE_ARGS.each do |onetime_daemonize_args|
+    LOG_LEVEL_ARGS.each do |log_level_args|
+      LOG_DEST_ARGS.each do |log_dest_args|
+        argv = (onetime_daemonize_args + [log_level_args, log_dest_args]).flatten.compact
+
+        describe "for #{argv}" do
+          it_should_behave_like( "an agent", argv, with_expectations_based_on(argv))
+        end
+      end
+    end
+  end
+end

data/spec/integration/configurer_spec.rb

@@ -23,7 +23,7 @@ describe Puppet::Configurer do
       @catalog.add_resource(Puppet::Type.type(:notify).new(:title => "testing"))
 
       # Make sure we don't try to persist the local state after the transaction ran, 
-      # because it will fail during test (the state file is in an not existing directory)
+      # because it will fail during test (the state file is in a not-existing directory)
       # and we need the transaction to be successful to be able to produce a summary report
       @catalog.host_config = false
 

data/spec/integration/defaults_spec.rb

@@ -92,12 +92,6 @@ describe "Puppet defaults" do
     Puppet.settings.setting(:yamldir).group.should == Puppet.settings[:group]
   end
 
-  # See #1232
-  it "should not specify a user or group for the rundir" do
-    Puppet.settings.setting(:rundir).owner.should be_nil
-    Puppet.settings.setting(:rundir).group.should be_nil
-  end
-
   it "should specify that the host private key should be owned by the service user" do
     Puppet.settings.stubs(:service_user_available?).returns true
     Puppet.settings.setting(:hostprivkey).owner.should == Puppet.settings[:user]

data/spec/integration/network/authconfig_spec.rb

@@ -40,6 +40,13 @@ describe Puppet::Network::AuthConfig do
     @auth = parser.parse
   end
 
+  def add_raw_stanza(stanza)
+    parser = Puppet::Network::AuthConfigParser.new(
+      stanza
+    )
+    @auth = parser.parse
+  end
+
   def request(args = {})
     args = {
       :key => 'key',
@@ -87,6 +94,18 @@ describe Puppet::Network::AuthConfig do
       @auth.should allow(request)
     end
 
+    it 'should warn about missing path before allow_ip in stanza' do
+      expect {
+        add_raw_stanza("allow_ip 10.0.0.1\n")
+      }.to raise_error Puppet::ConfigurationError, /Missing or invalid 'path' before right directive at line.*/
+    end
+
+    it 'should warn about missing path before allow in stanza' do
+      expect {
+        add_raw_stanza("allow host.domain.com\n")
+      }.to raise_error Puppet::ConfigurationError, /Missing or invalid 'path' before right directive at line.*/
+    end
+
     it "should support hostname backreferences" do
       add_regex_rule('^/test/([^/]+)$', "allow $1.domain.com")
 

data/spec/integration/network/server/webrick_spec.rb

@@ -11,7 +11,6 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
     # This reduces the odds of conflicting port numbers between concurrent runs
     # of the suite on the same machine dramatically.
     let(:port) { 20000 + ($$ % 40000) }
-    let(:handlers) { [:node] }
     let(:address) { '127.0.0.1' }
 
     before :each do
@@ -30,7 +29,7 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
       ca = Puppet::SSL::CertificateAuthority.new
       ca.generate(Puppet[:certname]) unless Puppet::SSL::Certificate.indirection.find(Puppet[:certname])
 
-      @server = Puppet::Network::Server.new(address, port, handlers)
+      @server = Puppet::Network::Server.new(address, port)
     end
 
     after do
@@ -45,31 +44,31 @@ describe Puppet::Network::Server, :unless => Puppet.features.microsoft_windows?
 
     describe "when listening" do
       it "should be reachable on the specified address and port" do
-        @server.listen
+        @server.start
         expect { TCPSocket.new('127.0.0.1', port) }.to_not raise_error
       end
 
       it "should use any specified bind address" do
-        @server.stubs(:unlisten) # we're breaking listening internally, so we have to keep it from unlistening
+        @server.stubs(:stop) # we're breaking listening internally, so we have to keep it from unlistening
         Puppet::Network::HTTP::WEBrick.any_instance.expects(:listen).with(address, port)
-        @server.listen
+        @server.start
       end
 
       it "should not allow multiple servers to listen on the same address and port" do
-        @server.listen
-        server2 = Puppet::Network::Server.new(address, port, handlers)
-        expect { server2.listen }.to raise_error
+        @server.start
+        server2 = Puppet::Network::Server.new(address, port)
+        expect { server2.start }.to raise_error
       end
 
       after :each do
-        @server.unlisten if @server && @server.listening?
+        @server.stop if @server && @server.listening?
       end
     end
 
     describe "after unlistening" do
       it "should not be reachable on the port and address assigned" do
-        @server.listen
-        @server.unlisten
+        @server.start
+        @server.stop
         expect { TCPSocket.new('127.0.0.1', port) }.to raise_error(Errno::ECONNREFUSED)
       end
     end