beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure output of mapper to unpack funcspec is a proto

Browse Source
This commit is contained in:
Chris Roberts 2021-11-19 17:15:52 -08:00 committed by Paul Hinze
parent 8b7c5efa52
commit c7d13e62c7
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/commands/serve/mappers.rb
View File

@ -85,7 +85,7 @@ module VagrantPlugins
def map(value, *extra_args, to: nil)
# If we don't have a destination type provided, attempt
# to set it using our default maps
to = DEFAULT_MAP[value.class] if to.nil?
to = DEFAULT_MAPS[value.class] if to.nil?
logger.debug("starting the value mapping process #{value} => #{to.nil? ? 'unknown' : to.inspect}")
if value.nil? && to
@ -236,17 +236,20 @@ module VagrantPlugins
def unfuncspec(v)
m = mappers.find_all { |map|
map.inputs.size == 1 &&
map.output.ancestors.include?(Google::Protobuf::MessageExts) &&
map.inputs.first.valid?(v)
}
if m.size > 1
raise TypeError,
"FuncSpec value of type `#{v.class}' matches more than one mapper"
"FuncSpec value of type `#{v.class}' matches more than one mapper (#{v})"
end
if m.empty?
raise ArgumentError,
"FuncSpec value of type `#{v.class}' has no valid mappers"
end
m.first.call(v)
result = m.first.call(v)
logger.debug("converted funcspec argument #{v} -> #{result}")
result
end
end
end