puppet 3.6.1 → 3.6.2

data/lib/puppet/resource/catalog.rb

@@ -184,11 +184,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # The relationship_graph form of the catalog. This contains all of the
   # dependency edges that are used for determining order.
   #
+  # @param given_prioritizer [Puppet::Graph::Prioritizer] The prioritization
+  #   strategy to use when constructing the relationship graph. Defaults the
+  #   being determined by the `ordering` setting.
   # @return [Puppet::Graph::RelationshipGraph]
   # @api public
-  def relationship_graph
+  def relationship_graph(given_prioritizer = nil)
     if @relationship_graph.nil?
-      @relationship_graph = Puppet::Graph::RelationshipGraph.new(prioritizer)
+      @relationship_graph = Puppet::Graph::RelationshipGraph.new(given_prioritizer || prioritizer)
       @relationship_graph.populate_from(self)
     end
     @relationship_graph

data/lib/puppet/settings.rb

@@ -11,6 +11,7 @@ class Puppet::Settings
   require 'puppet/settings/base_setting'
   require 'puppet/settings/string_setting'
   require 'puppet/settings/enum_setting'
+  require 'puppet/settings/array_setting'
   require 'puppet/settings/file_setting'
   require 'puppet/settings/directory_setting'
   require 'puppet/settings/file_or_directory_setting'
@@ -93,6 +94,8 @@ class Puppet::Settings
     @used = []
 
     @hooks_to_call_on_application_initialization = []
+    @deprecated_setting_names = []
+    @deprecated_settings_that_have_been_configured = []
 
     @translate = Puppet::Settings::ValueTranslator.new
     @config_file_parser = Puppet::Settings::ConfigFile.new(@translate)
@@ -109,7 +112,9 @@ class Puppet::Settings
   # @return [Object] the value of the setting
   # @api private
   def [](param)
-    Puppet.deprecation_warning("Accessing '#{param}' as a setting is deprecated. See http://links.puppetlabs.com/env-settings-deprecations") if DEPRECATED_SETTINGS.include?(param)
+    if @deprecated_setting_names.include?(param)
+      issue_deprecation_warning(setting(param), "Accessing '#{param}' as a setting is deprecated.")
+    end
     value(param)
   end
 
@@ -118,7 +123,9 @@ class Puppet::Settings
   # @param value [Object] the new value of the setting
   # @api private
   def []=(param, value)
-    Puppet.deprecation_warning("Modifying '#{param}' as a setting is deprecated. See http://links.puppetlabs.com/env-settings-deprecations") if DEPRECATED_SETTINGS.include?(param)
+    if @deprecated_setting_names.include?(param)
+      issue_deprecation_warning(setting(param), "Modifying '#{param}' as a setting is deprecated.")
+    end
     @value_sets[:memory].set(param, value)
     unsafe_flush_cache
   end
@@ -315,6 +322,7 @@ class Puppet::Settings
     end
     apply_metadata
     call_hooks_deferred_to_application_initialization
+    issue_deprecations
 
     @app_defaults_initialized = true
   end
@@ -392,8 +400,8 @@ class Puppet::Settings
       end
     end
 
-    if FULLY_DEPRECATED_SETTINGS.include?(str)
-      Puppet.deprecation_warning("Setting #{str} is deprecated. See http://links.puppetlabs.com/env-settings-deprecations", "setting-#{str}")
+    if s = @config[str]
+      @deprecated_settings_that_have_been_configured << s if s.completely_deprecated?
     end
 
     @value_sets[:cli].set(str, value)
@@ -533,7 +541,7 @@ class Puppet::Settings
     # If we get here and don't have any data, we just return and don't muck with the current state of the world.
     return if data.nil?
 
-    issue_deprecations(data)
+    record_deprecations_from_puppet_conf(data)
 
     # If we get here then we have some data, so we need to clear out any previous settings that may have come from
     #  config files.
@@ -656,6 +664,7 @@ class Puppet::Settings
       :terminus   => TerminusSetting,
       :duration   => DurationSetting,
       :ttl        => TTLSetting,
+      :array      => ArraySetting,
       :enum       => EnumSetting,
       :priority   => PrioritySetting,
       :autosign   => AutosignSetting,
@@ -863,6 +872,8 @@ class Puppet::Settings
           @hooks_to_call_on_application_initialization << tryconfig
         end
       end
+
+      @deprecated_setting_names << name if tryconfig.deprecated?
     end
 
     call.each do |setting|
@@ -1053,24 +1064,50 @@ Generated on #{Time.now}.
 
   private
 
-  DEPRECATED_ENVIRONMENT_SETTINGS = [:manifest, :modulepath, :config_version].freeze
-  FULLY_DEPRECATED_SETTINGS = [:templatedir, :manifestdir].freeze
-  DEPRECATED_SETTINGS = (DEPRECATED_ENVIRONMENT_SETTINGS + FULLY_DEPRECATED_SETTINGS).freeze
+  DEPRECATION_REFS = {
+    [:manifest, :modulepath, :config_version, :templatedir, :manifestdir] =>
+      "See http://links.puppetlabs.com/env-settings-deprecations"
+  }.freeze
 
-  def issue_deprecations(data)
-    sections = data.sections.inject([]) do |accum,entry|
+  # Record that we want to issue a deprecation warning later in the application
+  # initialization cycle when we have settings bootstrapped to the point where
+  # we can read the Puppet[:disable_warnings] setting.
+  #
+  # We are only recording warnings applicable to settings set in puppet.conf
+  # itself.
+  def record_deprecations_from_puppet_conf(puppet_conf)
+    conf_sections = puppet_conf.sections.inject([]) do |accum,entry|
       accum << entry[1] if [:main, :master, :agent, :user].include?(entry[0])
       accum
     end
 
-    sections.each do |section|
-      DEPRECATED_ENVIRONMENT_SETTINGS.each do |s|
-        Puppet.deprecation_warning("Setting #{s} is deprecated in puppet.conf. See http://links.puppetlabs.com/env-settings-deprecations", "puppet-conf-setting-#{s}") if !section.setting(s).nil?
+    conf_sections.each do |section|
+      section.settings.each do |conf_setting|
+        if setting = self.setting(conf_setting.name)
+          @deprecated_settings_that_have_been_configured << setting if setting.deprecated?
+        end
       end
+    end
+  end
 
-      FULLY_DEPRECATED_SETTINGS.each do |s|
-        Puppet.deprecation_warning("Setting #{s} is deprecated. See http://links.puppetlabs.com/env-settings-deprecations", "setting-#{s}") if !section.setting(s).nil?
-      end
+  def issue_deprecations
+    @deprecated_settings_that_have_been_configured.each do |setting|
+      issue_deprecation_warning(setting)
+    end
+  end
+
+  def issue_deprecation_warning(setting, msg = nil)
+    name = setting.name
+    ref = DEPRECATION_REFS.find { |params,reference| params.include?(name) }
+    ref = ref[1] if ref
+    case
+    when msg
+      msg << " #{ref}" if ref
+      Puppet.deprecation_warning(msg)
+    when setting.completely_deprecated?
+      Puppet.deprecation_warning("Setting #{name} is deprecated. #{ref}", "setting-#{name}")
+    when setting.allowed_on_commandline?
+      Puppet.deprecation_warning("Setting #{name} is deprecated in puppet.conf. #{ref}", "puppet-conf-setting-#{name}")
     end
   end
 

data/lib/puppet/settings/array_setting.rb

@@ -0,0 +1,17 @@
+class Puppet::Settings::ArraySetting < Puppet::Settings::BaseSetting
+
+  def type
+    :array
+  end
+
+  def munge(value)
+    case value
+    when String
+      value.split(/\s*,\s*/)
+    when Array
+      value
+    else
+      raise ArgumentError, "Expected an Array or String, got a #{value.class}"
+    end
+  end
+end

data/lib/puppet/settings/base_setting.rb

@@ -3,7 +3,7 @@ require 'puppet/settings/errors'
 # The base setting type
 class Puppet::Settings::BaseSetting
   attr_accessor :name, :desc, :section, :default, :call_on_define, :call_hook
-  attr_reader :short
+  attr_reader :short, :deprecated
 
   def self.available_call_hook_values
     [:on_define_and_write, :on_initialize_and_write, :on_write_only]
@@ -165,4 +165,25 @@ class Puppet::Settings::BaseSetting
   def set_meta(meta)
     Puppet.notice("#{name} does not support meta data. Ignoring.")
   end
+
+  def deprecated=(deprecation)
+    raise(ArgumentError, "'#{deprecation}' is an unknown setting deprecation state.  Must be either :completely or :allowed_on_commandline") unless [:completely, :allowed_on_commandline].include?(deprecation)
+    @deprecated = deprecation
+  end
+
+  def deprecated?
+    !!@deprecated
+  end
+
+  # True if we should raise a deprecation_warning if the setting is submitted
+  # on the commandline or is set in puppet.conf.
+  def completely_deprecated?
+    @deprecated == :completely
+  end
+
+  # True if we should raise a deprecation_warning if the setting is found in
+  # puppet.conf, but not if the user sets it on the commandline
+  def allowed_on_commandline?
+    @deprecated == :allowed_on_commandline
+  end
 end

data/lib/puppet/transaction.rb

@@ -138,7 +138,7 @@ class Puppet::Transaction
   end
 
   def relationship_graph
-    catalog.relationship_graph
+    catalog.relationship_graph(@prioritizer)
   end
 
   def resource_status(resource)

data/lib/puppet/type/user.rb

@@ -572,7 +572,7 @@ module Puppet
       defaultto false
     end
 
-    def eval_generate
+    def generate
       return [] if self[:purge_ssh_keys].empty?
       find_unmanaged_keys
     end
@@ -639,7 +639,7 @@ module Puppet
     #
     # @return [Array<Puppet::Type::Ssh_authorized_key] a list of resources
     #   representing the found keys
-    # @see eval_generate
+    # @see generate
     # @api private
     def find_unmanaged_keys
       self[:purge_ssh_keys].
@@ -647,6 +647,7 @@ module Puppet
         map { |f| unknown_keys_in_file(f) }.
         flatten.each do |res|
           res[:ensure] = :absent
+          res[:user] = self[:name]
           @parameters.each do |name, param|
             res[name] = param.value if param.metaparam?
           end
@@ -657,7 +658,7 @@ module Puppet
     # on the keys. These are considered names of possible ssh_authorized_keys
     # resources. Keys that are managed by the present catalog are ignored.
     #
-    # @see eval_generate
+    # @see generate
     # @api private
     # @return [Array<Puppet::Type::Ssh_authorized_key] a list of resources
     #   representing the found keys

data/lib/puppet/util/logging.rb

@@ -65,6 +65,7 @@ module Puppet::Util::Logging
   # @param [String] key Optional key to mark the message as unique. If not
   #   passed in, the originating call line will be used instead.
   def deprecation_warning(message, key = nil)
+    return if Puppet[:disable_warnings].include?('deprecations')
     $deprecation_warnings ||= {}
     if $deprecation_warnings.length < 100 then
       key ||= (offender = get_deprecation_offender)

data/lib/puppet/util/tagging.rb

@@ -3,12 +3,14 @@ require 'puppet/util/tag_set'
 module Puppet::Util::Tagging
   ValidTagRegex = /^\w[-\w:.]*$/
 
-  # Add a tag to our current list.  These tags will be added to all
-  # of the objects contained in this scope.
+  # Add a tag to the current tag set.
+  # When a tag set is used for a scope, these tags will be added to all of
+  # the objects contained in this scope when the objects are finished.
+  #
   def tag(*ary)
     @tags ||= new_tags
 
-    ary.each do |tag|
+    ary.flatten.each do |tag|
       name = tag.to_s.downcase
       if name =~ ValidTagRegex
         @tags << name
@@ -16,12 +18,12 @@ module Puppet::Util::Tagging
           @tags << section
         end
       else
-        fail(Puppet::ParseError, "Invalid tag #{name}")
+        fail(Puppet::ParseError, "Invalid tag '#{name}'")
       end
     end
   end
 
-  # Are we tagged with the provided tag?
+  # Is the receiver tagged with the given tags?
   def tagged?(*tags)
     not ( self.tags & tags.flatten.collect { |t| t.to_s } ).empty?
   end
@@ -39,7 +41,6 @@ module Puppet::Util::Tagging
     return if tags.nil? or tags == ""
 
     tags = tags.strip.split(/\s*,\s*/) if tags.is_a?(String)
-
     tags.each {|t| tag(t) }
   end
 

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.6.1'
+  PUPPETVERSION = '3.6.2'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/integration/parser/compiler_spec.rb

@@ -501,6 +501,34 @@ describe "Puppet::Parser::Compiler" do
         end
       end
     end
+
+    context 'when evaluating collection' do
+      it 'matches on container inherited tags' do
+        Puppet[:code] = <<-MANIFEST
+        class xport_test {
+          tag 'foo_bar'
+          @notify { 'nbr1':
+            message => 'explicitly tagged',
+            tag => 'foo_bar'
+          }
+
+          @notify { 'nbr2':
+            message => 'implicitly tagged'
+          }
+
+          Notify <| tag == 'foo_bar' |> {
+            message => 'overridden'
+          }
+        }
+        include xport_test
+        MANIFEST
+
+        catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+
+        expect(catalog).to have_resource("Notify[nbr1]").with_parameter(:message, 'overridden')
+        expect(catalog).to have_resource("Notify[nbr2]").with_parameter(:message, 'overridden')
+      end
+    end
   end
 
   describe 'using classic parser' do

data/spec/integration/parser/future_compiler_spec.rb

@@ -367,4 +367,33 @@ describe "Puppet::Parser::Compiler" do
       end
     end
   end
+
+  context 'when evaluating collection' do
+    it 'matches on container inherited tags' do
+      Puppet[:code] = <<-MANIFEST
+      class xport_test {
+        tag('foo_bar')
+        @notify { 'nbr1':
+          message => 'explicitly tagged',
+          tag => 'foo_bar'
+        }
+
+        @notify { 'nbr2':
+          message => 'implicitly tagged'
+        }
+
+        Notify <| tag == 'foo_bar' |> {
+          message => 'overridden'
+        }
+      }
+      include xport_test
+      MANIFEST
+
+      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+
+      expect(catalog).to have_resource("Notify[nbr1]").with_parameter(:message, 'overridden')
+      expect(catalog).to have_resource("Notify[nbr2]").with_parameter(:message, 'overridden')
+    end
+  end
+
 end

data/spec/integration/type/user_spec.rb

@@ -0,0 +1,31 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet_spec/files'
+require 'puppet_spec/compiler'
+
+describe Puppet::Type.type(:user), '(integration)', :unless => Puppet.features.microsoft_windows? do
+  include PuppetSpec::Files
+  include PuppetSpec::Compiler
+
+  context "when set to purge ssh keys from a file" do
+    let(:tempfile) { file_containing('user_spec', "# comment\nssh-rsa KEY-DATA key-name") }
+    # must use an existing user, or the generated key resource
+    # will fail on account of an invalid user for the key
+    # - root should be a safe default
+    let(:manifest) { "user { 'root': purge_ssh_keys => '#{tempfile}' }" }
+
+    it "should purge authorized ssh keys" do
+      apply_compiled_manifest(manifest, Puppet::Graph::RandomPrioritizer.new)
+      File.read(tempfile).should_not =~ /key-name/
+    end
+
+    context "with other prefetching resources evaluated first" do
+      let(:manifest) { "host { 'test': before => User[root] } user { 'root': purge_ssh_keys => '#{tempfile}' }" }
+
+      it "should purge authorized ssh keys" do
+        apply_compiled_manifest(manifest, Puppet::Graph::RandomPrioritizer.new)
+        File.read(tempfile).should_not =~ /key-name/
+      end
+    end
+  end
+end

data/spec/unit/configurer/downloader_spec.rb

@@ -6,6 +6,10 @@ require 'puppet/configurer/downloader'
 describe Puppet::Configurer::Downloader do
   require 'puppet_spec/files'
   include PuppetSpec::Files
+
+  let(:path)   { Puppet[:plugindest] }
+  let(:source) { 'puppet://puppet/plugins' }
+
   it "should require a name" do
     lambda { Puppet::Configurer::Downloader.new }.should raise_error(ArgumentError)
   end
@@ -21,87 +25,115 @@ describe Puppet::Configurer::Downloader do
     dler.source.should == "source"
   end
 
-  describe "when creating the file that does the downloading" do
-    before do
-      @dler = Puppet::Configurer::Downloader.new("foo", "path", "source")
-    end
+  def downloader(options = {})
+    options[:name] ||= "facts"
+    options[:path] ||= path
+    options[:source_permissions] ||= :ignore
+    Puppet::Configurer::Downloader.new(options[:name], options[:path], source, options[:ignore], options[:environment], options[:source_permissions])
+  end
 
+  def generate_file_resource(options = {})
+    dler = downloader(options)
+    dler.file
+  end
+
+  describe "when creating the file that does the downloading" do
     it "should create a file instance with the right path and source" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:path] == "path" and opts[:source] == "source" }
-      @dler.file
+      file = generate_file_resource(:path => path, :source => source)
+
+      expect(file[:path]).to eq(path)
+      expect(file[:source]).to eq([source])
     end
 
     it "should tag the file with the downloader name" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:tag] == "foo" }
-      @dler.file
+      name = "mydownloader"
+      file = generate_file_resource(:name => name)
+
+      expect(file[:tag]).to eq([name])
     end
 
     it "should always recurse" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:recurse] == true }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:recurse]).to be_true
     end
 
     it "should always purge" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:purge] == true }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:purge]).to be_true
     end
 
     it "should never be in noop" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:noop] == false }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:noop]).to be_false
     end
 
-    it "should set source_permissions to ignore" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:source_permissions] == :ignore }
-      @dler.file
+    it "should set source_permissions to ignore by default" do
+      file = generate_file_resource
+
+      expect(file[:source_permissions]).to eq(:ignore)
+    end
+
+    it "should allow source_permissions to be overridden" do
+      file = generate_file_resource(:source_permissions => :use)
+
+      expect(file[:source_permissions]).to eq(:use)
     end
 
     describe "on POSIX", :as_platform => :posix do
       it "should always set the owner to the current UID" do
         Process.expects(:uid).returns 51
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:owner] == 51 }
-        @dler.file
+
+        file = generate_file_resource(:path => '/path')
+        expect(file[:owner]).to eq(51)
       end
 
       it "should always set the group to the current GID" do
         Process.expects(:gid).returns 61
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == 61 }
-        @dler.file
+
+        file = generate_file_resource(:path => '/path')
+        expect(file[:group]).to eq(61)
       end
     end
 
     describe "on Windows", :as_platform => :windows do
       it "should omit the owner" do
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:owner] == nil }
-        @dler.file
+        file = generate_file_resource(:path => 'C:/path')
+
+        expect(file[:owner]).to be_nil
       end
 
       it "should omit the group" do
-        Puppet::Type.type(:file).expects(:new).with { |opts| opts[:group] == nil }
-        @dler.file
+        file = generate_file_resource(:path => 'C:/path')
+
+        expect(file[:group]).to be_nil
       end
     end
 
     it "should always force the download" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:force] == true }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:force]).to be_true
     end
 
     it "should never back up when downloading" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:backup] == false }
-      @dler.file
+      file = generate_file_resource
+
+      expect(file[:backup]).to be_false
     end
 
     it "should support providing an 'ignore' parameter" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:ignore] == [".svn"] }
-      @dler = Puppet::Configurer::Downloader.new("foo", "path", "source", ".svn")
-      @dler.file
+      file = generate_file_resource(:ignore => '.svn')
+
+      expect(file[:ignore]).to eq(['.svn'])
     end
 
     it "should split the 'ignore' parameter on whitespace" do
-      Puppet::Type.type(:file).expects(:new).with { |opts| opts[:ignore] == %w{.svn CVS} }
-      @dler = Puppet::Configurer::Downloader.new("foo", "path", "source", ".svn CVS")
-      @dler.file
+      file = generate_file_resource(:ignore => '.svn CVS')
+
+      expect(file[:ignore]).to eq(['.svn', 'CVS'])
     end
   end