Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-09-21 15:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1259 from chef/windows-wildcard

Browse source 
Remove wildcard from windows package detection
This commit is contained in:
Christoph Hartmann 2016-10-27 14:40:35 +02:00 committed by GitHub
commit 0d2cd38344
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/resources/package.rb
View file

@ -204,7 +204,7 @@ module Inspec::Resources
# Find the package
cmd = inspec.command <<-EOF.gsub(/^\s*/, '')
Get-ItemProperty (@("#{search_paths.join('", "')}") | Where-Object { Test-Path $_ }) |
Where-Object { $_.DisplayName -like "#{package_name}*" -or $_.PSChildName -like "#{package_name}" } |
Where-Object { $_.DisplayName -like "#{package_name}" -or $_.PSChildName -like "#{package_name}" } |
Select-Object -Property DisplayName,DisplayVersion | ConvertTo-Json
EOF

4
test/helper.rb
View file

@ -70,7 +70,7 @@ class MockLoader
scriptpath = ::File.realpath(::File.dirname(__FILE__))
# create mock backend
@backend = Inspec::Backend.create({ backend: :mock })
@backend = Inspec::Backend.create({ backend: :mock, verbose: true })
mock = @backend.backend
# set os emulation
@ -176,7 +176,7 @@ class MockLoader
# ports on freebsd
'sockstat -46l' => cmd.call('sockstat'),
# packages on windows
'f18912b2e36924b367a110c31da6b835a1c217cd10014c7312b7435bf79a601c' => cmd.call('get-item-property-package'),
'6785190b3df7291a7622b0b75b0217a9a78bd04690bc978df51ae17ec852a282' => cmd.call('get-item-property-package'),
# service status upstart on ubuntu
'initctl status ssh' => cmd.call('initctl-status-ssh'),
# service config for upstart on ubuntu