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

Remove any unpacking of value prior to mapping

Browse Source
This commit is contained in:
Chris Roberts 2022-04-07 09:11:07 -07:00 committed by Paul Hinze
parent 2baea78820
commit e8a4c35cf6
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,22 +170,13 @@ module VagrantPlugins
end
value = extra_args.shift if value
# If our destination type is an Any, mark that the final type should
# be any and unset our destination type. This will allow us to
# attempt to find a proper destination type using our maps and
# then we can pack it into any Any value at the end
if to == Google::Protobuf::Any && !value.class.ancestors.include?(Google::Protobuf::MessageExts)
any_convert = true
to = nil
end
# If we don't have a destination type provided, attempt
# to set it using our default maps
to = DEFAULT_MAPS[value.class] if to.nil?
if value != GENERATE && to.nil?
to = REVERSE_MAPS.detect do |k, v|
v if value.class.ancestors.include?(k) &&
(!any_convert || v.ancestors.include?(Google::Protobuf::MessageExts))
v.ancestors.include?(Google::Protobuf::MessageExts)
end&.last
end
@ -198,7 +189,7 @@ module VagrantPlugins
item.is_a?(to)
end
if val && val != GENERATE
return any_convert ? Google::Protobuf::Any.pack(val) : val
return val
end
end