[resource/port] change attribute names to plural, indicating arrays

see discussion in #256
This commit is contained in:
Stephan Renatus 2015-12-08 13:46:20 +01:00 committed by Christoph Hartmann
parent bada329f27
commit 8532dd7034
4 changed files with 21 additions and 21 deletions

View file

@ -92,7 +92,7 @@ end
describe port(443) do
  it { should be_listening }
  its('protocol') {should eq 'tcp'}
  its('protocols') {should include 'tcp'}
end
```

View file

@ -21,7 +21,7 @@ class Port < Inspec.resource(1)
example "
describe port(80) do
it { should be_listening }
its('protocol') {should eq 'tcp'}
its('protocols') {should eq ['tcp']}
end
"
@ -48,17 +48,17 @@ class Port < Inspec.resource(1)
info.size > 0
end
def protocol
def protocols
res = info.map { |x| x[:protocol] }.uniq.compact
res.size > 0 ? res : nil
end
def process
def processes
res = info.map { |x| x[:process] }.uniq.compact
res.size > 0 ? res : nil
end
def pid
def pids
res = info.map { |x| x[:pid] }.uniq.compact
res.size > 0 ? res : nil
end

View file

@ -4,6 +4,6 @@ if os.unix?
# check that ssh runs
describe port(22) do
it { should be_listening }
its('protocol') { should include('tcp') }
its('protocols') { should include('tcp') }
end
end

View file

@ -9,45 +9,45 @@ describe 'Inspec::Resources::Port' do
it 'verify port on Ubuntu 14.04' do
resource = MockLoader.new(:ubuntu1404).load_resource('port', 22)
_(resource.listening?).must_equal true
_(resource.protocol).must_equal %w{ tcp tcp6 }
_(resource.pid).must_equal [1]
_(resource.process).must_equal ['sshd']
_(resource.protocols).must_equal %w{ tcp tcp6 }
_(resource.pids).must_equal [1]
_(resource.processes).must_equal ['sshd']
end
it 'verify port on MacOs x' do
resource = MockLoader.new(:osx104).load_resource('port', 2022)
_(resource.listening?).must_equal true
_(resource.protocol).must_equal ['tcp']
_(resource.process).must_equal ['VBoxHeadl']
_(resource.protocols).must_equal ['tcp']
_(resource.processes).must_equal ['VBoxHeadl']
end
it 'verify port on Windows' do
resource = MockLoader.new(:windows).load_resource('port', 135)
_(resource.listening?).must_equal true
_(resource.protocol).must_equal ['tcp']
_(resource.process).must_equal nil
_(resource.protocols).must_equal ['tcp']
_(resource.processes).must_equal nil
end
it 'verify port on FreeBSD' do
resource = MockLoader.new(:freebsd10).load_resource('port', 22)
_(resource.listening?).must_equal true
_(resource.protocol).must_equal %w{ tcp6 tcp }
_(resource.pid).must_equal [668]
_(resource.process).must_equal ['sshd']
_(resource.protocols).must_equal %w{ tcp6 tcp }
_(resource.pids).must_equal [668]
_(resource.processes).must_equal ['sshd']
end
it 'verify port on wrlinux' do
resource = MockLoader.new(:wrlinux).load_resource('port', 22)
_(resource.listening?).must_equal true
_(resource.protocol).must_equal %w{ tcp tcp6 }
_(resource.process).must_equal ['sshd']
_(resource.protocols).must_equal %w{ tcp tcp6 }
_(resource.processes).must_equal ['sshd']
end
it 'verify running on undefined' do
resource = MockLoader.new(:undefined).load_resource('port', 22)
_(resource.listening?).must_equal false
_(resource.protocol).must_equal nil
_(resource.pid).must_equal nil
_(resource.process).must_equal nil
_(resource.protocols).must_equal nil
_(resource.pids).must_equal nil
_(resource.processes).must_equal nil
end
end