feat(template): review PR 212

* saltstack-formulas/template-formula#212

Use `:r! grep -riIn _mapdata_spec` to locate all of the lines to be
adjusted.
Then fix with `%s:_mapdata_spec.rb:_mapdata.rb:` (check changes
carefully afterwards).

Use `:r! find ssf/files/ -name _mapdata_spec.rb` to locate all of the
templates to rename and adjust.

pillar.example

@@ -182,7 +182,7 @@ ssf:
       - formula/_mapdata/init.sls
       - formula/libsaltcli.jinja
       - formula/libtofs.jinja
-      - inspec/controls/_mapdata_spec.rb
+      - inspec/controls/_mapdata.rb
       - inspec/libraries/system.rb
       - inspec/inspec.yml
       - inspec/README.md

ssf/config/formulas.sls

@@ -84,10 +84,10 @@ prepare-git-branch-for-{{ formula }}:
 {#-           Do not manage the file in the following situations: #}
 {#-           - If a matching test suite isn't found #}
 {#-           - Or if `libraries/system.rb` and is not the `share` suite #}
-{#-           - Or if `controls/_mapdata_spec.rb` and is the `share` suite #}
+{#-           - Or if `controls/_mapdata.rb` and is the `share` suite #}
 {%-           if (not matching_test_suite.found) or
                  (dest_file == 'libraries/system.rb' and suite.name != 'share') or
-                 (dest_file == 'controls/_mapdata_spec.rb' and suite.name == 'share')
+                 (dest_file == 'controls/_mapdata.rb' and suite.name == 'share')
 %}
 {%-             set dest_file = '' %}
 {%-           else %}

ssf/defaults.yaml

@@ -25,7 +25,7 @@ ssf_node_anchors:
               - '/*/_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'

ssf/files/default/inspec/controls/_mapdata_spec.rb → ssf/files/default/inspec/controls/_mapdata.rb

@@ -2,8 +2,8 @@
 
 require 'yaml'
 
-control '`map.jinja` YAML dump' do
-  title 'should match the comparison file'
+control '{{ semrel_formula }}._mapdata' do
+  title '`map.jinja` should match the reference file'
 
   ### Method
   # The steps below for each file appear convoluted but they are both required

ssf/formulas.yaml

@@ -745,8 +745,9 @@ ssf_node_anchors:
         formula/_mapdata/init.sls: &file__formula___mapdata___init--sls
           <<: *file_default
           template: 'mako'
-        inspec/controls/_mapdata_spec.rb: &file__inspec__controls___mapdata_spec--rb
+        inspec/controls/_mapdata.rb: &file__inspec__controls___mapdata--rb
           <<: *file_default
+          template: 'jinja'
         inspec/libraries/system.rb: &file__inspec__libraries__system--rb
           <<: *file_default