Merge pull request #63 from myii/refactor/add-osfingermap

refactor: add `osfingermap` (and `oscodenamemap` for Tumbleweed configuration)

Author: myii

node/map.jinja

@@ -3,18 +3,24 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings with context %}
+{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap with context %}
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap with context %}
 {%- import_yaml tplroot ~ "/osmap.yaml" as osmap with context %}
-{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap with context %}
+{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap with context %}
+{%- import_yaml tplroot ~ "/oscodenamemap.yaml" as oscodenamemap with context %}
 
 {%- set _config = salt['config.get'](tplroot, default={}) %}
 {%- set defaults = salt['grains.filter_by'](
       default_settings,
       default=tplroot,
-      merge=salt['grains.filter_by']( osfamilymap, grain='os_family',
-        merge=salt['grains.filter_by']( osmap, grain='os',
-          merge=salt['grains.filter_by']( osarchmap, grain='osarch',
-            merge=salt['grains.filter_by']( _config, default='lookup'
+      merge=salt['grains.filter_by']( osarchmap, grain='osarch',
+        merge=salt['grains.filter_by']( osfamilymap, grain='os_family',
+          merge=salt['grains.filter_by']( osmap, grain='os',
+            merge=salt['grains.filter_by']( osfingermap, grain='osfinger',
+              merge=salt['grains.filter_by']( oscodenamemap, grain='oscodename',
+                merge=salt['grains.filter_by']( _config, default='lookup'
+                )
+              )
             )
           )
         )

node/oscodenamemap.yaml

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+openSUSE Tumbleweed:
+  pkg:
+    name: nodejs16

node/osfingermap.yaml

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+Debian-9:
+  pkg:
+    version: 16.13.2-1nodesource1
+Ubuntu-18.04:
+  pkg:
+    version: 16.13.2-1nodesource1

test/integration/default/controls/packages_spec.rb

@@ -7,7 +7,12 @@
   package_name =
     case platform[:family]
     when 'suse'
-      'nodejs14'
+      case system.platform[:finger]
+      when 'opensuse-tumbleweed'
+        'nodejs16'
+      else
+        'nodejs14'
+      end
     else
       'nodejs'
     end

test/salt/pillar/repo.sls

@@ -4,9 +4,6 @@
 node:
   pkg:
     use_upstream_repo: true    # Debian family only
-    {%- if salt['grains.get']('osfinger') in ['Debian-9','Ubuntu-18.04'] %}
-    version: 16.13.2-1nodesource1
-    {%- endif %}
   config:
     prefix: /home/vagrant/.npm-packages
   environ: