chore(gemfile.lock): update to latest gem versions (2022-W28) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/454
chore(gemfile.lock): update to latest gem versions (2022-W26) [skip ci]
2022-07-17 19:47:08 +01:00 · 2022-06-30 23:08:24 +01:00 · 2022-06-15 23:05:30 +01:00 · 2022-06-09 00:04:29 +01:00 · 2022-06-07 23:30:19 +01:00 · 2022-05-30 17:28:12 +01:00
28 changed files with 1059 additions and 618 deletions
--- a/.gitignore
+++ b/.gitignore
@ -127,6 +127,7 @@ tmp/
 # `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
+!test/salt/pillar/top.sls

 # `suricata-formula` -- Platform binaries
 *.rpm
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -102,7 +102,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance:
+.test_instance: &test_instance
  stage: *stage_test
  image: *image_dindruby
  services: *services_docker_dind
@ -117,87 +117,84 @@ rubocop:
    # Alternative value to consider: `${CI_JOB_NAME}`
    - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'

+###############################################################################
+# Define `test` template (`allow_failure: true`)
+###############################################################################
+.test_instance_failure_permitted:
+  <<: *test_instance
+  allow_failure: true
+
 ###############################################################################
 # `test` stage: each instance below uses the `test` template above
 ###############################################################################
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
+# yamllint disable rule:line-length
+# default-debian-11-tiamat-py3: {extends: '.test_instance'}
 # default-debian-10-tiamat-py3: {extends: '.test_instance'}
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
-# default-centos-8-tiamat-py3: {extends: '.test_instance'}
+# default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
+# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
+# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
+default-debian-11-master-py3: {extends: '.test_instance'}
 default-debian-10-master-py3: {extends: '.test_instance'}
 default-debian-9-master-py3: {extends: '.test_instance'}
+default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-default-ubuntu-1604-master-py3: {extends: '.test_instance'}
-default-centos-8-master-py3: {extends: '.test_instance'}
+default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 default-centos-7-master-py3: {extends: '.test_instance'}
-default-fedora-33-master-py3: {extends: '.test_instance'}
-default-fedora-32-master-py3: {extends: '.test_instance'}
-default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
+default-fedora-35-master-py3: {extends: '.test_instance'}
+default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 default-oraclelinux-8-master-py3: {extends: '.test_instance'}
 default-oraclelinux-7-master-py3: {extends: '.test_instance'}
+default-arch-base-latest-master-py3: {extends: '.test_instance'}
 default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# default-debian-10-3002-5-py3: {extends: '.test_instance'}
-# default-debian-9-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
-# default-centos-8-3002-5-py3: {extends: '.test_instance'}
-# default-centos-7-3002-5-py3: {extends: '.test_instance'}
-# default-fedora-33-3002-5-py3: {extends: '.test_instance'}
-# default-fedora-32-3002-5-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
-# default-debian-10-3001-6-py3: {extends: '.test_instance'}
-# default-debian-9-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
-# default-centos-8-3001-6-py3: {extends: '.test_instance'}
-# default-centos-7-3001-6-py3: {extends: '.test_instance'}
-# default-fedora-33-3001-6-py3: {extends: '.test_instance'}
-# default-fedora-32-3001-6-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
-# default-debian-10-3000-8-py3: {extends: '.test_instance'}
-# default-debian-9-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
-# default-centos-8-3000-8-py3: {extends: '.test_instance'}
-# default-centos-7-3000-8-py3: {extends: '.test_instance'}
-# default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
-# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
-# default-arch-base-latest-3000-8-py2: {extends: '.test_instance'}
+default-almalinux-8-master-py3: {extends: '.test_instance'}
+default-rockylinux-8-master-py3: {extends: '.test_instance'}
+# default-debian-11-3004-1-py3: {extends: '.test_instance'}
+# default-debian-10-3004-1-py3: {extends: '.test_instance'}
+# default-debian-9-3004-1-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
+# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
+# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-7-3004-1-py3: {extends: '.test_instance'}
+# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
+# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
+# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
+# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+# default-debian-10-3003-4-py3: {extends: '.test_instance'}
+# default-debian-9-3003-4-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
+# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-7-3003-4-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
+# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
+# yamllint enable rule:line-length

 ###############################################################################
 # `release` stage: `semantic-release`
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -3,6 +3,18 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+ci:
+  autofix_commit_msg: |
+    ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
+
+    For more information, see https://pre-commit.ci
+  autofix_prs: true
+  autoupdate_branch: ''
+  autoupdate_commit_msg: |
+    ci(pre-commit.ci): perform `pre-commit` autoupdate
+  autoupdate_schedule: quarterly
+  skip: []
+  submodules: false
 default_stages: [commit]
 repos:
  - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@ -18,7 +30,7 @@ repos:
        additional_dependencies: ['@commitlint/config-conventional@8.3.4']
        always_run: true
  - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.9.1
+    rev: v1.30.1
    hooks:
      - id: rubocop
        name: Check Ruby files with rubocop
@ -26,14 +38,14 @@ repos:
        always_run: true
        pass_filenames: false
  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.7.1.1
+    rev: v0.8.0.4
    hooks:
      - id: shellcheck
        name: Check shell scripts with shellcheck
        files: ^.*\.(sh|bash|ksh)$
        types: []
  - repo: https://github.com/adrienverge/yamllint
-    rev: v1.23.0
+    rev: v1.26.3
    hooks:
      - id: yamllint
        name: Check YAML syntax with yamllint
@ -41,7 +53,7 @@ repos:
        always_run: true
        pass_filenames: false
  - repo: https://github.com/warpnet/salt-lint
-    rev: v0.3.0
+    rev: v0.8.0
    hooks:
      - id: salt-lint
        name: Check Salt files using salt-lint
@ -52,4 +64,14 @@ repos:
      - id: rstcheck
        name: Check reST files using rstcheck
        exclude: 'docs/CHANGELOG.rst'
-        args: [--report=warning]
+  - repo: https://github.com/saltstack-formulas/mirrors-rst-lint
+    rev: v1.3.2
+    hooks:
+      - id: rst-lint
+        name: Check reST files using rst-lint
+        exclude: |
+            (?x)^(
+                docs/CHANGELOG.rst|
+                docs/TOFS_pattern.rst|
+            )$
+        additional_dependencies: [pygments==2.9.0]
--- a/.rstcheck.cfg
+++ b/.rstcheck.cfg
@ -1,3 +1,4 @@
 [rstcheck]
-report=error
+report=info
 ignore_language=rst
+ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -7,7 +7,7 @@ Layout/LineLength:
  # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
  Max: 88
 Metrics/BlockLength:
-  ExcludedMethods:
+  IgnoredMethods:
    - control
    - describe
  # Increase from default of `25`
@ -16,4 +16,8 @@ Security/YAMLLoad:
  Exclude:
    - test/integration/**/_mapdata.rb

+# General settings across all cops in this formula
+AllCops:
+  NewCops: enable
+
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
--- a/.travis.yml
+++ b/.travis.yml
@ -83,81 +83,69 @@ jobs:
    ## Define the rest of the matrix based on Kitchen testing
    # Make sure the instances listed below match up with
    # the `platforms` defined in `kitchen.yml`
+    # - env: INSTANCE=default-debian-11-tiamat-py3
    # - env: INSTANCE=default-debian-10-tiamat-py3
    # - env: INSTANCE=default-debian-9-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-2204-tiamat-py3
    # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
    # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=default-ubuntu-1604-tiamat-py3
-    # - env: INSTANCE=default-centos-8-tiamat-py3
+    # - env: INSTANCE=default-centos-stream8-tiamat-py3
    # - env: INSTANCE=default-centos-7-tiamat-py3
    # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
    # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
    # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
+    # - env: INSTANCE=default-almalinux-8-tiamat-py3
+    # - env: INSTANCE=default-rockylinux-8-tiamat-py3
+    - env: INSTANCE=default-debian-11-master-py3
    - env: INSTANCE=default-debian-10-master-py3
    - env: INSTANCE=default-debian-9-master-py3
+    - env: INSTANCE=default-ubuntu-2204-master-py3
    - env: INSTANCE=default-ubuntu-2004-master-py3
    - env: INSTANCE=default-ubuntu-1804-master-py3
-    - env: INSTANCE=default-ubuntu-1604-master-py3
-    - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-centos-stream8-master-py3
    - env: INSTANCE=default-centos-7-master-py3
-    - env: INSTANCE=default-fedora-33-master-py3
-    - env: INSTANCE=default-fedora-32-master-py3
-    - env: INSTANCE=default-opensuse-leap-152-master-py3
+    - env: INSTANCE=default-fedora-36-master-py3
+    - env: INSTANCE=default-fedora-35-master-py3
+    - env: INSTANCE=default-opensuse-leap-153-master-py3
    - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
    - env: INSTANCE=default-amazonlinux-2-master-py3
    - env: INSTANCE=default-oraclelinux-8-master-py3
    - env: INSTANCE=default-oraclelinux-7-master-py3
+    - env: INSTANCE=default-arch-base-latest-master-py3
    - env: INSTANCE=default-gentoo-stage3-latest-master-py3
    - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=default-debian-10-3002-5-py3
-    # - env: INSTANCE=default-debian-9-3002-5-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-5-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-5-py3
-    # - env: INSTANCE=default-ubuntu-1604-3002-5-py3
-    # - env: INSTANCE=default-centos-8-3002-5-py3
-    # - env: INSTANCE=default-centos-7-3002-5-py3
-    # - env: INSTANCE=default-fedora-33-3002-5-py3
-    # - env: INSTANCE=default-fedora-32-3002-5-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-5-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-5-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-5-py3
-    # - env: INSTANCE=default-arch-base-latest-3002-5-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-2-py3
-    # - env: INSTANCE=default-debian-10-3001-6-py3
-    # - env: INSTANCE=default-debian-9-3001-6-py3
-    # - env: INSTANCE=default-ubuntu-2004-3001-6-py3
-    # - env: INSTANCE=default-ubuntu-1804-3001-6-py3
-    # - env: INSTANCE=default-ubuntu-1604-3001-6-py3
-    # - env: INSTANCE=default-centos-8-3001-6-py3
-    # - env: INSTANCE=default-centos-7-3001-6-py3
-    # - env: INSTANCE=default-fedora-33-3001-6-py3
-    # - env: INSTANCE=default-fedora-32-3001-6-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3001-6-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-6-py3
-    # - env: INSTANCE=default-amazonlinux-2-3001-6-py3
-    # - env: INSTANCE=default-oraclelinux-8-3001-6-py3
-    # - env: INSTANCE=default-oraclelinux-7-3001-6-py3
-    # - env: INSTANCE=default-arch-base-latest-3001-6-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3001-6-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-6-py3
-    # - env: INSTANCE=default-debian-10-3000-8-py3
-    # - env: INSTANCE=default-debian-9-3000-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3000-8-py3
-    # - env: INSTANCE=default-ubuntu-1604-3000-8-py3
-    # - env: INSTANCE=default-centos-8-3000-8-py3
-    # - env: INSTANCE=default-centos-7-3000-8-py3
-    # - env: INSTANCE=default-opensuse-leap-152-3000-8-py3
-    # - env: INSTANCE=default-amazonlinux-2-3000-8-py3
-    # - env: INSTANCE=default-oraclelinux-8-3000-8-py3
-    # - env: INSTANCE=default-oraclelinux-7-3000-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3000-8-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3000-8-py2
-    # - env: INSTANCE=default-ubuntu-1604-3000-8-py2
-    # - env: INSTANCE=default-arch-base-latest-3000-8-py2
+    - env: INSTANCE=default-almalinux-8-master-py3
+    - env: INSTANCE=default-rockylinux-8-master-py3
+    # - env: INSTANCE=default-debian-11-3004-1-py3
+    # - env: INSTANCE=default-debian-10-3004-1-py3
+    # - env: INSTANCE=default-debian-9-3004-1-py3
+    # - env: INSTANCE=default-ubuntu-2204-3004-1-py3
+    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
+    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
+    # - env: INSTANCE=default-centos-stream8-3004-1-py3
+    # - env: INSTANCE=default-centos-7-3004-1-py3
+    # - env: INSTANCE=default-fedora-36-3004-1-py3
+    # - env: INSTANCE=default-fedora-35-3004-1-py3
+    # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
+    # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
+    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
+    # - env: INSTANCE=default-arch-base-latest-3004-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
+    # - env: INSTANCE=default-almalinux-8-3004-1-py3
+    # - env: INSTANCE=default-rockylinux-8-3004-1-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
+    # - env: INSTANCE=default-debian-10-3003-4-py3
+    # - env: INSTANCE=default-debian-9-3003-4-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-4-py3
+    # - env: INSTANCE=default-ubuntu-1804-3003-4-py3
+    # - env: INSTANCE=default-centos-stream8-3003-4-py3
+    # - env: INSTANCE=default-centos-7-3003-4-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
+    # - env: INSTANCE=default-almalinux-8-3003-4-py3

    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/.yamllint
+++ b/.yamllint
@ -5,17 +5,21 @@
 extends: 'default'

 # Files to ignore completely
-# 1. All YAML files under directory `.cache/`, introduced during the GitLab CI run
-# 2. All YAML files under directory `.git/`
-# 3. All YAML files under directory `node_modules/`, introduced during the Travis run
-# 4. Any SLS files under directory `test/`, which are actually state files
-# 5. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
+# 2. All YAML files under directory `.cache/`, introduced during the CI run
+# 3. All YAML files under directory `.git/`
+# 4. All YAML files under directory `node_modules/`, introduced during the CI run
+# 5. Any SLS files under directory `test/`, which are actually state files
+# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
+# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
 ignore: |
+  .bundle/
  .cache/
  .git/
  node_modules/
  test/**/states/**/*.sls
  .kitchen/
+  kitchen.vagrant.yml

 yaml-files:
  # Default settings
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -4,13 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord

 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|77
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|122
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|26
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|23
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|14
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|16
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|14
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3012076?v=4' width='36' height='36' alt='@fzipi'>|[@fzipi](https://github.com/fzipi)|13
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|11
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|12
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|10
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/18299?v=4' width='36' height='36' alt='@davidkarlsen'>|[@davidkarlsen](https://github.com/davidkarlsen)|10
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>|[@ixs](https://github.com/ixs)|9
@ -19,16 +18,14 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1197993?v=4' width='36' height='36' alt='@danoe'>|[@danoe](https://github.com/danoe)|6
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13131979?v=4' width='36' height='36' alt='@BT-dschleich'>|[@BT-dschleich](https://github.com/BT-dschleich)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|3
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|4
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>|[@thatch45](https://github.com/thatch45)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/732321?v=4' width='36' height='36' alt='@gtmanfred'>|[@gtmanfred](https://github.com/gtmanfred)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>|[@stp-ip](https://github.com/stp-ip)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/131665?v=4' width='36' height='36' alt='@iamseth'>|[@iamseth](https://github.com/iamseth)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4156131?v=4' width='36' height='36' alt='@skylerberg'>|[@skylerberg](https://github.com/skylerberg)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/15616818?v=4' width='36' height='36' alt='@jasonious'>|[@jasonious](https://github.com/jasonious)|2
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>|[@babilen](https://github.com/babilen)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3180588?v=4' width='36' height='36' alt='@jeroen92'>|[@jeroen92](https://github.com/jeroen92)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/762280?v=4' width='36' height='36' alt='@asenci'>|[@asenci](https://github.com/asenci)|1
@ -48,4 +45,4 @@ Avatar|Contributor|Contributions

 ---

-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-03-15.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-02-13.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,50 @@
 # Changelog

+## [2.0.2](https://github.com/saltstack-formulas/postfix-formula/compare/v2.0.1...v2.0.2) (2022-02-13)
+
+
+### Code Refactoring
+
+* **salt-lint:** fix violations ([6a33d98](https://github.com/saltstack-formulas/postfix-formula/commit/6a33d98d75b7cbce3fa735f9e2c4071da0ce0355))
+
+
+### Continuous Integration
+
+* update linters to latest versions [skip ci] ([62eb687](https://github.com/saltstack-formulas/postfix-formula/commit/62eb687b052a31bc395f53dd9c8259ff643b449e))
+* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([5d167a4](https://github.com/saltstack-formulas/postfix-formula/commit/5d167a403c253e3b9f6c68641e0b871d287d2662))
+* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([008ac83](https://github.com/saltstack-formulas/postfix-formula/commit/008ac83c7a95dc1d29ee388f0d634ff3bd9b0320))
+
+## [2.0.1](https://github.com/saltstack-formulas/postfix-formula/compare/v2.0.0...v2.0.1) (2022-01-25)
+
+
+### Bug Fixes
+
+* **config:** set default_database_type; fixes [#118](https://github.com/saltstack-formulas/postfix-formula/issues/118) ([3bd3d1c](https://github.com/saltstack-formulas/postfix-formula/commit/3bd3d1c74e6dd60a984a3f790b8c50fa46ea2ed6))
+
+
+### Code Refactoring
+
+* **config:** add `default_database_type` as default value ([6da70d2](https://github.com/saltstack-formulas/postfix-formula/commit/6da70d21bbfbf613e6f0149c757c5e628ef227fb))
+
+
+### Continuous Integration
+
+* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([3284d38](https://github.com/saltstack-formulas/postfix-formula/commit/3284d38a367d94ef57c57e88dd6698c88b0affd2))
+* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([cfed974](https://github.com/saltstack-formulas/postfix-formula/commit/cfed97400047b109a765d5cee95667f6ca1c1fd2))
+* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([31a3836](https://github.com/saltstack-formulas/postfix-formula/commit/31a3836cd63f09d81ad88f510b61cb831436759c))
+* **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([dec042a](https://github.com/saltstack-formulas/postfix-formula/commit/dec042aa43e71785bc49247002a16d82af8c1531))
+* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([9688f36](https://github.com/saltstack-formulas/postfix-formula/commit/9688f36aa146d584546da71fa89e04525c08aa42))
+* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([76134b4](https://github.com/saltstack-formulas/postfix-formula/commit/76134b47c70d98d00dfe1e6d0f3c9cc0095bda69))
+* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([c631eca](https://github.com/saltstack-formulas/postfix-formula/commit/c631eca02e2c1c03e38bcd179c9b443c22ce706d))
+* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([c11c07d](https://github.com/saltstack-formulas/postfix-formula/commit/c11c07d6a664da11f11c22ddd416d0501a2cb07e))
+* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([04564a7](https://github.com/saltstack-formulas/postfix-formula/commit/04564a7ad6c803f70cfa487acd92dd1197563469))
+* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([d56006f](https://github.com/saltstack-formulas/postfix-formula/commit/d56006f8d2dac568c06c4e1e83b076acfe49a80c))
+
+
+### Tests
+
+* standardise use of `share` suite & `_mapdata` state [skip ci] ([4c394a7](https://github.com/saltstack-formulas/postfix-formula/commit/4c394a76faea4301df4708854edd39d37a13935d))
+
 # [2.0.0](https://github.com/saltstack-formulas/postfix-formula/compare/v1.2.2...v2.0.0) (2021-03-15)


--- a/3
+++ b/3
@ -22,6 +22,7 @@
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
+/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf
@ -39,6 +40,8 @@
 /Gemfile                                    @saltstack-formulas/ssf
 /Gemfile.lock                               @saltstack-formulas/ssf
 /kitchen.yml                                @saltstack-formulas/ssf
+/kitchen.vagrant.yml                        @saltstack-formulas/ssf
+/kitchen.windows.yml                        @saltstack-formulas/ssf
 /pre-commit_semantic-release.sh             @saltstack-formulas/ssf
 /release-rules.js                           @saltstack-formulas/ssf
 /release.config.js                          @saltstack-formulas/ssf
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 name: postfix
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE
 os_family: Debian, RedHat, Suse
-version: 2.0.0
+version: 2.0.2
 release: 1
 minimum_version: 2016.11
 summary: Postfix formula
--- a/21
+++ b/21
@ -1,14 +1,19 @@
 # frozen_string_literal: true

-source 'https://rubygems.org'
+source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')

-# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
-# regression where the diff isn't displayed when comparing using `eq`.
-gem 'inspec',      '~> 4.22.22'
-# Install the `kitchen-docker` gem from GitHub because the latest version
-# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
+# Install the `inspec` gem using `git` because versions after `4.22.22`
+# suppress diff output; this version fixes this for our uses.
+# rubocop:disable Layout/LineLength
+gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
+# rubocop:enable Layout/LineLength
+
+# Install the `kitchen-docker` gem using `git` in order to gain a performance
+# improvement: avoid package installations which are already covered by the
+# `salt-image-builder` (i.e. the pre-salted images that we're using)
 # rubocop:disable Layout/LineLength
 gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
 # rubocop:enable Layout/LineLength
-gem 'kitchen-inspec', '>= 2.2.1'
-gem 'kitchen-salt', '>= 0.6.3'
+
+gem 'kitchen-inspec', '>= 2.5.0'
+gem 'kitchen-salt', '>= 0.7.2'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,321 +1,418 @@
 GIT
-  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37
+  remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
+  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
  branch: ssf
  specs:
-    kitchen-docker (2.10.0)
+    inspec (5.18.15)
+      cookstyle
+      faraday_middleware (>= 0.12.2, < 1.1)
+      inspec-core (= 5.18.15)
+      mongo (= 2.13.2)
+      progress_bar (~> 1.3.3)
+      rake
+      train (~> 3.10)
+      train-aws (~> 0.2)
+      train-habitat (~> 0.1)
+      train-winrm (~> 0.2)
+    inspec-core (5.18.15)
+      addressable (~> 2.4)
+      chef-telemetry (~> 1.0, >= 1.0.8)
+      faraday (>= 0.9.0, < 1.5)
+      faraday_middleware (~> 1.0)
+      hashie (>= 3.4, < 5.0)
+      license-acceptance (>= 0.2.13, < 3.0)
+      method_source (>= 0.8, < 2.0)
+      mixlib-log (~> 3.0)
+      multipart-post (~> 2.0)
+      parallel (~> 1.9)
+      parslet (>= 1.5, < 2.0)
+      pry (~> 0.13)
+      rspec (>= 3.9, <= 3.11)
+      rspec-its (~> 1.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      semverse (~> 3.0)
+      sslshake (~> 1.2)
+      thor (>= 0.20, < 2.0)
+      tomlrb (>= 1.2, < 2.1)
+      train-core (~> 3.10)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
+
+GIT
+  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
+  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
+  branch: ssf
+  specs:
+    kitchen-docker (2.12.0)
      test-kitchen (>= 1.0.0)

 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (5.2.4.4)
+    activesupport (7.0.3.1)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.386.0)
-    aws-sdk-apigateway (1.55.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    ast (2.4.2)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.607.0)
+    aws-sdk-alexaforbusiness (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-amplify (1.32.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.33.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-apigateway (1.78.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.22.0)
-      aws-sdk-core (~> 3, >= 3.52.1)
+    aws-sdk-apigatewayv2 (1.42.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-applicationautoscaling (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.44.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-athena (1.55.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-autoscaling (1.63.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.27.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-batch (1.47.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.30.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-budgets (1.50.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudformation (1.70.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.45.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudfront (1.65.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.38.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudhsm (1.39.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.40.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudhsmv2 (1.42.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.37.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudtrail (1.49.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.37.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudwatch (1.64.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudwatchevents (1.46.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.109.1)
+    aws-sdk-cloudwatchlogs (1.53.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codecommit (1.51.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codedeploy (1.49.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codepipeline (1.53.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cognitoidentity (1.31.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cognitoidentityprovider (1.53.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-configservice (1.79.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.131.2)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-costandusagereportservice (1.28.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-costandusagereportservice (1.40.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.55.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-databasemigrationservice (1.53.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.202.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-dynamodb (1.75.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ec2 (1.322.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.70.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ecr (1.56.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ecrpublic (1.12.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.45.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ecs (1.100.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.44.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-efs (1.54.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-eks (1.75.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticache (1.78.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticbeanstalk (1.51.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.43.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticloadbalancing (1.40.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.35.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticloadbalancingv2 (1.78.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.42.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticsearchservice (1.65.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-emr (1.53.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.29.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-eventbridge (1.24.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.30.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-firehose (1.48.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-glue (1.88.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.51.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-guardduty (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-organizations (1.17.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-rds (1.104.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-iam (1.69.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.50.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kafka (1.50.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.44.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kinesis (1.41.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.28.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.57.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.21.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-lambda (1.84.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-mq (1.40.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-networkfirewall (1.17.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-networkmanager (1.24.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-organizations (1.59.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ram (1.26.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-rds (1.148.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-redshift (1.84.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53 (1.63.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53domains (1.40.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53resolver (1.37.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sdk-s3control (1.43.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.35.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-secretsmanager (1.46.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-securityhub (1.67.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sms (1.27.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-servicecatalog (1.60.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.34.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ses (1.41.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.34.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-shield (1.48.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.95.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-signer (1.32.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sdk-simpledb (1.29.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv2 (~> 1.0)
+    aws-sdk-sms (1.40.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sns (1.53.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.51.1)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ssm (1.137.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-states (1.39.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-synthetics (1.19.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-transfer (1.34.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-waf (1.43.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv2 (1.1.0)
+    aws-sigv4 (1.5.0)
      aws-eventstream (~> 1, >= 1.0.2)
    azure_graph_rbac (0.17.2)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_key_vault (0.17.6)
+    azure_mgmt_key_vault (0.17.7)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_resources (0.18.0)
+    azure_mgmt_resources (0.18.2)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_security (0.18.2)
+    azure_mgmt_security (0.19.0)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_storage (0.22.0)
+    azure_mgmt_storage (0.23.0)
      ms_rest_azure (~> 0.12.0)
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
+    bson (4.15.0)
    builder (3.2.4)
-    chef-config (16.6.14)
+    chef-config (17.10.0)
      addressable
-      chef-utils (= 16.6.14)
+      chef-utils (= 17.10.0)
      fuzzyurl
      mixlib-config (>= 2.2.12, < 4.0)
      mixlib-shellout (>= 2.0, < 4.0)
      tomlrb (~> 1.2)
-    chef-telemetry (1.0.14)
+    chef-telemetry (1.1.1)
      chef-config
      concurrent-ruby (~> 1.0)
-      ffi-yajl (~> 2.2)
-    chef-utils (16.6.14)
+    chef-utils (17.10.0)
+      concurrent-ruby
    coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
+    cookstyle (7.32.1)
+      rubocop (= 1.25.1)
    declarative (0.0.20)
-    declarative-option (0.1.0)
-    diff-lcs (1.4.4)
-    docker-api (2.0.0)
+    diff-lcs (1.5.0)
+    docker-api (2.2.0)
      excon (>= 0.47.0)
      multi_json
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    ecma-re-validator (0.2.1)
-      regexp_parser (~> 1.2)
-    ed25519 (1.2.4)
-    erubi (1.9.0)
-    excon (0.78.0)
-    faraday (0.17.3)
+    ed25519 (1.3.0)
+    erubi (1.10.0)
+    excon (0.92.3)
+    faraday (1.4.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
    faraday-cookie_jar (0.0.7)
      faraday (>= 0.8.0)
      http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    ffi (1.13.1)
-    ffi-yajl (2.3.4)
-      libyajl2 (~> 1.2)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    ffi (1.15.5)
    fuzzyurl (0.9.0)
-    google-api-client (0.44.0)
+    google-api-client (0.52.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (~> 0.9)
      httpclient (>= 2.8.1, < 3.0)
      mini_mime (~> 1.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
+      rexml
      signet (~> 0.12)
-    googleauth (0.13.0)
+    googleauth (0.14.0)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (~> 0.14)
-    gssapi (1.3.0)
+    gssapi (1.3.1)
      ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
      builder (>= 2.1.2)
-    hana (1.3.6)
-    hashie (3.6.0)
-    http-cookie (1.0.3)
+      rexml (~> 3.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
-    inspec (4.22.22)
-      faraday_middleware (~> 0.12.2)
-      inspec-core (= 4.22.22)
-      train (~> 3.0)
-      train-aws (~> 0.1)
-      train-habitat (~> 0.1)
-      train-winrm (~> 0.2)
-    inspec-core (4.22.22)
-      addressable (~> 2.4)
-      chef-telemetry (~> 1.0)
-      faraday (>= 0.9.0)
-      hashie (~> 3.4)
-      json_schemer (>= 0.2.1, < 0.2.12)
-      license-acceptance (>= 0.2.13, < 2.0)
-      method_source (>= 0.8, < 2.0)
-      mixlib-log (~> 3.0)
-      multipart-post (~> 2.0)
-      parallel (~> 1.9)
-      parslet (~> 1.5)
-      pry (~> 0.13)
-      rspec (~> 3.9)
-      rspec-its (~> 1.2)
-      rubyzip (~> 1.2, >= 1.2.2)
-      semverse (~> 3.0)
-      sslshake (~> 1.2)
-      thor (>= 0.20, < 2.0)
-      tomlrb (~> 1.2.0)
-      train-core (~> 3.0)
-      tty-prompt (~> 0.17)
-      tty-table (~> 0.10)
-    jmespath (1.4.0)
-    json (2.3.1)
-    json_schemer (0.2.11)
-      ecma-re-validator (~> 0.2)
-      hana (~> 1.3)
-      regexp_parser (~> 1.5)
-      uri_template (~> 0.7)
-    jwt (2.2.2)
-    kitchen-inspec (2.2.1)
-      hashie (~> 3.4)
-      inspec (>= 2.2.64, < 5.0)
-      test-kitchen (>= 2.7, < 3)
-    kitchen-salt (0.6.3)
+    jmespath (1.6.1)
+    json (2.6.2)
+    jwt (2.4.1)
+    kitchen-inspec (2.6.1)
+      hashie (>= 3.4, <= 5.0)
+      inspec (>= 2.2.64, < 7.0)
+      test-kitchen (>= 2.7, < 4)
+    kitchen-salt (0.7.2)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
-    libyajl2 (1.2.0)
-    license-acceptance (1.0.19)
+    license-acceptance (2.1.13)
      pastel (~> 0.7)
-      tomlrb (~> 1.2)
-      tty-box (~> 0.3)
-      tty-prompt (~> 0.18)
+      tomlrb (>= 1.2, < 3.0)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)
    little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.3.1)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    memoist (0.16.2)
    method_source (1.0.0)
-    mini_mime (1.0.2)
-    minitest (5.14.2)
-    mixlib-config (3.0.9)
+    mini_mime (1.1.2)
+    minitest (5.16.2)
+    mixlib-config (3.0.27)
      tomlrb
-    mixlib-install (3.12.3)
+    mixlib-install (3.12.19)
      mixlib-shellout
      mixlib-versioning
      thor
    mixlib-log (3.0.9)
-    mixlib-shellout (3.1.6)
+    mixlib-shellout (3.2.7)
      chef-utils
    mixlib-versioning (1.2.12)
+    mongo (2.13.2)
+      bson (>= 4.8.2, < 5.0.0)
    ms_rest (0.7.6)
      concurrent-ruby (~> 1.0)
      faraday (>= 0.9, < 2.0.0)
@ -326,60 +423,83 @@ GEM
      faraday-cookie_jar (~> 0.0.6)
      ms_rest (~> 0.7.6)
    multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
    net-scp (3.0.0)
      net-ssh (>= 2.6.5, < 7.0.0)
    net-ssh (6.1.0)
    net-ssh-gateway (2.0.0)
      net-ssh (>= 4.0.0)
    nori (2.6.0)
-    os (1.1.1)
-    parallel (1.19.2)
+    options (2.3.2)
+    os (1.1.4)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
    parslet (1.8.2)
    pastel (0.8.0)
      tty-color (~> 0.5)
-    pry (0.13.1)
+    progress_bar (1.3.3)
+      highline (>= 1.6, < 3)
+      options (~> 2.3.0)
+    pry (0.14.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    public_suffix (4.0.6)
-    regexp_parser (1.8.2)
-    representable (3.0.4)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    representable (3.2.0)
      declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.3)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.11.0)
    rspec-its (1.3.0)
      rspec-core (>= 3.0.0)
      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.11.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    rubyntlm (0.6.2)
-    rubyzip (1.3.0)
-    semverse (3.0.0)
-    signet (0.14.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.19.1)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.2)
+    semverse (3.0.2)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
-    strings (0.2.0)
+    strings (0.2.1)
      strings-ansi (~> 0.2)
-      unicode-display_width (~> 1.5)
+      unicode-display_width (>= 1.5, < 3.0)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
-    test-kitchen (2.7.2)
+    test-kitchen (3.3.1)
      bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
      ed25519 (~> 1.2)
      license-acceptance (>= 1.0.11, < 3.0)
      mixlib-install (~> 3.6)
@ -391,28 +511,32 @@ GEM
      winrm (~> 2.0)
      winrm-elevated (~> 1.0)
      winrm-fs (~> 1.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.2.1)
    timeliness (0.3.10)
-    tomlrb (1.2.9)
-    train (3.3.27)
-      activesupport (>= 5.2.4.3, < 6.0.0)
+    tomlrb (1.3.0)
+    trailblazer-option (0.1.2)
+    train (3.10.1)
+      activesupport (>= 6.0.3.1)
      azure_graph_rbac (~> 0.16)
      azure_mgmt_key_vault (~> 0.17)
      azure_mgmt_resources (~> 0.15)
      azure_mgmt_security (~> 0.18)
      azure_mgmt_storage (~> 0.18)
      docker-api (>= 1.26, < 3.0)
-      google-api-client (>= 0.23.9, < 0.44.1)
-      googleauth (>= 0.6.6, < 0.13.1)
+      google-api-client (>= 0.23.9, <= 0.52.0)
+      googleauth (>= 0.6.6, <= 0.14.0)
      inifile (~> 3.0)
-      train-core (= 3.3.27)
+      train-core (= 3.10.1)
      train-winrm (~> 0.2)
-    train-aws (0.1.18)
+    train-aws (0.2.24)
+      aws-sdk-alexaforbusiness (~> 1.0)
+      aws-sdk-amplify (~> 1.32.0)
      aws-sdk-apigateway (~> 1.0)
      aws-sdk-apigatewayv2 (~> 1.0)
+      aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
      aws-sdk-athena (~> 1.0)
-      aws-sdk-autoscaling (~> 1.22.0)
+      aws-sdk-autoscaling (>= 1.22, < 1.64)
+      aws-sdk-batch (>= 1.36, < 1.48)
      aws-sdk-budgets (~> 1.0)
      aws-sdk-cloudformation (~> 1.0)
      aws-sdk-cloudfront (~> 1.0)
@ -420,16 +544,21 @@ GEM
      aws-sdk-cloudhsmv2 (~> 1.0)
      aws-sdk-cloudtrail (~> 1.8)
      aws-sdk-cloudwatch (~> 1.13)
+      aws-sdk-cloudwatchevents (>= 1.36, < 1.47)
      aws-sdk-cloudwatchlogs (~> 1.13)
      aws-sdk-codecommit (~> 1.0)
      aws-sdk-codedeploy (~> 1.0)
      aws-sdk-codepipeline (~> 1.0)
+      aws-sdk-cognitoidentity (>= 1.26, < 1.32)
+      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54)
      aws-sdk-configservice (~> 1.21)
      aws-sdk-core (~> 3.0)
      aws-sdk-costandusagereportservice (~> 1.6)
+      aws-sdk-databasemigrationservice (>= 1.42, < 1.54)
      aws-sdk-dynamodb (~> 1.31)
      aws-sdk-ec2 (~> 1.70)
      aws-sdk-ecr (~> 1.18)
+      aws-sdk-ecrpublic (~> 1.3)
      aws-sdk-ecs (~> 1.30)
      aws-sdk-efs (~> 1.0)
      aws-sdk-eks (~> 1.9)
@ -438,48 +567,65 @@ GEM
      aws-sdk-elasticloadbalancing (~> 1.8)
      aws-sdk-elasticloadbalancingv2 (~> 1.0)
      aws-sdk-elasticsearchservice (~> 1.0)
+      aws-sdk-emr (~> 1.53.0)
+      aws-sdk-eventbridge (~> 1.24.0)
      aws-sdk-firehose (~> 1.0)
+      aws-sdk-glue (>= 1.71, < 1.89)
      aws-sdk-guardduty (~> 1.31)
      aws-sdk-iam (~> 1.13)
      aws-sdk-kafka (~> 1.0)
      aws-sdk-kinesis (~> 1.0)
      aws-sdk-kms (~> 1.13)
      aws-sdk-lambda (~> 1.0)
-      aws-sdk-organizations (~> 1.17.0)
+      aws-sdk-mq (~> 1.40.0)
+      aws-sdk-networkfirewall (>= 1.6.0)
+      aws-sdk-networkmanager (>= 1.13.0)
+      aws-sdk-organizations (>= 1.17, < 1.60)
+      aws-sdk-ram (>= 1.21, < 1.27)
      aws-sdk-rds (~> 1.43)
      aws-sdk-redshift (~> 1.0)
      aws-sdk-route53 (~> 1.0)
      aws-sdk-route53domains (~> 1.0)
      aws-sdk-route53resolver (~> 1.0)
      aws-sdk-s3 (~> 1.30)
+      aws-sdk-s3control (~> 1.43.0)
+      aws-sdk-secretsmanager (>= 1.42, < 1.47)
      aws-sdk-securityhub (~> 1.0)
-      aws-sdk-ses (~> 1.0)
+      aws-sdk-servicecatalog (>= 1.48, < 1.61)
+      aws-sdk-ses (~> 1.41.0)
+      aws-sdk-shield (~> 1.30)
+      aws-sdk-signer (~> 1.32.0)
+      aws-sdk-simpledb (~> 1.29.0)
      aws-sdk-sms (~> 1.0)
      aws-sdk-sns (~> 1.9)
      aws-sdk-sqs (~> 1.10)
      aws-sdk-ssm (~> 1.0)
-    train-core (3.3.27)
+      aws-sdk-states (>= 1.35, < 1.40)
+      aws-sdk-synthetics (~> 1.19.0)
+      aws-sdk-transfer (>= 1.26, < 1.35)
+      aws-sdk-waf (~> 1.43.0)
+    train-core (3.10.1)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
      mixlib-shellout (>= 2.0, < 4.0)
      net-scp (>= 1.2, < 4.0)
      net-ssh (>= 2.9, < 7.0)
-    train-habitat (0.2.13)
-    train-winrm (0.2.11)
-      winrm (~> 2.0)
+    train-habitat (0.2.22)
+    train-winrm (0.2.13)
+      winrm (>= 2.3.6, < 3.0)
      winrm-elevated (~> 1.2.2)
      winrm-fs (~> 1.0)
-    tty-box (0.6.0)
+    tty-box (0.7.0)
      pastel (~> 0.8)
      strings (~> 0.2.0)
      tty-cursor (~> 0.7)
-    tty-color (0.5.2)
+    tty-color (0.6.0)
    tty-cursor (0.7.1)
-    tty-prompt (0.22.0)
+    tty-prompt (0.23.1)
      pastel (~> 0.8)
      tty-reader (~> 0.8)
-    tty-reader (0.8.0)
+    tty-reader (0.9.0)
      tty-cursor (~> 0.7)
      tty-screen (~> 0.8)
      wisper (~> 2.0)
@ -488,16 +634,15 @@ GEM
      pastel (~> 0.8)
      strings (~> 0.2.0)
      tty-screen (~> 0.8)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (2.2.0)
    unicode_utils (1.4.0)
-    uri_template (0.7.0)
-    winrm (2.3.5)
+    winrm (2.3.6)
      builder (>= 2.1.2)
      erubi (~> 1.8)
      gssapi (~> 1.2)
@ -505,15 +650,15 @@ GEM
      httpclient (~> 2.2, >= 2.2.0.2)
      logging (>= 1.6.1, < 3.0)
      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.2.2)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
      erubi (~> 1.8)
      winrm (~> 2.0)
      winrm-fs (~> 1.0)
-    winrm-fs (1.3.3)
+    winrm-fs (1.3.5)
      erubi (~> 1.8)
      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 1.1)
+      rubyzip (~> 2.0)
      winrm (~> 2.0)
    wisper (2.0.1)

@ -521,10 +666,10 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  inspec (~> 4.22.22)
+  inspec!
  kitchen-docker!
-  kitchen-inspec (>= 2.2.1)
-  kitchen-salt (>= 0.6.3)
+  kitchen-inspec (>= 2.5.0)
+  kitchen-salt (>= 0.7.2)

 BUNDLED WITH
   2.1.2
--- a/bin/kitchen
+++ b/bin/kitchen
@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
    load(bundle_binstub)
  else
    abort(
-      'Your `bin/bundle` was not generated by Bundler, '\
-      'so this binstub cannot run.  Replace `bin/bundle` by running '\
+      'Your `bin/bundle` was not generated by Bundler, ' \
+      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
      '`bundle binstubs bundler --force`, then run this command again.'
    )
  end
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - Contributions
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
     - `@myii <https://github.com/myii>`_
-     - 77
+     - 122
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>`
     - `@EvaSDK <https://github.com/EvaSDK>`_
     - 26
@ -24,16 +24,13 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - 23
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
     - `@javierbertoli <https://github.com/javierbertoli>`_
-     - 14
+     - 16
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
     - `@nmadhok <https://github.com/nmadhok>`_
     - 14
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3012076?v=4' width='36' height='36' alt='@fzipi'>`
-     - `@fzipi <https://github.com/fzipi>`_
-     - 13
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
     - `@alxwr <https://github.com/alxwr>`_
-     - 11
+     - 12
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
     - `@gravyboat <https://github.com/gravyboat>`_
     - 10
@ -58,12 +55,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
     - `@dafyddj <https://github.com/dafyddj>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13131979?v=4' width='36' height='36' alt='@BT-dschleich'>`
-     - `@BT-dschleich <https://github.com/BT-dschleich>`_
-     - 3
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 3
+     - 4
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>`
     - `@thatch45 <https://github.com/thatch45>`_
     - 3
@ -82,11 +76,8 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4156131?v=4' width='36' height='36' alt='@skylerberg'>`
     - `@skylerberg <https://github.com/skylerberg>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>`
-     - `@babilen5 <https://github.com/babilen5>`_
-     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/15616818?v=4' width='36' height='36' alt='@jasonious'>`
-     - `@jasonious <https://github.com/jasonious>`_
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>`
+     - `@babilen <https://github.com/babilen>`_
     - 2
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3180588?v=4' width='36' height='36' alt='@jeroen92'>`
     - `@jeroen92 <https://github.com/jeroen92>`_
@ -140,4 +131,4 @@ This list is sorted by the number of commits per contributor in *descending* ord

 ----

-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-03-15.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-02-13.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@ -2,6 +2,59 @@
 Changelog
 =========

+`2.0.2 <https://github.com/saltstack-formulas/postfix-formula/compare/v2.0.1...v2.0.2>`_ (2022-02-13)
+---------------------------------------------------------------------------------------------------------
+
+Code Refactoring
+^^^^^^^^^^^^^^^^
+
+
+* **salt-lint:** fix violations (\ `6a33d98 <https://github.com/saltstack-formulas/postfix-formula/commit/6a33d98d75b7cbce3fa735f9e2c4071da0ce0355>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* update linters to latest versions [skip ci] (\ `62eb687 <https://github.com/saltstack-formulas/postfix-formula/commit/62eb687b052a31bc395f53dd9c8259ff643b449e>`_\ )
+* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `5d167a4 <https://github.com/saltstack-formulas/postfix-formula/commit/5d167a403c253e3b9f6c68641e0b871d287d2662>`_\ )
+* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `008ac83 <https://github.com/saltstack-formulas/postfix-formula/commit/008ac83c7a95dc1d29ee388f0d634ff3bd9b0320>`_\ )
+
+`2.0.1 <https://github.com/saltstack-formulas/postfix-formula/compare/v2.0.0...v2.0.1>`_ (2022-01-25)
+---------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **config:** set default_database_type; fixes `#118 <https://github.com/saltstack-formulas/postfix-formula/issues/118>`_ (\ `3bd3d1c <https://github.com/saltstack-formulas/postfix-formula/commit/3bd3d1c74e6dd60a984a3f790b8c50fa46ea2ed6>`_\ )
+
+Code Refactoring
+^^^^^^^^^^^^^^^^
+
+
+* **config:** add ``default_database_type`` as default value (\ `6da70d2 <https://github.com/saltstack-formulas/postfix-formula/commit/6da70d21bbfbf613e6f0149c757c5e628ef227fb>`_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `3284d38 <https://github.com/saltstack-formulas/postfix-formula/commit/3284d38a367d94ef57c57e88dd6698c88b0affd2>`_\ )
+* **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `cfed974 <https://github.com/saltstack-formulas/postfix-formula/commit/cfed97400047b109a765d5cee95667f6ca1c1fd2>`_\ )
+* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `31a3836 <https://github.com/saltstack-formulas/postfix-formula/commit/31a3836cd63f09d81ad88f510b61cb831436759c>`_\ )
+* **kitchen+ci:** update with ``3004`` pre-salted images/boxes [skip ci] (\ `dec042a <https://github.com/saltstack-formulas/postfix-formula/commit/dec042aa43e71785bc49247002a16d82af8c1531>`_\ )
+* **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `9688f36 <https://github.com/saltstack-formulas/postfix-formula/commit/9688f36aa146d584546da71fa89e04525c08aa42>`_\ )
+* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `76134b4 <https://github.com/saltstack-formulas/postfix-formula/commit/76134b47c70d98d00dfe1e6d0f3c9cc0095bda69>`_\ )
+* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `c631eca <https://github.com/saltstack-formulas/postfix-formula/commit/c631eca02e2c1c03e38bcd179c9b443c22ce706d>`_\ )
+* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `c11c07d <https://github.com/saltstack-formulas/postfix-formula/commit/c11c07d6a664da11f11c22ddd416d0501a2cb07e>`_\ )
+* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `04564a7 <https://github.com/saltstack-formulas/postfix-formula/commit/04564a7ad6c803f70cfa487acd92dd1197563469>`_\ )
+* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `d56006f <https://github.com/saltstack-formulas/postfix-formula/commit/d56006f8d2dac568c06c4e1e83b076acfe49a80c>`_\ )
+
+Tests
+^^^^^
+
+
+* standardise use of ``share`` suite & ``_mapdata`` state [skip ci] (\ `4c394a7 <https://github.com/saltstack-formulas/postfix-formula/commit/4c394a76faea4301df4708854edd39d37a13935d>`_\ )
+
 `2.0.0 <https://github.com/saltstack-formulas/postfix-formula/compare/v1.2.2...v2.0.0>`_ (2021-03-15)
 ---------------------------------------------------------------------------------------------------------

--- a/kitchen.yml
+++ b/kitchen.yml
@ -6,28 +6,47 @@ driver:
  name: docker
  use_sudo: false
  privileged: true
-  run_command: /lib/systemd/systemd
+  run_command: /usr/lib/systemd/systemd
+
+provisioner:
+  name: salt_solo
+  log_level: debug
+  salt_install: none
+  require_chef: false
+  formula: postfix
+  salt_copy_filter:
+    - .kitchen
+    - .git

 platforms:
  ## SALT `tiamat`
+  - name: debian-11-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-11
+      run_command: /lib/systemd/systemd
  - name: debian-10-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:debian-10
+      run_command: /lib/systemd/systemd
  - name: debian-9-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-18.04
-  - name: ubuntu-1604-tiamat-py3
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-tiamat-py3
    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-16.04
-  - name: centos-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-8
+      image: saltimages/salt-tiamat-py3:centos-stream8
  - name: centos-7-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:centos-7
@ -40,47 +59,60 @@ platforms:
  - name: oraclelinux-7-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:oraclelinux-7
+  - name: almalinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:almalinux-8
+  - name: rockylinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:rockylinux-8

  ## SALT `master`
+  - name: debian-11-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-11
+      run_command: /lib/systemd/systemd
  - name: debian-10-master-py3
    driver:
      image: saltimages/salt-master-py3:debian-10
+      run_command: /lib/systemd/systemd
  - name: debian-9-master-py3
    driver:
      image: saltimages/salt-master-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
  - name: ubuntu-2004-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
  - name: ubuntu-1804-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-18.04
-  - name: ubuntu-1604-master-py3
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-master-py3
    driver:
-      image: saltimages/salt-master-py3:ubuntu-16.04
-  - name: centos-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:centos-8
+      image: saltimages/salt-master-py3:centos-stream8
  - name: centos-7-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-7
-  - name: fedora-33-master-py3
+  - name: fedora-36-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-33
-  - name: fedora-32-master-py3
+      image: saltimages/salt-master-py3:fedora-36
+  - name: fedora-35-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-32
-  - name: opensuse-leap-152-master-py3
+      image: saltimages/salt-master-py3:fedora-35
+  - name: opensuse-leap-153-master-py3
    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+      image: saltimages/salt-master-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
  - name: opensuse-tmbl-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
-      run_command: /usr/lib/systemd/systemd
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
@ -94,6 +126,9 @@ platforms:
  - name: oraclelinux-7-master-py3
    driver:
      image: saltimages/salt-master-py3:oraclelinux-7
+  - name: arch-base-latest-master-py3
+    driver:
+      image: saltimages/salt-master-py3:arch-base-latest
  - name: gentoo-stage3-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:gentoo-stage3-latest
@ -101,209 +136,134 @@ platforms:
  - name: gentoo-stage3-systemd-master-py3
    driver:
      image: saltimages/salt-master-py3:gentoo-stage3-systemd
+  - name: almalinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:almalinux-8
+  - name: rockylinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:rockylinux-8

-  ## SALT `3002.5`
-  - name: debian-10-3002-5-py3
+  ## SALT `3004.1`
+  - name: debian-11-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:debian-10
-  - name: debian-9-3002-5-py3
+      image: saltimages/salt-3004.1-py3:debian-11
+      run_command: /lib/systemd/systemd
+  - name: debian-10-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:debian-9
-  - name: ubuntu-2004-3002-5-py3
+      image: saltimages/salt-3004.1-py3:debian-10
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-20.04
-  - name: ubuntu-1804-3002-5-py3
+      image: saltimages/salt-3004.1-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-18.04
-  - name: ubuntu-1604-3002-5-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:ubuntu-16.04
-  - name: centos-8-3002-5-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:centos-8
-  - name: centos-7-3002-5-py3
+      image: saltimages/salt-3004.1-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:centos-7
-  - name: fedora-33-3002-5-py3
+      image: saltimages/salt-3004.1-py3:centos-stream8
+  - name: centos-7-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:fedora-33
-  - name: fedora-32-3002-5-py3
+      image: saltimages/salt-3004.1-py3:centos-7
+  - name: fedora-36-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:fedora-32
-  - name: amazonlinux-2-3002-5-py3
+      image: saltimages/salt-3004.1-py3:fedora-36
+  - name: fedora-35-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-5-py3
+      image: saltimages/salt-3004.1-py3:fedora-35
+  - name: amazonlinux-2-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-5-py3
+      image: saltimages/salt-3004.1-py3:amazonlinux-2
+  - name: oraclelinux-8-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:oraclelinux-7
-  - name: arch-base-latest-3002-5-py3
+      image: saltimages/salt-3004.1-py3:oraclelinux-8
+  - name: oraclelinux-7-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-  - name: gentoo-stage3-latest-3002-5-py3
+      image: saltimages/salt-3004.1-py3:oraclelinux-7
+  - name: arch-base-latest-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
+      image: saltimages/salt-3004.1-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3002-5-py3
+  - name: gentoo-stage3-systemd-3004-1-py3
    driver:
-      image: saltimages/salt-3002.5-py3:gentoo-stage3-systemd
+      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:almalinux-8
+  - name: rockylinux-8-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:rockylinux-8

-  ## SALT `3002.2`
-  - name: opensuse-leap-152-3002-2-py3
+  ## SALT `3004.0`
+  - name: opensuse-leap-153-3004-0-py3
    driver:
-      image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3002-2-py3
+  - name: opensuse-tmbl-latest-3004-0-py3
    driver:
-      image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
-      run_command: /usr/lib/systemd/systemd
+      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1

-  ## SALT `3001.6`
-  - name: debian-10-3001-6-py3
+  ## SALT `3003.4`
+  - name: debian-10-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:debian-10
-  - name: debian-9-3001-6-py3
+      image: saltimages/salt-3003.4-py3:debian-10
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:debian-9
-  - name: ubuntu-2004-3001-6-py3
+      image: saltimages/salt-3003.4-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-20.04
-  - name: ubuntu-1804-3001-6-py3
+      image: saltimages/salt-3003.4-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-18.04
-  - name: ubuntu-1604-3001-6-py3
+      image: saltimages/salt-3003.4-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+  - name: centos-stream8-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:ubuntu-16.04
-  - name: centos-8-3001-6-py3
+      image: saltimages/salt-3003.4-py3:centos-stream8
+  - name: centos-7-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:centos-8
-  - name: centos-7-3001-6-py3
+      image: saltimages/salt-3003.4-py3:centos-7
+  - name: amazonlinux-2-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:centos-7
-  - name: fedora-33-3001-6-py3
+      image: saltimages/salt-3003.4-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:fedora-33
-  - name: fedora-32-3001-6-py3
+      image: saltimages/salt-3003.4-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:fedora-32
-  - name: opensuse-leap-152-3001-6-py3
+      image: saltimages/salt-3003.4-py3:oraclelinux-7
+  - name: almalinux-8-3003-4-py3
    driver:
-      image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:amazonlinux-2
-  - name: oraclelinux-8-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:oraclelinux-8
-  - name: oraclelinux-7-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:oraclelinux-7
-  - name: arch-base-latest-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-  - name: gentoo-stage3-latest-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3001-6-py3
-    driver:
-      image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd
-
-  ## SALT `3000.8`
-  - name: debian-10-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:debian-10
-  - name: debian-9-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:debian-9
-  - name: ubuntu-1804-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:ubuntu-18.04
-  - name: ubuntu-1604-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:ubuntu-16.04
-  - name: centos-8-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:centos-8
-  - name: centos-7-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:centos-7
-  - name: opensuse-leap-152-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:oraclelinux-7
-  - name: gentoo-stage3-latest-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3000-8-py3
-    driver:
-      image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
-  - name: ubuntu-1804-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:ubuntu-18.04
-  - name: ubuntu-1604-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:ubuntu-16.04
-  - name: arch-base-latest-3000-8-py2
-    driver:
-      image: saltimages/salt-3000.8-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-provisioner:
-  name: salt_solo
-  log_level: debug
-  salt_install: none
-  require_chef: false
-  formula: postfix
-  salt_copy_filter:
-    - .kitchen
-    - .git
+      image: saltimages/salt-3003.4-py3:almalinux-8

 verifier:
  # https://www.inspec.io/
  name: inspec
  sudo: true
-  # cli, documentation, html, progress, json, json-min, json-rspec, junit
  reporter:
+    # cli, documentation, html, progress, json, json-min, json-rspec, junit
    - cli

 suites:
@ -312,6 +272,7 @@ suites:
      state_top:
        base:
          '*':
+            - postfix._mapdata
            - postfix
            - postfix.config
      pillars:
--- a/postfix/_mapdata/_mapdata.jinja
+++ b/postfix/_mapdata/_mapdata.jinja
@ -0,0 +1,13 @@
+# yamllint disable rule:indentation rule:line-length
+# {{ grains.get("osfinger", grains.os) }}
+---
+{#- use salt.slsutil.serialize to avoid encoding errors on some platforms #}
+{{ salt["slsutil.serialize"](
+     "yaml",
+     map,
+     default_flow_style=False,
+     allow_unicode=True,
+   )
+   | regex_replace("^\s+'$", "'", multiline=True)
+   | trim
+}}
--- a/postfix/_mapdata/init.sls
+++ b/postfix/_mapdata/init.sls
@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+---
+{#- Get the `tplroot` from `tpldir` #}
+{%- set tplroot = tpldir.split("/")[0] %}
+{%- from tplroot ~ "/map.jinja" import postfix with context %}
+
+{%- set _mapdata = {
+      "values": postfix,
+    } %}
+{%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
+
+{%- set output_dir = "/temp" if grains.os_family == "Windows" else "/tmp" %}
+{%- set output_file = output_dir ~ "/salt_mapdata_dump.yaml" %}
+
+{{ tplroot }}-mapdata-dump:
+  file.managed:
+    - name: {{ output_file }}
+    - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja
+    - template: jinja
+    - context:
+        map: {{ _mapdata | yaml }}
--- a/postfix/config.sls
+++ b/postfix/config.sls
@ -1,4 +1,5 @@
 {% from "postfix/map.jinja" import postfix with context %}
+
 include:
  - postfix

@ -117,7 +118,7 @@ postfix-config-file-managed-{{ domain }}-ssl-key:
  {%- elif ':' in file_path %}
    {%- set file_type, file_path = file_path.split(':') %}
  {%- else %}
-    {%- set file_type = default_database_type %}
+    {%- set file_type = postfix.default_database_type %}
  {%- endif %}
  {%- if not file_path.startswith('/') %}
    {%- set file_path = postfix.config_path ~ '/' ~ file_path %}
@ -143,11 +144,11 @@ postfix-config-file-managed-{{ mapping }}:
      - pkg: postfix-init-pkg-installed-postfix
      - file: postfix-config-file-managed-main.cf
  {%- if need_postmap %}
-postfix-config-cmd-wait-{{ mapping }}:
-  cmd.wait:
+postfix-config-cmd-run-{{ mapping }}:
+  cmd.run:
    - name: {{ postfix.xbin_prefix }}/sbin/postmap {{ file_path }}
    - cwd: /
-    - watch:
+    - onchanges:
      - file: postfix-config-file-managed-{{ mapping }}
    - watch_in:
      - service: postfix-init-service-running-postfix
--- a/postfix/defaults.yaml
+++ b/postfix/defaults.yaml
@ -13,3 +13,4 @@ postfix:
  service: postfix
  xbin_prefix: /usr
  dovecot_deliver: /usr/lib/dovecot/deliver
+  default_database_type: hash
--- a/postfix/files/main.cf
+++ b/postfix/files/main.cf
@ -118,8 +118,6 @@ policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }}
 {{ set_parameter('smtpd_recipient_restrictions', recipient_restrictions) }}

 {# From init.sls #}
-{%- set default_database_type = salt['pillar.get']('postfix:config:default_database_type', 'hash') %}
-
 {%- for mapping, data in salt['pillar.get']('postfix:mapping', {}).items() %}
  {%- set file_path = salt['pillar.get']('postfix:config:' ~ mapping) %}
  {%- if file_path.startswith('proxy:') %}
@ -128,7 +126,7 @@ policy-spf_time_limit = {{ policyd_spf.get('time_limit', '3600s') }}
  {%- elif ':' in file_path %}
    {%- set file_type, file_path = file_path.split(':') %}
  {%- else %}
-    {%- set file_type = default_database_type %}
+    {%- set file_type = postfix.default_database_type %}
  {%- endif %}
  {%- if not file_path.startswith('/') %}
    {%- set file_path = postfix.config_path ~ '/' ~ file_path %}
--- a/postfix/init.sls
+++ b/postfix/init.sls
@ -44,9 +44,6 @@ postfix-init-service-running-postfix-restart:
      - pkg: postfix-init-pkg-installed-postfix
 {%- endif %}

-{# Used for newaliases, postalias and postconf #}
-{%- set default_database_type = salt['pillar.get']('postfix:config:default_database_type', 'hash') %}
-
 # manage /etc/aliases if data found in pillar
 {% if 'aliases' in pillar.get('postfix', '') %}
 {% if salt['pillar.get']('postfix:aliases:use_file', true) == true %}
@ -55,7 +52,7 @@ postfix-init-service-running-postfix-restart:
  {%- if ':' in file_path %}
    {%- set file_type, file_path = postfix.aliases_file.split(':') %}
  {%- else %}
-    {%- set file_type = default_database_type %}
+    {%- set file_type = postfix.default_database_type %}
  {%- endif %}
  {%- if file_type in ("btree", "cdb", "dbm", "hash", "sdbm") %}
    {%- set need_newaliases = True %}
@ -79,11 +76,11 @@ postfix-init-file-managed-alias-database:
      - pkg: postfix-init-pkg-installed-postfix

  {%- if need_newaliases %}
-postfix-init-cmd-wait-new-aliases:
-  cmd.wait:
+postfix-init-cmd-run-new-aliases:
+  cmd.run:
    - name: newaliases
    - cwd: /
-    - watch:
+    - onchanges:
      - file: {{ file_path }}
  {%- endif %}
 {% else %}
--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@ -7,16 +7,16 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA


 ###############################################################################
-# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
+# (B) Use `m2r2` to convert automatically produced `.md` docs to `.rst`
 ###############################################################################

-# Install `m2r`
-pip3 install m2r
+# Install `m2r2`
+pip3 install m2r2

 # Copy and then convert the `.md` docs
 cp ./*.md docs/
 cd docs/ || exit
-m2r --overwrite ./*.md
+m2r2 --overwrite ./*.md

 # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
 sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@ -6,6 +6,9 @@ title: postfix formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
 summary: Verify that the postfix formula is setup and configured correctly
+depends:
+  - name: share
+    path: test/integration/share
 supports:
  - platform-name: debian
  - platform-name: ubuntu
@ -14,8 +17,12 @@ supports:
  - platform-name: opensuse
  - platform-name: suse
  - platform-name: freebsd
+  - platform-name: openbsd
  - platform-name: amazon
  - platform-name: oracle
  - platform-name: arch
  - platform-name: gentoo
+  - platform-name: almalinux
+  - platform-name: rocky
+  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/share/README.md
+++ b/test/integration/share/README.md
@ -0,0 +1,22 @@
+# InSpec Profile: `share`
+
+This shows the implementation of the `share` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+
+Its goal is to share the libraries between all profiles.
+
+## Libraries
+
+### `system`
+
+The `system` library provides easy access to system dependent information:
+
+- `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective
+  - `system.platform[:family]` provide a family name for Arch and Gentoo
+  - `system.platform[:name]` append `linux` to both `amazon` and `oracle`; ensure Windows platforms are resolved as simply `windows`
+  - `system.platform[:release]` tweak Arch, Amazon Linux, Gentoo, openSUSE and Windows:
+    - `Arch` is always `base-latest`
+    - `Amazon Linux` release `2018` is resolved as `1`
+    - `Gentoo` release is trimmed to its major version number and then the init system is appended (i.e. `sysv` or `sysd`)
+    - `openSUSE` is resolved as `tumbleweed` if the `platform[:release]` is in date format
+    - `Windows` uses the widely-used release number (e.g. `8.1` or `2019-server`) in place of the actual system release version
+  - `system.platform[:finger]` is the concatenation of the name and the major release number (except for Ubuntu, which gives `ubuntu-20.04` for example)
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+name: share
+title: InSpec shared resources
+maintainer: SaltStack Formulas
+license: Apache-2.0
+summary: shared resources
+supports:
+  - platform-name: debian
+  - platform-name: ubuntu
+  - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: openbsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
+  - platform-name: almalinux
+  - platform-name: rocky
+  - platform-name: mac_os_x
+  - platform: windows
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+# system.rb -- InSpec resources for system values
+# Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
+# Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
+
+# rubocop:disable Metrics/ClassLength
+class SystemResource < Inspec.resource(1)
+  name 'system'
+
+  attr_reader :platform
+
+  def initialize
+    super
+    @platform = build_platform
+  end
+
+  private
+
+  def build_platform
+    {
+      family: build_platform_family,
+      name: build_platform_name,
+      release: build_platform_release,
+      finger: build_platform_finger,
+      codename: build_platform_codename
+    }
+  end
+
+  def build_platform_family
+    case inspec.platform[:name]
+    when 'arch', 'gentoo'
+      inspec.platform[:name]
+    else
+      inspec.platform[:family]
+    end
+  end
+
+  def build_platform_name
+    case inspec.platform[:name]
+    when 'amazon', 'oracle', 'rocky'
+      "#{inspec.platform[:name]}linux"
+    when /^windows_/
+      inspec.platform[:family]
+    else
+      inspec.platform[:name]
+    end
+  end
+
+  # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
+  def build_platform_release
+    case inspec.platform[:name]
+    when 'amazon'
+      # `2018` relase is named `1` in `kitchen.yml`
+      inspec.platform[:release].gsub(/2018.*/, '1')
+    when 'arch'
+      'base-latest'
+    when 'gentoo'
+      "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
+    when 'mac_os_x'
+      inspec.command('sw_vers -productVersion').stdout.to_s
+    when 'opensuse'
+      # rubocop:disable Style/NumericLiterals,Layout/LineLength
+      inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
+      # rubocop:enable Style/NumericLiterals,Layout/LineLength
+    when 'windows_8.1_pro'
+      '8.1'
+    when 'windows_server_2022_datacenter'
+      '2022-server'
+    when 'windows_server_2019_datacenter'
+      '2019-server'
+    when 'windows_server_2016_datacenter'
+      '2016-server'
+    else
+      inspec.platform[:release]
+    end
+  end
+  # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
+
+  def derive_gentoo_init_system
+    inspec.command('systemctl').exist? ? 'sysd' : 'sysv'
+  end
+
+  def build_platform_finger
+    "#{build_platform_name}-#{build_finger_release}"
+  end
+
+  def build_finger_release
+    case inspec.platform[:name]
+    when 'ubuntu'
+      build_platform_release.split('.').slice(0, 2).join('.')
+    else
+      build_platform_release.split('.')[0]
+    end
+  end
+
+  # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
+  def build_platform_codename
+    case build_platform_finger
+    when 'ubuntu-22.04'
+      'jammy'
+    when 'ubuntu-20.04'
+      'focal'
+    when 'ubuntu-18.04'
+      'bionic'
+    when 'debian-11'
+      'bullseye'
+    when 'debian-10'
+      'buster'
+    when 'debian-9'
+      'stretch'
+    when 'almalinux-8'
+      "AlmaLinux #{build_platform_release} (Arctic Sphynx)"
+    when 'amazonlinux-2'
+      'Amazon Linux 2'
+    when 'arch-base-latest'
+      'Arch Linux'
+    when 'centos-7'
+      'CentOS Linux 7 (Core)'
+    when 'centos-8'
+      'CentOS Stream 8'
+    when 'opensuse-tumbleweed'
+      'openSUSE Tumbleweed'
+    when 'opensuse-15'
+      "openSUSE Leap #{build_platform_release}"
+    when 'oraclelinux-8', 'oraclelinux-7'
+      "Oracle Linux Server #{build_platform_release}"
+    when 'gentoo-2-sysd', 'gentoo-2-sysv'
+      'Gentoo/Linux'
+    when 'rockylinux-8'
+      "Rocky Linux #{build_platform_release} (Green Obsidian)"
+    else
+      ''
+    end
+  end
+  # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity
+end
+# rubocop:enable Metrics/ClassLength
Author	SHA1	Message	Date
Imran Iqbal	20f210a273	chore(gemfile.lock): update to latest gem versions (2022-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/454	2022-07-17 19:47:08 +01:00
Imran Iqbal	59529847e0	chore(gemfile.lock): update to latest gem versions (2022-W26) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/453	2022-06-30 23:08:24 +01:00
Imran Iqbal	73b855be9f	chore(gemfile.lock): update to latest gem versions (2022-W24) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/452	2022-06-15 23:05:30 +01:00
Imran Iqbal	02e4fb91be	ci: update `pre-commit` configuration inc. for pre-commit.ci [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/450	2022-06-09 00:04:29 +01:00
Imran Iqbal	bc654fa992	chore(gemfile.lock): update to latest gem versions (2022-W23) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/449	2022-06-07 23:30:19 +01:00
Imran Iqbal	57c938a029	chore(gemfile.lock): update to latest gem versions (2022-W22) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/447	2022-05-30 17:28:12 +01:00
Imran Iqbal	584f74ba04	chore(gemfile.lock): update to latest gem versions (2022-W20) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/444	2022-05-17 13:21:06 +01:00
Imran Iqbal	842a10935d	test(system.rb): add support for `mac_os_x` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/442	2022-05-17 08:50:59 +01:00
Imran Iqbal	f605736c90	chore(gemfile.lock): update to latest gem versions (2022-W19) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/439	2022-05-10 07:33:09 +01:00
Imran Iqbal	34bdb08e5c	chore(gemfile.lock): update to latest gem versions (2022-W18) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/437	2022-05-06 23:17:37 +01:00
Imran Iqbal	e56f0217f4	chore(gemfile.lock): update to latest gem versions (2022-W17) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/433	2022-04-25 09:10:58 +01:00
Imran Iqbal	e7e94731fb	chore(gemfile.lock): update to latest gem versions (2022-W16) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/431	2022-04-18 23:37:10 +01:00
Imran Iqbal	6eca6a2b4f	chore(gemfile.lock): update to latest gem versions (2022-W15) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/428	2022-04-11 19:22:20 +01:00
Imran Iqbal	c0966e961f	chore(gemfile.lock): update to latest gem versions (2022-W14) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/427	2022-04-04 09:23:25 +01:00
Imran Iqbal	b4b0893b11	ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/426	2022-04-03 15:07:49 +01:00
Imran Iqbal	22c49f5bd0	chore(gemfile.lock): update to latest gem versions (2022-W13) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/425	2022-04-01 15:36:04 +01:00
Imran Iqbal	31f2983b26	chore(gemfile.lock): update to latest gem versions (2022-W12) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/424	2022-03-22 12:01:50 +00:00
Imran Iqbal	cc7e48b82d	chore(gemfile.lock): update to latest gem versions (2022-W11) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/423	2022-03-17 23:40:42 +00:00
Imran Iqbal	19d29f2b2b	chore(gemfile.lock): update to latest gem versions (2022-W10) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/422	2022-03-12 10:05:54 +00:00
Imran Iqbal	8a67e5d60d	chore(gemfile.lock): update to latest gem versions (2022-W09) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/421	2022-03-04 15:33:00 +00:00
Imran Iqbal	147e61cee6	chore(gemfile.lock): update to latest gem versions (2022-W08) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/419	2022-02-21 19:10:39 +00:00
Imran Iqbal	16e4950d18	chore(gemfile.lock): update to latest gem versions (2022-W07) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/416	2022-02-15 09:02:32 +00:00
Imran Iqbal	0d68789640	test(system): add `build_platform_codename` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/415	2022-02-14 08:08:03 +00:00
semantic-release-bot	127acdaf53	chore(release): 2.0.2 [skip ci] ## [2.0.2](https://github.com/saltstack-formulas/postfix-formula/compare/v2.0.1...v2.0.2) (2022-02-13) ### Code Refactoring * salt-lint: fix violations ([6a33d98](`6a33d98d75`)) ### Continuous Integration * update linters to latest versions [skip ci] ([62eb687](`62eb687b05`)) * gemfile: allow rubygems proxy to be provided as an env var [skip ci] ([5d167a4](`5d167a403c`)) * kitchen+gitlab: update for new pre-salted images [skip ci] ([008ac83](`008ac83c7a`))	2022-02-13 00:05:17 +00:00
Imran Iqbal	6a33d98d75	refactor(salt-lint): fix violations ``` [213] SaltStack recommends using cmd.run together with onchanges, rather than cmd.wait postfix/config.sls:148 cmd.wait: [213] SaltStack recommends using cmd.run together with onchanges, rather than cmd.wait postfix/init.sls:80 cmd.wait: ```	2022-02-12 23:44:35 +00:00
Imran Iqbal	62eb687b05	ci: update linters to latest versions [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/414	2022-02-12 23:23:31 +00:00
Imran Iqbal	eb01173981	chore(gemfile.lock): update to latest gem versions (2022-W06) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/412	2022-02-07 17:30:10 +00:00
Imran Iqbal	008ac83c7a	ci(kitchen+gitlab): update for new pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/410	2022-02-02 23:05:08 +00:00
Imran Iqbal	57011dcce2	chore(gemfile.lock): update to latest gem versions (2022-W05) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/409	2022-02-01 23:41:28 +00:00
noelmcloughlin	5d167a403c	ci(gemfile): allow rubygems proxy to be provided as an env var [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/408	2022-01-26 08:42:55 +00:00
Imran Iqbal	61a9136253	chore(gemfile.lock): update to latest gem versions (2022-W04) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/407	2022-01-25 14:13:46 +00:00
semantic-release-bot	6b9607634c	chore(release): 2.0.1 [skip ci] ## [2.0.1](https://github.com/saltstack-formulas/postfix-formula/compare/v2.0.0...v2.0.1) (2022-01-25) ### Bug Fixes * config: set default_database_type; fixes [#118](https://github.com/saltstack-formulas/postfix-formula/issues/118) ([3bd3d1c](`3bd3d1c74e`)) ### Code Refactoring * config: add `default_database_type` as default value ([6da70d2](`6da70d21bb`)) ### Continuous Integration * 3003.1: update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([3284d38](`3284d38a36`)) * gemfile+lock: use `ssf` customised `inspec` repo [skip ci] ([cfed974](`cfed974000`)) * kitchen: move `provisioner` block & update `run_command` [skip ci] ([31a3836](`31a3836cd6`)) * kitchen+ci: update with `3004` pre-salted images/boxes [skip ci] ([dec042a](`dec042aa43`)) * kitchen+ci: update with latest `3003.2` pre-salted images [skip ci] ([9688f36](`9688f36aa1`)) * kitchen+ci: update with latest CVE pre-salted images [skip ci] ([76134b4](`76134b47c7`)) * add `arch-master` to matrix and update `.travis.yml` [skip ci] ([c631eca](`c631eca02e`)) * add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([c11c07d](`c11c07d6a6`)) * kitchen+gitlab: adjust matrix to add `3003` [skip ci] ([04564a7](`04564a7ad6`)) * kitchen+gitlab: remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([d56006f](`d56006f8d2`)) ### Tests * standardise use of `share` suite & `_mapdata` state [skip ci] ([4c394a7](`4c394a76fa`))	2022-01-25 12:19:23 +00:00
Javier Bértoli	fc98143c96	Merge pull request #123 from netmanagers/alxwr-master-updates fix(config): set default_database_type; fixes #118 (supersedes #121)	2022-01-25 07:15:12 -03:00
Javier Bértoli	6da70d21bb	refactor(config): add `default_database_type` as default value	2022-01-24 18:08:10 -03:00
Alexander Weidinger	3bd3d1c74e	fix(config): set default_database_type; fixes #118	2022-01-24 18:07:03 -03:00
Imran Iqbal	3b71be736e	chore(gemfile.lock): update to latest gem versions (2022-W03) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/405	2022-01-17 19:49:42 +00:00
Imran Iqbal	c903221ecd	chore(semantic-release): replace broken `m2r` with `m2r2` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/404	2022-01-17 08:15:32 +00:00
Imran Iqbal	e3964b1993	chore(gemfile.lock): update to latest gem versions (2022-W02) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/398	2022-01-11 09:38:04 +00:00
Imran Iqbal	7a2af78544	chore(gemfile.lock): update to latest gem versions (2022-W01) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/397	2022-01-06 08:07:33 +00:00
Imran Iqbal	75f1a4810c	chore(gemfile.lock): update to latest gem versions (2021-W52) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/396	2021-12-28 21:06:00 +00:00
Imran Iqbal	eb4e6a1c8b	chore(gemfile.lock): update to latest gem versions (2021-W51) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/394	2021-12-22 11:57:43 +00:00
Imran Iqbal	1c39ee722a	chore(gemfile.lock): update to latest gem versions (2021-W50) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/391	2021-12-14 15:22:14 +00:00
Imran Iqbal	e41b6639e1	chore(gemfile.lock): update to latest gem versions (2021-W49) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/388	2021-12-06 08:22:00 +00:00
Imran Iqbal	da21bffa44	chore(gemfile.lock): update to latest gem versions (2021-W47) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/386	2021-11-23 11:43:35 +00:00
Imran Iqbal	dec042aa43	ci(kitchen+ci): update with `3004` pre-salted images/boxes [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/385	2021-11-23 10:36:22 +00:00
Imran Iqbal	f3850814d0	chore(gemfile.lock): update to latest gem versions (2021-W43) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/381	2021-10-26 11:15:23 +01:00
Imran Iqbal	ad2a0c24da	chore(gemfile.lock): update to latest gem versions (2021-W42) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/380	2021-10-23 21:10:57 +01:00
Imran Iqbal	4430fc0564	chore(gemfile.lock): update to latest gem versions (2021-W41) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/378	2021-10-15 19:10:45 +01:00
Imran Iqbal	c8da52f4d8	chore(gemfile.lock): update to latest gem versions (2021-W40) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/375	2021-10-06 17:04:52 +01:00
Imran Iqbal	76134b47c7	ci(kitchen+ci): update with latest CVE pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/374	2021-10-05 11:16:09 +01:00
Imran Iqbal	439e300aa7	chore(gemfile.lock): update to latest gem versions (2021-W39) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/370	2021-09-30 07:18:26 +01:00
Imran Iqbal	45016a1e2b	chore(gemfile.lock): update to latest gem versions (2021-W38) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/369	2021-09-21 11:59:03 +01:00
Imran Iqbal	51ecd8606b	chore(gemfile.lock): update to latest gem versions (2021-W37) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/368	2021-09-14 09:57:41 +01:00
Imran Iqbal	c2a8f19456	chore(gemfile.lock): update to latest gem versions (2021-W36) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/367	2021-09-08 23:34:29 +01:00
Imran Iqbal	782581b317	chore(gemfile.lock): update to latest gem versions (2021-W35) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/364	2021-08-30 18:10:37 +01:00
Imran Iqbal	f1b6e8c5fc	chore(gemfile.lock): update to latest gem versions (2021-W34) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/362	2021-08-23 09:24:50 +01:00
Imran Iqbal	9688f36aa1	ci(kitchen+ci): update with latest `3003.2` pre-salted images [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/360	2021-08-19 10:13:57 +01:00
Imran Iqbal	6f3207eb1d	chore(gemfile.lock): update to latest gem versions (2021-W33) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/359	2021-08-16 18:24:42 +01:00
Imran Iqbal	e629d88e93	chore(gemfile.lock): update to latest gem versions (2021-W32) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/358	2021-08-09 12:15:08 +01:00
Imran Iqbal	cfed974000	ci(gemfile+lock): use `ssf` customised `inspec` repo [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/357	2021-08-04 21:55:46 +01:00
Imran Iqbal	05c8c1b2de	chore(gemfile.lock): update to latest gem versions (2021-W31) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/356	2021-08-04 21:38:33 +01:00
Imran Iqbal	f8048f9b50	chore(gemfile.lock): update to latest gem versions (2021-W30) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/353	2021-07-26 14:29:45 +01:00
Imran Iqbal	94509cdb1a	chore(gemfile.lock): update to latest gem versions (2021-W29) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/349	2021-07-21 18:32:36 +01:00
Imran Iqbal	c11c07d6a6	ci: add Debian 11 Bullseye & update `yamllint` configuration [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/345	2021-07-18 19:04:00 +01:00
Imran Iqbal	31a3836cd6	ci(kitchen): move `provisioner` block & update `run_command` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/344	2021-07-17 21:11:38 +01:00
Imran Iqbal	4ebc15609f	chore(gemfile+lock): update to latest gem versions (2021-W28) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/343	2021-07-17 20:28:56 +01:00
Imran Iqbal	fe552b009d	chore(deps): bump `addressable` from `2.7.0` to `2.8.0` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/340	2021-07-14 12:15:25 +01:00
Imran Iqbal	3284d38a36	ci(3003.1): update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/335	2021-07-02 00:06:24 +01:00
Imran Iqbal	d56006f8d2	ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/331	2021-06-21 20:47:24 +01:00
Imran Iqbal	37042c2b31	chore(pre-commit): use `info` report level for `rstcheck` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/325	2021-05-20 14:09:42 +01:00
Imran Iqbal	c631eca02e	ci: add `arch-master` to matrix and update `.travis.yml` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/323	2021-05-09 22:32:52 +01:00
Imran Iqbal	04564a7ad6	ci(kitchen+gitlab): adjust matrix to add `3003` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/318	2021-04-23 08:48:38 +01:00
Imran Iqbal	c876d0f400	chore: update `CODEOWNERS` & `.yamllint` re: `kitchen-vagrant` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/310	2021-04-05 18:20:57 +01:00
Imran Iqbal	4c394a76fa	test: standardise use of `share` suite & `_mapdata` state [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/302	2021-03-23 21:31:53 +00:00