From b8052a044624ef4ace6e7c52ad08e000127934e2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 31 Oct 2020 12:27:57 +0000 Subject: [PATCH] test(map): verify `map.jinja` dump using `_mapdata` state [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/275 --- openssh/_mapdata/init.sls | 8 +++---- .../default/controls/_mapdata_spec.rb | 22 +++++++++++-------- test/integration/share/libraries/system.rb | 22 +++++++++++++++++++ 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/openssh/_mapdata/init.sls b/openssh/_mapdata/init.sls index 9e136bab..81f3ad5d 100644 --- a/openssh/_mapdata/init.sls +++ b/openssh/_mapdata/init.sls @@ -5,10 +5,10 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata with context %} -{%- set map = mapdata %} -{%- do salt['log.debug']('### MAP.JINJA DUMP ###\n' ~ map | yaml(False)) %} +{%- do salt['log.debug']('### MAP.JINJA DUMP ###\n' ~ mapdata | yaml(False)) %} -{%- set output_file = '/tmp/salt_mapdata_dump.yaml' %} +{%- set output_dir = '/temp' if grains.os_family == 'Windows' else '/tmp' %} +{%- set output_file = output_dir ~ '/salt_mapdata_dump.yaml' %} {{ tplroot }}-mapdata-dump: file.managed: @@ -16,4 +16,4 @@ - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja - template: jinja - context: - map: {{ map | yaml }} + map: {{ mapdata | yaml }} diff --git a/test/integration/default/controls/_mapdata_spec.rb b/test/integration/default/controls/_mapdata_spec.rb index bdc71489..2cced0a4 100644 --- a/test/integration/default/controls/_mapdata_spec.rb +++ b/test/integration/default/controls/_mapdata_spec.rb @@ -2,18 +2,22 @@ require 'yaml' -# Replace per minion strings -replacement = { - hostname: system.hostname -} - control '`map.jinja` YAML dump' do - title 'should contain exactly the same data as the comparison file' + title 'should match the comparison file' + # Strip the `platform[:finger]` version number down to the "OS major release" mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml" - mapdata_dump = YAML.safe_load(inspec.profile.file(mapdata_file) % replacement) - describe yaml('/tmp/salt_mapdata_dump.yaml').params do - it { should eq mapdata_dump } + # Load the mapdata from profile https://docs.chef.io/inspec/profiles/#profile-files + mapdata_dump = YAML.safe_load(inspec.profile.file(mapdata_file)) + + # Derive the location of the dumped mapdata + output_dir = platform[:family] == 'windows' ? '/temp' : '/tmp' + output_file = "#{output_dir}/salt_mapdata_dump.yaml" + + describe 'File content' do + it 'should match profile map data exactly' do + expect(yaml(output_file).params).to eq(mapdata_dump) + end end end diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb index ebd32b31..91ebbc8c 100644 --- a/test/integration/share/libraries/system.rb +++ b/test/integration/share/libraries/system.rb @@ -10,6 +10,7 @@ class SystemResource < Inspec.resource(1) attr_reader :platform def initialize + super @platform = build_platform end @@ -37,11 +38,16 @@ def build_platform_name case inspec.platform[:name] when 'amazon' 'amazonlinux' + when 'windows_8.1_pro' + 'windows' + when 'windows_server_2019_datacenter' + 'windows-server' else inspec.platform[:name] end end + # rubocop:disable Metrics/MethodLength def build_platform_release case inspec.platform[:name] when 'amazon' @@ -49,10 +55,26 @@ def build_platform_release inspec.platform[:release].gsub(/2018.*/, '1') when 'arch' 'base-latest' + when 'gentoo' + "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}" + when 'windows_8.1_pro' + '8.1' + when 'windows_server_2019_datacenter' + '2019' else inspec.platform[:release] end end + # rubocop:enable Metrics/MethodLength + + def derive_gentoo_init_system + case inspec.command('systemctl').exist? + when true + 'sysd' + else + 'sysv' + end + end def build_platform_finger "#{build_platform_name}-#{build_finger_release}"