From c93fa78805ff3c56224afc6e981597eec53d334c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 11 Feb 2021 11:54:05 +0000 Subject: [PATCH] chore: standardise structure (`.gitignore` & `_mapdata.rb`) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/292 --- .gitignore | 11 +++++++++++ CODEOWNERS | 2 +- .../controls/{_mapdata_spec.rb => _mapdata.rb} | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) rename test/integration/default/controls/{_mapdata_spec.rb => _mapdata.rb} (96%) diff --git a/.gitignore b/.gitignore index 6995110..94f77a8 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,9 @@ celerybeat-schedule venv/ ENV/ +# visual studio +.vs/ + # Spyder project settings .spyderproject .spyproject @@ -120,3 +123,11 @@ docs/*.md Dockerfile.*_* ignore/ tmp/ + +# `salt-formula` -- Vagrant Specific files +.vagrant +top.sls + +# `suricata-formula` -- Platform binaries +*.rpm +*.deb diff --git a/CODEOWNERS b/CODEOWNERS index 91d6155..f756143 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -22,7 +22,7 @@ /*/_mapdata/ @saltstack-formulas/ssf /*/libsaltcli.jinja @saltstack-formulas/ssf /*/libtofs.jinja @saltstack-formulas/ssf -/test/integration/**/_mapdata_spec.rb @saltstack-formulas/ssf +/test/integration/**/_mapdata.rb @saltstack-formulas/ssf /test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf diff --git a/test/integration/default/controls/_mapdata_spec.rb b/test/integration/default/controls/_mapdata.rb similarity index 96% rename from test/integration/default/controls/_mapdata_spec.rb rename to test/integration/default/controls/_mapdata.rb index 6463532..55788c5 100644 --- a/test/integration/default/controls/_mapdata_spec.rb +++ b/test/integration/default/controls/_mapdata.rb @@ -2,8 +2,8 @@ require 'yaml' -control '`map.jinja` YAML dump' do - title 'should match the comparison file' +control 'sudoers._mapdata' do + title '`map.jinja` should match the reference file' ### Method # The steps below for each file appear convoluted but they are both required