From 14e843ec2b756923e13daf21a0dabe480e289339 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Fri, 31 Jul 2020 08:01:27 +0200 Subject: [PATCH] fix(inspec): use the name `_mapdata` everywhere for coherency --- test/integration/default/controls/_mapdata_spec.rb | 2 +- .../default/files/{mapdata => _mapdata}/amazonlinux-1.yaml | 0 .../default/files/{mapdata => _mapdata}/amazonlinux-2.yaml | 0 .../default/files/{mapdata => _mapdata}/arch-base-latest.yaml | 0 .../default/files/{mapdata => _mapdata}/centos-6.yaml | 0 .../default/files/{mapdata => _mapdata}/centos-7.yaml | 0 .../default/files/{mapdata => _mapdata}/centos-8.yaml | 0 .../default/files/{mapdata => _mapdata}/debian-10.yaml | 0 .../default/files/{mapdata => _mapdata}/debian-9.yaml | 0 .../default/files/{mapdata => _mapdata}/fedora-31.yaml | 0 .../default/files/{mapdata => _mapdata}/fedora-32.yaml | 0 .../default/files/{mapdata => _mapdata}/opensuse-15.yaml | 0 .../default/files/{mapdata => _mapdata}/ubuntu-16.yaml | 0 .../default/files/{mapdata => _mapdata}/ubuntu-18.yaml | 0 .../default/files/{mapdata => _mapdata}/ubuntu-20.yaml | 0 15 files changed, 1 insertion(+), 1 deletion(-) rename test/integration/default/files/{mapdata => _mapdata}/amazonlinux-1.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/amazonlinux-2.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/arch-base-latest.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/centos-6.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/centos-7.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/centos-8.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/debian-10.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/debian-9.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/fedora-31.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/fedora-32.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/opensuse-15.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/ubuntu-16.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/ubuntu-18.yaml (100%) rename test/integration/default/files/{mapdata => _mapdata}/ubuntu-20.yaml (100%) diff --git a/test/integration/default/controls/_mapdata_spec.rb b/test/integration/default/controls/_mapdata_spec.rb index 2c5fd86..67760c5 100644 --- a/test/integration/default/controls/_mapdata_spec.rb +++ b/test/integration/default/controls/_mapdata_spec.rb @@ -5,7 +5,7 @@ replacement = { hostname: system.hostname } -mapdata_file = "mapdata/#{system.platform[:finger].split('.').first}.yaml" +mapdata_file = "_mapdata/#{system.platform[:finger].split('.').first}.yaml" mapdata_dump = inspec.profile.file(mapdata_file) % replacement control '`map.jinja` YAML dump' do diff --git a/test/integration/default/files/mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml similarity index 100% rename from test/integration/default/files/mapdata/amazonlinux-1.yaml rename to test/integration/default/files/_mapdata/amazonlinux-1.yaml diff --git a/test/integration/default/files/mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml similarity index 100% rename from test/integration/default/files/mapdata/amazonlinux-2.yaml rename to test/integration/default/files/_mapdata/amazonlinux-2.yaml diff --git a/test/integration/default/files/mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml similarity index 100% rename from test/integration/default/files/mapdata/arch-base-latest.yaml rename to test/integration/default/files/_mapdata/arch-base-latest.yaml diff --git a/test/integration/default/files/mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml similarity index 100% rename from test/integration/default/files/mapdata/centos-6.yaml rename to test/integration/default/files/_mapdata/centos-6.yaml diff --git a/test/integration/default/files/mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml similarity index 100% rename from test/integration/default/files/mapdata/centos-7.yaml rename to test/integration/default/files/_mapdata/centos-7.yaml diff --git a/test/integration/default/files/mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml similarity index 100% rename from test/integration/default/files/mapdata/centos-8.yaml rename to test/integration/default/files/_mapdata/centos-8.yaml diff --git a/test/integration/default/files/mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml similarity index 100% rename from test/integration/default/files/mapdata/debian-10.yaml rename to test/integration/default/files/_mapdata/debian-10.yaml diff --git a/test/integration/default/files/mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml similarity index 100% rename from test/integration/default/files/mapdata/debian-9.yaml rename to test/integration/default/files/_mapdata/debian-9.yaml diff --git a/test/integration/default/files/mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml similarity index 100% rename from test/integration/default/files/mapdata/fedora-31.yaml rename to test/integration/default/files/_mapdata/fedora-31.yaml diff --git a/test/integration/default/files/mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml similarity index 100% rename from test/integration/default/files/mapdata/fedora-32.yaml rename to test/integration/default/files/_mapdata/fedora-32.yaml diff --git a/test/integration/default/files/mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml similarity index 100% rename from test/integration/default/files/mapdata/opensuse-15.yaml rename to test/integration/default/files/_mapdata/opensuse-15.yaml diff --git a/test/integration/default/files/mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml similarity index 100% rename from test/integration/default/files/mapdata/ubuntu-16.yaml rename to test/integration/default/files/_mapdata/ubuntu-16.yaml diff --git a/test/integration/default/files/mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml similarity index 100% rename from test/integration/default/files/mapdata/ubuntu-18.yaml rename to test/integration/default/files/_mapdata/ubuntu-18.yaml diff --git a/test/integration/default/files/mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml similarity index 100% rename from test/integration/default/files/mapdata/ubuntu-20.yaml rename to test/integration/default/files/_mapdata/ubuntu-20.yaml