Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-23 13:13:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make CLI option take precedence over DSL option if it is nondefault

Browse source 
Signed-off-by: Clinton Wolfe <clintoncwolfe@gmail.com>
This commit is contained in:
Clinton Wolfe 2021-03-18 23:27:41 -04:00
parent 35b0081c2c
commit e5b74b5760
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/inspec/resources/command.rb
View file

@ -32,7 +32,15 @@ module Inspec::Resources
@command = cmd
@timeout = options[:timeout]&.to_i || Inspec::Config.cached.final_options['command_timeout']&.to_i || 3600
cli_timeout = Inspec::Config.cached['command_timeout'].to_i
# Can access this via Inspec::InspecCLI.commands["exec"].options[:command_timeout].default,
# but that may not be loaded for kitchen-inspec and other pure gem consumers
default_cli_timeout = 3600
if cli_timeout != default_cli_timeout
@timeout = cli_timeout
else
@timeout = options[:timeout]&.to_i || default_cli_timeout
end
if options[:redact_regex]
unless options[:redact_regex].is_a?(Regexp)