Bläddra i källkod

test(inspec): no more need to mangle mapdata for hostname

We force the hostname in `kitchen` so the `_mapdata` files can be
static.
tags/v2.0.3
Daniel Dehennin 4 år sedan
förälder
incheckning
8cb31c6967
17 ändrade filer med 15 tillägg och 51 borttagningar
  1. +1
    -6
      test/integration/default/controls/_mapdata_spec.rb
  2. +1
    -1
      test/integration/default/files/_mapdata/amazonlinux-1.yaml
  3. +1
    -1
      test/integration/default/files/_mapdata/amazonlinux-2.yaml
  4. +1
    -1
      test/integration/default/files/_mapdata/arch-base-latest.yaml
  5. +1
    -1
      test/integration/default/files/_mapdata/centos-6.yaml
  6. +1
    -1
      test/integration/default/files/_mapdata/centos-7.yaml
  7. +1
    -1
      test/integration/default/files/_mapdata/centos-8.yaml
  8. +1
    -1
      test/integration/default/files/_mapdata/debian-10.yaml
  9. +1
    -1
      test/integration/default/files/_mapdata/debian-9.yaml
  10. +1
    -1
      test/integration/default/files/_mapdata/fedora-31.yaml
  11. +1
    -1
      test/integration/default/files/_mapdata/fedora-32.yaml
  12. +1
    -1
      test/integration/default/files/_mapdata/opensuse-15.yaml
  13. +1
    -1
      test/integration/default/files/_mapdata/ubuntu-16.yaml
  14. +1
    -1
      test/integration/default/files/_mapdata/ubuntu-18.yaml
  15. +1
    -1
      test/integration/default/files/_mapdata/ubuntu-20.yaml
  16. +0
    -1
      test/integration/share/README.md
  17. +0
    -30
      test/integration/share/libraries/system.rb

+ 1
- 6
test/integration/default/controls/_mapdata_spec.rb Visa fil

@@ -1,12 +1,7 @@
# frozen_string_literal: true

# Replace per minion strings
replacement = {
hostname: system.hostname
}

mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml"
mapdata_dump = inspec.profile.file(mapdata_file) % replacement
mapdata_dump = inspec.profile.file(mapdata_file)

control '`map.jinja` YAML dump' do
title 'should contain the lines'

+ 1
- 1
test/integration/default/files/_mapdata/amazonlinux-1.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-clients
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/amazonlinux-2.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-clients
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/arch-base-latest.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/centos-6.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-clients
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/centos-7.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-clients
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/centos-8.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-clients
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/debian-10.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-client
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/debian-9.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-client
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/fedora-31.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-clients
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/fedora-32.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-clients
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/opensuse-15.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/ubuntu-16.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-client
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/ubuntu-18.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-client
client_version: latest

+ 1
- 1
test/integration/default/files/_mapdata/ubuntu-20.yaml Visa fil

@@ -42,7 +42,7 @@ openssh:
present: false
banner: /etc/ssh/banner
banner_src: banner
banner_string: 'Welcome to %{hostname}!
banner_string: 'Welcome to example.net!
'
client: openssh-client
client_version: latest

+ 0
- 1
test/integration/share/README.md Visa fil

@@ -10,7 +10,6 @@ It's goal is to share the libraries between all profiles.

The `system` library provides easy access to system dependents informations:

- `system.hostname`: return the result of `hostname -s` or `hostnamectl --static` based on the availability of each commans
- `system.platform`: take `inspec.platform` and mangle things a bit to be useful
- `system.platform[:family]` provides a family name for Arch
- `system.platform[:name]` modify `amazon` to `amazonlinux`

+ 0
- 30
test/integration/share/libraries/system.rb Visa fil

@@ -4,47 +4,17 @@
# Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
# Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>

HOSTNAME_CMDS = %w[hostname hostnamectl].freeze
HOSTNAME_CMDS_OPT = {
'hostname' => '-s',
'hostnamectl' => '--static'
}.freeze

class SystemResource < Inspec.resource(1)
name 'system'

attr_reader :platform
attr_reader :hostname

def initialize
@platform = build_platform
@hostname = found_hostname
end

private

def found_hostname
cmd = guess_hostname_cmd

unless cmd.exit_status.zero?
raise Inspec::Exceptions::ResourceSkipped,
"Error running '#{cmd}': #{cmd.stderr}"
end

cmd.stdout.chomp
end

def guess_hostname_cmd
HOSTNAME_CMDS.each do |cmd|
if inspec.command(cmd).exist?
return inspec.command("#{cmd} #{HOSTNAME_CMDS_OPT[cmd]}")
end
end

raise Inspec::Exceptions::ResourceSkipped,
"Error: #{@platform[:finger]}} has none of #{HOSTNAME_CMDS.join(', ')}"
end

def build_platform
{
family: build_platform_family,

Laddar…
Avbryt
Spara