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

Detect windows packages with trailing spaces. (#3106)

Browse source 
Signed-off-by: Jared Quick <jquick@chef.io>
This commit is contained in:
Jared Quick 2018-06-01 10:39:26 -04:00 committed by GitHub
parent d187f0d010
commit 06ff747cfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/resources/package.rb
View file

@ -270,7 +270,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 -match "^\\s*#{package_name}\\s*$" -or $_.PSChildName -match "^\\s*#{package_name}\\s*$" } |
Select-Object -Property DisplayName,DisplayVersion | ConvertTo-Json
EOF

2
test/helper.rb
View file

@ -290,7 +290,7 @@ class MockLoader
'rmsock f0000000000000001 tcpcb' => cmd.call('rmsock-f0001'),
'rmsock f0000000000000002 tcpcb' => cmd.call('rmsock-f0002'),
# packages on windows
'6785190b3df7291a7622b0b75b0217a9a78bd04690bc978df51ae17ec852a282' => cmd.call('get-item-property-package'),
'3ec839acbcd768cc827af6bbc970785b5b331d49855abc40c93a8c01f2ae9839' => cmd.call('get-item-property-package'),
# service status upstart on ubuntu
'initctl status ssh' => cmd.call('initctl-status-ssh'),
# upstart version on ubuntu

2
test/unit/mock/cmd/get-item-property-package
View file

@ -1,4 +1,4 @@
{
"DisplayName": "Chef Client v12.12.15",
"DisplayName": "Chef Client v12.12.15 ",
"DisplayVersion": "12.12.15.1"
}

2
test/unit/resources/package_test.rb
View file

@ -103,7 +103,7 @@ describe 'Inspec::Resources::Package' do
# windows
it 'verify windows package parsing' do
resource = MockLoader.new(:windows).load_resource('package', 'Chef Client v12.12.15')
pkg = { name: 'Chef Client v12.12.15', installed: true, version: '12.12.15.1', type: 'windows' }
pkg = { name: 'Chef Client v12.12.15 ', installed: true, version: '12.12.15.1', type: 'windows' }
_(resource.installed?).must_equal true
_(resource.version).must_equal '12.12.15.1'
_(resource.info).must_equal pkg