Merge pull request #41 from Sxderp/pr-fix-unknown-os-family

fix: do not error on unknown os_family grain

firewalld/map.jinja

@@ -3,25 +3,28 @@
 
 {#- Start with  defaults from defaults.yaml #}
 {% import_yaml "firewalld/defaults.yaml" as default_settings %}
+{% import_yaml "firewalld/osarchmap.yaml" as osarchmap %}
+{% import_yaml "firewalld/osfamilymap.yaml" as osfamilymap %}
+{% import_yaml "firewalld/osmap.yaml" as osmap %}
+{% import_yaml "firewalld/osfingermap.yaml" as osfingermap %}
 
-{#-
-Setup variable using grains['os_family'] based logic, only add key:values here
-that differ from whats in defaults.yaml
-#}
-{% set os_family_map = salt['grains.filter_by']({
-    'Debian': {},
-    'RedHat': {},
-    'Arch': {},
-    'Suse': {},
-  }, grain='os_family', merge=salt['pillar.get']('firewalld:lookup'))
-%}
+{% set _config = salt['config.get']('firewalld', default={}) %}
 
-{#- Merge the flavor_map to the default settings #}
-{% do default_settings.firewalld.update(os_family_map) %}
+{% set defaults = salt['grains.filter_by'](default_settings,
+    default='firewalld',
+    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'](_config, default='lookup')
+          )
+        )
+      )
+    )
+) %}
 
-{#- Merge in salt:lookup pillar #}
-{% set firewalld = salt['pillar.get'](
-    'firewalld',
-    default=default_settings.firewalld,
-    merge=True)
-%}
+{% set firewalld = salt['grains.filter_by'](
+    {'defaults': defaults},
+    default='defaults',
+    merge=_config
+) %}

firewalld/osarchmap.yaml

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Setup variables using grains['osarch'] based logic.
+# You just need to add the key:values for an `osarch` that differ
+# from `defaults.yaml`.
+# Only add an `osarch` which is/will be supported by the formula.
+#
+# If you do not need to provide defaults via the `osarch` grain,
+# you will need to provide at least an empty dict in this file, e.g.
+# osarch: {}
+---
+amd64:
+  arch: amd64
+
+x86_64:
+  arch: amd64
+
+386:
+  arch: 386
+
+arm64:
+  arch: arm64
+
+armv6l:
+  arch: armv6l
+
+armv7l:
+  arch: armv7l
+
+ppc64le:
+  arch: ppc64le
+
+s390x:
+  arch: s390x

firewalld/osfamilymap.yaml

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Setup variables using grains['os_family'] based logic.
+# You just need to add the key:values for an `os_family` that differ
+# from `defaults.yaml` + `osarch.yaml`.
+# Only add an `os_family` which is/will be supported by the formula.
+#
+# If you do not need to provide defaults via the `os_family` grain,
+# you will need to provide at least an empty dict in this file, e.g.
+# osfamilymap: {}
+---
+Debian: {}
+
+RedHat: {}
+
+Suse: {}
+
+Gentoo: {}
+
+Arch: {}
+
+Alpine: {}
+
+FreeBSD: {}
+
+OpenBSD: {}
+
+Solaris: {}
+
+Windows: {}
+
+MacOS: {}

firewalld/osfingermap.yaml

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Setup variables using grains['osfinger'] based logic.
+# You just need to add the key:values for an `osfinger` that differ
+# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml` + `osmap.yaml`.
+# Only add an `osfinger` which is/will be supported by the formula.
+#
+# If you do not need to provide defaults via the `os_finger` grain,
+# you will need to provide at least an empty dict in this file, e.g.
+# osfingermap: {}
+---
+# os: Debian
+Debian-10: {}
+Debian-9: {}
+Debian-8: {}
+
+# os: Ubuntu
+Ubuntu-18.04: {}
+Ubuntu-16.04: {}
+
+# os: Fedora
+Fedora-31: {}
+Fedora-30: {}
+
+# os: CentOS
+CentOS Linux-8: {}
+CentOS Linux-7: {}
+CentOS-6: {}
+
+# os: Amazon
+Amazon Linux-2: {}
+Amazon Linux AMI-2018: {}
+
+# os: SUSE
+Leap-15: {}
+
+# os: FreeBSD
+FreeBSD-12: {}
+
+# os: Windows
+Windows-8.1: {}
+
+# os: Gentoo
+Gentoo-2: {}

firewalld/osmap.yaml

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Setup variables using grains['os'] based logic.
+# You just need to add the key:values for an `os` that differ
+# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml`.
+# Only add an `os` which is/will be supported by the formula.
+#
+# If you do not need to provide defaults via the `os` grain,
+# you will need to provide at least an empty dict in this file, e.g.
+# osmap: {}
+---
+# os_family: Debian
+Ubuntu: {}
+Raspbian: {}
+
+# os_family: RedHat
+Fedora: {}
+CentOS: {}
+Amazon: {}
+
+# os_family: Suse
+SUSE: {}
+openSUSE: {}
+
+# os_family: Gentoo
+Funtoo: {}
+
+# os_family: Arch
+Manjaro: {}
+
+# os_family: Solaris
+SmartOS: {}

test/integration/default/controls/yaml_dump_spec.rb

@@ -11,6 +11,7 @@ control 'firewalld `map.jinja` YAML dump' do
     IndividualCalls: 'no'
     LogDenied: 'off'
     RFC3964_IPv4: 'yes'
+    arch: amd64
     backend:
       manage: true
       pkg: nftables