mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 06:37:19 -04:00
Move the verify? outside the verify! method, easier to unit test
Fixes #2946
This commit is contained in:
parent
e9e8217f71
commit
0839c4da6c
1 changed files with 5 additions and 7 deletions
|
@ -28,7 +28,7 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
|
|||
gems = plugins_development_gems
|
||||
else
|
||||
gems = plugins_gems
|
||||
verify!(gems)
|
||||
verify!(gems) if verify?
|
||||
end
|
||||
|
||||
install_gems_list!(gems)
|
||||
|
@ -50,12 +50,10 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
|
|||
# Check if the specified gems contains
|
||||
# the logstash `metadata`
|
||||
def verify!(gems)
|
||||
if verify?
|
||||
gems.each do |plugin, version|
|
||||
puts("Validating #{[plugin, version].compact.join("-")}")
|
||||
signal_error("Installation aborted, verification failed for #{plugin} #{version}") unless LogStash::PluginManager.logstash_plugin?(plugin, version)
|
||||
end
|
||||
end
|
||||
gems.each do |plugin, version|
|
||||
puts("Validating #{[plugin, version].compact.join("-")}")
|
||||
signal_error("Installation aborted, verification failed for #{plugin} #{version}") unless LogStash::PluginManager.logstash_plugin?(plugin, version)
|
||||
end
|
||||
end
|
||||
|
||||
def plugins_development_gems
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue