Page MenuHomeSoftware Heritage
Files F9341060

No OneTemporary
Actions

View Options

diff --git a/lib/puppet/functions/deprecation.rb b/lib/puppet/functions/deprecation.rb
index 30aeb1d..6b7b977 100644
--- a/lib/puppet/functions/deprecation.rb
+++ b/lib/puppet/functions/deprecation.rb
@@ -1,23 +1,21 @@
# Function to print deprecation warnings, Logs a warning once for a given key. The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method It is affected by the puppet setting 'strict', which can be set to :error (outputs as an error message), :off (no message / error is displayed) and :warning (default, outputs a warning) *Type*: String, String.
+#
Puppet::Functions.create_function(:deprecation) do
dispatch :deprecation do
param 'String', :key
param 'String', :message
end
def deprecation(key, message)
# depending on configuration setting of strict
- caller_infos = caller.first.split(":")
case Puppet.settings[:strict]
when :off
# do nothing
when :error
- err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
- fail("deprecation. #{key}. #{err_message}")
+ fail("deprecation. #{key}. #{message}")
else
- err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
- Puppet.deprecation_warning(err_message, key)
+ Puppet.deprecation_warning(message, key)
end
end
end
diff --git a/lib/puppet/functions/validate_legacy.rb b/lib/puppet/functions/validate_legacy.rb
index 0ba6dd8..3f50459 100644
--- a/lib/puppet/functions/validate_legacy.rb
+++ b/lib/puppet/functions/validate_legacy.rb
@@ -1,57 +1,56 @@
Puppet::Functions.create_function(:validate_legacy, Puppet::Functions::InternalFunction) do
# The function checks a value against both the target_type (new) and the previous_validation function (old).
dispatch :validate_legacy do
scope_param
param 'Type', :target_type
param 'String', :function_name
param 'Any', :value
optional_repeated_param 'Any', :args
end
dispatch :validate_legacy_s do
scope_param
param 'String', :type_string
param 'String', :function_name
param 'Any', :value
optional_repeated_param 'Any', :args
end
def validate_legacy_s(scope, type_string, *args)
t = Puppet::Pops::Types::TypeParser.new.parse(type_string, scope)
validate_legacy(scope, t, *args)
end
def validate_legacy(scope, target_type, function_name, value, *prev_args)
if assert_type(target_type, value)
if previous_validation(scope, function_name, value, *prev_args)
# Silently passes
else
Puppet.notice("Accepting previously invalid value for target type '#{target_type}'")
end
else
- caller_infos = caller.first.split(":")
inferred_type = Puppet::Pops::Types::TypeCalculator.infer_set(value)
- error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name}) [#{caller_infos[0]}:#{caller_infos[1]}]", target_type, inferred_type)
+ error_msg = Puppet::Pops::Types::TypeMismatchDescriber.new.describe_mismatch("validate_legacy(#{function_name})", target_type, inferred_type)
if previous_validation(scope, function_name, value, *prev_args)
call_function('deprecation', 'validate_legacy', error_msg)
else
call_function('fail', error_msg)
end
end
end
def previous_validation(scope, function_name, value, *prev_args)
# Call the previous validation function and catch any errors. Return true if no errors are thrown.
begin
scope.send("function_#{function_name}".to_s, [value, *prev_args])
true
rescue Puppet::ParseError
false
end
end
def assert_type(type, value)
Puppet::Pops::Types::TypeCalculator.instance?(type, value)
end
end
diff --git a/lib/puppet/parser/functions/deprecation.rb b/lib/puppet/parser/functions/deprecation.rb
index 0cb247d..e30f3a0 100644
--- a/lib/puppet/parser/functions/deprecation.rb
+++ b/lib/puppet/parser/functions/deprecation.rb
@@ -1,19 +1,17 @@
module Puppet::Parser::Functions
newfunction(:deprecation, :type => :rvalue, :doc => <<-EOS
Function to print deprecation warnings (this is the 3.X version of it), The uniqueness key - can appear once. The msg is the message text including any positional information that is formatted by the user/caller of the method.).
EOS
) do |arguments|
raise(Puppet::ParseError, "deprecation: Wrong number of arguments " +
"given (#{arguments.size} for 2)") unless arguments.size == 2
key = arguments[0]
message = arguments[1]
if ENV['STDLIB_LOG_DEPRECATIONS'] == "true"
- caller_infos = caller.first.split(":")
- err_message = "#{message} : #{caller_infos[0]} : #{caller_infos[1]}"
- warning("deprecation. #{key}. #{err_message}")
+ warning("deprecation. #{key}. #{message}")
end
end
end

File Metadata

Mime Type
text/x-diff
Expires
Fri, Jul 4, 11:35 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3357801

Event Timeline

About · Developer information · Legal