From 89a82853e6650f5f2510d6013624856306594867 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 11 Apr 2022 19:18:14 +0100
Subject: [PATCH 01/15] chore(gemfile.lock): update to latest gem versions
 (2022-W15) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/428
---
 .gitlab-ci.yml |  2 ++
 .travis.yml    |  2 ++
 Gemfile.lock   | 34 +++++++++++++++++-----------------
 kitchen.yml    |  6 ++++++
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 841c9f4..c1e402b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,6 +150,7 @@ default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 default-ubuntu-1804-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-36-master-py3: {extends: '.test_instance_failure_permitted'}
 default-fedora-35-master-py3: {extends: '.test_instance'}
 default-fedora-34-master-py3: {extends: '.test_instance'}
 default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
@@ -169,6 +170,7 @@ default-rockylinux-8-master-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-fedora-34-3004-1-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
diff --git a/.travis.yml b/.travis.yml
index 42abb00..fe757ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -102,6 +102,7 @@ jobs:
     - env: INSTANCE=default-ubuntu-1804-master-py3
     - env: INSTANCE=default-centos-stream8-master-py3
     - env: INSTANCE=default-centos-7-master-py3
+    - env: INSTANCE=default-fedora-36-master-py3
     - env: INSTANCE=default-fedora-35-master-py3
     - env: INSTANCE=default-fedora-34-master-py3
     - env: INSTANCE=default-opensuse-leap-153-master-py3
@@ -121,6 +122,7 @@ jobs:
     # - 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-fedora-34-3004-1-py3
     # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
diff --git a/Gemfile.lock b/Gemfile.lock
index ddb1742..5b3b684 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 31b5b09a827ed9fcbc0b2d550ae4056013dcc92e
+  revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b
   branch: ssf
   specs:
-    inspec (5.10.11)
+    inspec (5.12.2)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.10.11)
+      inspec-core (= 5.12.2)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.10.11)
+    inspec-core (5.12.2)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8
+  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
   branch: ssf
   specs:
     kitchen-docker (2.12.0)
@@ -58,14 +58,14 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.573.0)
+    aws-partitions (1.574.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-amplify (1.32.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.75.0)
+    aws-sdk-apigateway (1.76.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-apigatewayv2 (1.42.0)
@@ -125,7 +125,7 @@ GEM
     aws-sdk-cognitoidentityprovider (1.53.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.76.0)
+    aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-core (3.130.0)
@@ -202,7 +202,7 @@ GEM
     aws-sdk-kms (1.55.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.82.0)
+    aws-sdk-lambda (1.83.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-mq (1.40.0)
@@ -245,7 +245,7 @@ GEM
     aws-sdk-secretsmanager (1.46.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.62.0)
+    aws-sdk-securityhub (1.63.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-servicecatalog (1.60.0)
@@ -263,7 +263,7 @@ GEM
     aws-sdk-simpledb (1.29.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv2 (~> 1.0)
-    aws-sdk-sms (1.39.0)
+    aws-sdk-sms (1.40.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-sns (1.53.0)
@@ -408,7 +408,7 @@ GEM
       mixlib-versioning
       thor
     mixlib-log (3.0.9)
-    mixlib-shellout (3.2.6)
+    mixlib-shellout (3.2.7)
       chef-utils
     mixlib-versioning (1.2.12)
     mongo (2.13.2)
@@ -447,7 +447,7 @@ GEM
     public_suffix (4.0.6)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.3.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -479,7 +479,7 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.17.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -515,7 +515,7 @@ GEM
     timeliness (0.3.10)
     tomlrb (1.3.0)
     trailblazer-option (0.1.2)
-    train (3.8.9)
+    train (3.9.2)
       activesupport (>= 6.0.3.1)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
@@ -526,7 +526,7 @@ GEM
       google-api-client (>= 0.23.9, <= 0.52.0)
       googleauth (>= 0.6.6, <= 0.14.0)
       inifile (~> 3.0)
-      train-core (= 3.8.9)
+      train-core (= 3.9.2)
       train-winrm (~> 0.2)
     train-aws (0.2.24)
       aws-sdk-alexaforbusiness (~> 1.0)
@@ -604,7 +604,7 @@ GEM
       aws-sdk-synthetics (~> 1.19.0)
       aws-sdk-transfer (>= 1.26, < 1.35)
       aws-sdk-waf (~> 1.43.0)
-    train-core (3.8.9)
+    train-core (3.9.2)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
diff --git a/kitchen.yml b/kitchen.yml
index d7de175..e3bd7e7 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -89,6 +89,9 @@ platforms:
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
+  - name: fedora-36-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-36
   - name: fedora-35-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-35
@@ -162,6 +165,9 @@ platforms:
   - name: centos-7-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:centos-7
+  - name: fedora-36-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:fedora-36
   - name: fedora-35-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:fedora-35

From ac4bb45db952252960d2f127996d2ffb93b001fa Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 18 Apr 2022 23:34:02 +0100
Subject: [PATCH 02/15] chore(gemfile.lock): update to latest gem versions
 (2022-W16) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/431
---
 Gemfile.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5b3b684..2dcf0f9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.574.0)
+    aws-partitions (1.577.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -74,7 +74,7 @@ GEM
     aws-sdk-applicationautoscaling (1.51.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.52.0)
+    aws-sdk-athena (1.53.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-autoscaling (1.63.0)
@@ -101,7 +101,7 @@ GEM
     aws-sdk-cloudtrail (1.48.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.62.0)
+    aws-sdk-cloudwatch (1.64.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudwatchevents (1.46.0)
@@ -128,7 +128,7 @@ GEM
     aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.130.0)
+    aws-sdk-core (3.130.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.305.0)
+    aws-sdk-ec2 (1.307.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -154,7 +154,7 @@ GEM
     aws-sdk-ecs (1.99.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.53.0)
+    aws-sdk-efs (1.54.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-eks (1.74.0)
@@ -220,7 +220,7 @@ GEM
     aws-sdk-ram (1.26.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.142.0)
+    aws-sdk-rds (1.143.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-redshift (1.80.0)
@@ -433,7 +433,7 @@ GEM
     options (2.3.2)
     os (1.1.4)
     parallel (1.22.1)
-    parser (3.1.1.0)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)
@@ -444,7 +444,7 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.3.0)

From 11b0299196532f19232c63f3fcf4d85b6ef798af Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 25 Apr 2022 09:07:47 +0100
Subject: [PATCH 03/15] chore(gemfile.lock): update to latest gem versions
 (2022-W17) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/433
---
 Gemfile.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2dcf0f9..6ac2669 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b
+  revision: 90eafd68e8ca3d7444c4a83c5c2e38e32285410c
   branch: ssf
   specs:
-    inspec (5.12.2)
+    inspec (5.14.0)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.12.2)
+      inspec-core (= 5.14.0)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.12.2)
+    inspec-core (5.14.0)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -58,7 +58,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.577.0)
+    aws-partitions (1.579.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -128,7 +128,7 @@ GEM
     aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.130.1)
+    aws-sdk-core (3.130.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.307.0)
+    aws-sdk-ec2 (1.308.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -160,7 +160,7 @@ GEM
     aws-sdk-eks (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.76.0)
+    aws-sdk-elasticache (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticbeanstalk (1.51.0)
@@ -199,7 +199,7 @@ GEM
     aws-sdk-kinesis (1.41.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.55.0)
+    aws-sdk-kms (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-lambda (1.83.0)
@@ -220,10 +220,10 @@ GEM
     aws-sdk-ram (1.26.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.143.0)
+    aws-sdk-rds (1.144.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.80.0)
+    aws-sdk-redshift (1.81.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53 (1.62.0)
@@ -272,7 +272,7 @@ GEM
     aws-sdk-sqs (1.51.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.134.0)
+    aws-sdk-ssm (1.135.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-states (1.39.0)
@@ -288,7 +288,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
     aws-sigv2 (1.1.0)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
     azure_graph_rbac (0.17.2)
       ms_rest_azure (~> 0.12.0)
@@ -301,7 +301,7 @@ GEM
     azure_mgmt_storage (0.23.0)
       ms_rest_azure (~> 0.12.0)
     bcrypt_pbkdf (1.1.0)
-    bson (4.14.1)
+    bson (4.15.0)
     builder (3.2.4)
     chef-config (17.10.0)
       addressable
@@ -447,7 +447,7 @@ GEM
     public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.3.0)
+    regexp_parser (2.3.1)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)

From 29e37b80110eca3bb8e7375470d9806d8985afbf Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 6 May 2022 23:13:40 +0100
Subject: [PATCH 04/15] chore(gemfile.lock): update to latest gem versions
 (2022-W18) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/437
---
 .gitlab-ci.yml |  3 +++
 .travis.yml    |  3 +++
 Gemfile.lock   | 34 +++++++++++++++++-----------------
 kitchen.yml    | 12 ++++++++++++
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1e402b..12451fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,6 +134,7 @@ rubocop:
 # 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-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
@@ -146,6 +147,7 @@ rubocop:
 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-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
@@ -166,6 +168,7 @@ 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'}
diff --git a/.travis.yml b/.travis.yml
index fe757ae..9cefb80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,6 +86,7 @@ jobs:
     # - 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-centos-stream8-tiamat-py3
@@ -98,6 +99,7 @@ jobs:
     - 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-centos-stream8-master-py3
@@ -118,6 +120,7 @@ jobs:
     # - 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
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ac2669..6885a49 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 90eafd68e8ca3d7444c4a83c5c2e38e32285410c
+  revision: bb1df209366a8054faff1d85bd2566b5f97b339e
   branch: ssf
   specs:
-    inspec (5.14.0)
+    inspec (5.14.5)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.14.0)
+      inspec-core (= 5.14.5)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.14.0)
+    inspec-core (5.14.5)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -49,7 +49,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.2.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -58,7 +58,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.579.0)
+    aws-partitions (1.584.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -89,7 +89,7 @@ GEM
     aws-sdk-cloudformation (1.68.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.63.0)
+    aws-sdk-cloudfront (1.64.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudhsm (1.39.0)
@@ -98,7 +98,7 @@ GEM
     aws-sdk-cloudhsmv2 (1.42.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.48.0)
+    aws-sdk-cloudtrail (1.49.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudwatch (1.64.0)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.308.0)
+    aws-sdk-ec2 (1.310.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -187,7 +187,7 @@ GEM
     aws-sdk-glue (1.88.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.56.0)
+    aws-sdk-guardduty (1.57.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.68.0)
@@ -208,7 +208,7 @@ GEM
     aws-sdk-mq (1.40.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-networkfirewall (1.15.0)
+    aws-sdk-networkfirewall (1.17.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-networkmanager (1.22.0)
@@ -220,7 +220,7 @@ GEM
     aws-sdk-ram (1.26.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.144.0)
+    aws-sdk-rds (1.145.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-redshift (1.81.0)
@@ -235,7 +235,7 @@ GEM
     aws-sdk-route53resolver (1.37.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
+    aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -245,7 +245,7 @@ GEM
     aws-sdk-secretsmanager (1.46.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.63.0)
+    aws-sdk-securityhub (1.64.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-servicecatalog (1.60.0)
@@ -269,10 +269,10 @@ GEM
     aws-sdk-sns (1.53.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.51.0)
+    aws-sdk-sqs (1.51.1)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.135.0)
+    aws-sdk-ssm (1.137.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-states (1.39.0)
@@ -328,7 +328,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.3.0)
     erubi (1.10.0)
-    excon (0.92.2)
+    excon (0.92.3)
     faraday (1.4.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
diff --git a/kitchen.yml b/kitchen.yml
index e3bd7e7..66c2fdf 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -32,6 +32,10 @@ platforms:
     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
@@ -75,6 +79,10 @@ platforms:
     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
@@ -151,6 +159,10 @@ platforms:
     driver:
       image: saltimages/salt-3004.1-py3:debian-9
       run_command: /lib/systemd/systemd
+  - name: ubuntu-2204-3004-1-py3
+    driver:
+      image: saltimages/salt-3004.1-py3:ubuntu-22.04
+      run_command: /lib/systemd/systemd
   - name: ubuntu-2004-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:ubuntu-20.04

From 45437edf098fbdcc11e4042ded2b3bd90bc8fbf4 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 10 May 2022 07:30:05 +0100
Subject: [PATCH 05/15] chore(gemfile.lock): update to latest gem versions
 (2022-W19) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/439
---
 Gemfile.lock | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6885a49..e0c9b6b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: bb1df209366a8054faff1d85bd2566b5f97b339e
+  revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255
   branch: ssf
   specs:
-    inspec (5.14.5)
+    inspec (5.15.0)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.14.5)
+      inspec-core (= 5.15.0)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.14.5)
+    inspec-core (5.15.0)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -49,7 +49,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.4)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -58,7 +58,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.584.0)
+    aws-partitions (1.587.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.310.0)
+    aws-sdk-ec2 (1.312.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -220,10 +220,10 @@ GEM
     aws-sdk-ram (1.26.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.145.0)
+    aws-sdk-rds (1.146.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.81.0)
+    aws-sdk-redshift (1.82.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53 (1.62.0)
@@ -245,7 +245,7 @@ GEM
     aws-sdk-secretsmanager (1.46.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.64.0)
+    aws-sdk-securityhub (1.65.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-servicecatalog (1.60.0)
@@ -447,7 +447,7 @@ GEM
     public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.3.1)
+    regexp_parser (2.4.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)

From 62a12031358233e399a378adbd20c85832bd8a8a Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 17 May 2022 08:48:00 +0100
Subject: [PATCH 06/15] test(system.rb): add support for `mac_os_x` [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/442
---
 test/integration/share/inspec.yml          | 1 +
 test/integration/share/libraries/system.rb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml
index ee20080..28a97b9 100644
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@@ -21,4 +21,5 @@ supports:
   - platform-name: gentoo
   - platform-name: almalinux
   - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows
diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb
index 64fe7ea..0db9d0b 100644
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@@ -57,6 +57,8 @@ def build_platform_release
       '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]

From e564cbd447aa3d1df14fdc364ce9b00cc97f80b4 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 17 May 2022 13:17:51 +0100
Subject: [PATCH 07/15] chore(gemfile.lock): update to latest gem versions
 (2022-W20) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/444
---
 Gemfile.lock                        | 24 ++++++++++++------------
 test/integration/default/inspec.yml |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e0c9b6b..44ef385 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: ece601f5dd4bacf5d0dca49cd5c13896a7120255
+  revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057
   branch: ssf
   specs:
-    inspec (5.15.0)
+    inspec (5.16.2)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.15.0)
+      inspec-core (= 5.16.2)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.15.0)
+    inspec-core (5.16.2)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -89,7 +89,7 @@ GEM
     aws-sdk-cloudformation (1.68.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.64.0)
+    aws-sdk-cloudfront (1.65.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudhsm (1.39.0)
@@ -128,7 +128,7 @@ GEM
     aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.130.2)
+    aws-sdk-core (3.131.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.312.0)
+    aws-sdk-ec2 (1.315.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -157,7 +157,7 @@ GEM
     aws-sdk-efs (1.54.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.74.0)
+    aws-sdk-eks (1.75.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticache (1.77.0)
@@ -202,7 +202,7 @@ GEM
     aws-sdk-kms (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.83.0)
+    aws-sdk-lambda (1.84.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-mq (1.40.0)
@@ -379,7 +379,7 @@ GEM
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     jmespath (1.6.1)
-    json (2.6.1)
+    json (2.6.2)
     jwt (2.3.0)
     kitchen-inspec (2.5.2)
       hashie (>= 3.4, <= 5.0)
@@ -448,7 +448,7 @@ GEM
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.4.0)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -479,7 +479,7 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.18.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml
index 85f4ecd..02d4554 100644
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -24,4 +24,5 @@ supports:
   - platform-name: gentoo
   - platform-name: almalinux
   - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

From 69777b0678b7e7c4e4f93fbb8494e85f643c3fad Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 30 May 2022 17:24:53 +0100
Subject: [PATCH 08/15] chore(gemfile.lock): update to latest gem versions
 (2022-W22) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/447
---
 Gemfile      |  2 +-
 Gemfile.lock | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5991260..12d9b1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org'
+source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
 
 # Install the `inspec` gem using `git` because versions after `4.22.22`
 # suppress diff output; this version fixes this for our uses.
diff --git a/Gemfile.lock b/Gemfile.lock
index 44ef385..b2437ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 7efb86a1b5a2b79390bc1e9e364ee219f92a0057
+  revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea
   branch: ssf
   specs:
-    inspec (5.16.2)
+    inspec (5.17.4)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.16.2)
+      inspec-core (= 5.17.4)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.16.2)
+    inspec-core (5.17.4)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -58,14 +58,14 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.587.0)
+    aws-partitions (1.594.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-amplify (1.32.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.76.0)
+    aws-sdk-apigateway (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-apigatewayv2 (1.42.0)
@@ -86,7 +86,7 @@ GEM
     aws-sdk-budgets (1.49.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.68.0)
+    aws-sdk-cloudformation (1.69.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudfront (1.65.0)
@@ -107,7 +107,7 @@ GEM
     aws-sdk-cloudwatchevents (1.46.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.52.0)
+    aws-sdk-cloudwatchlogs (1.53.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-codecommit (1.51.0)
@@ -128,11 +128,11 @@ GEM
     aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.0)
+    aws-sdk-core (3.131.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
+      jmespath (~> 1, >= 1.6.1)
     aws-sdk-costandusagereportservice (1.40.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.315.0)
+    aws-sdk-ec2 (1.317.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -160,7 +160,7 @@ GEM
     aws-sdk-eks (1.75.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.77.0)
+    aws-sdk-elasticache (1.78.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticbeanstalk (1.51.0)
@@ -199,7 +199,7 @@ GEM
     aws-sdk-kinesis (1.41.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.56.0)
+    aws-sdk-kms (1.57.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-lambda (1.84.0)
@@ -211,7 +211,7 @@ GEM
     aws-sdk-networkfirewall (1.17.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-networkmanager (1.22.0)
+    aws-sdk-networkmanager (1.23.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-organizations (1.59.0)
@@ -372,7 +372,7 @@ GEM
       rexml (~> 3.0)
     hashie (4.1.0)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.10.0)
@@ -394,7 +394,7 @@ GEM
       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)
@@ -447,7 +447,7 @@ GEM
     public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.4.0)
+    regexp_parser (2.5.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -485,7 +485,7 @@ GEM
     ruby2_keywords (0.0.5)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
-    semverse (3.0.0)
+    semverse (3.0.2)
     signet (0.16.1)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.0)
@@ -639,7 +639,7 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8.1)
+    unf_ext (0.0.8.2)
     unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
     winrm (2.3.6)

From 44730d71095f3e25ef8c76a0a169f0109515afd2 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 7 Jun 2022 23:27:17 +0100
Subject: [PATCH 09/15] chore(gemfile.lock): update to latest gem versions
 (2022-W23) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/449
---
 Gemfile.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b2437ac..8ed6cd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea
+  revision: 6bedc829b7fcec035311d8c6086db5d59414428c
   branch: ssf
   specs:
-    inspec (5.17.4)
+    inspec (5.17.9)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.17.4)
+      inspec-core (= 5.17.9)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.17.4)
+    inspec-core (5.17.9)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -58,7 +58,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.594.0)
+    aws-partitions (1.596.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -226,7 +226,7 @@ GEM
     aws-sdk-redshift (1.82.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.62.0)
+    aws-sdk-route53 (1.63.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53domains (1.40.0)
@@ -380,8 +380,8 @@ GEM
     inifile (3.0.0)
     jmespath (1.6.1)
     json (2.6.2)
-    jwt (2.3.0)
-    kitchen-inspec (2.5.2)
+    jwt (2.4.0)
+    kitchen-inspec (2.6.0)
       hashie (>= 3.4, <= 5.0)
       inspec (>= 2.2.64, < 6.0)
       test-kitchen (>= 2.7, < 4)
@@ -403,7 +403,7 @@ GEM
     minitest (5.15.0)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-install (3.12.16)
+    mixlib-install (3.12.19)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -423,7 +423,7 @@ 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.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)

From 5a8df69cdc856f23e6149ef64234e539b67bcdf0 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 9 Jun 2022 00:00:28 +0100
Subject: [PATCH 10/15] ci: update `pre-commit` configuration inc. for
 pre-commit.ci [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/450
---
 .gitlab-ci.yml          | 10 ----------
 .pre-commit-config.yaml | 14 +++++++++++++-
 .travis.yml             | 10 ----------
 kitchen.yml             | 36 ------------------------------------
 4 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12451fe..33a2e44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,7 +154,6 @@ default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 default-centos-7-master-py3: {extends: '.test_instance'}
 default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
 default-fedora-35-master-py3: {extends: '.test_instance'}
-default-fedora-34-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'}
@@ -175,7 +174,6 @@ default-rockylinux-8-master-py3: {extends: '.test_instance'}
 # 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-fedora-34-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'}
@@ -196,14 +194,6 @@ default-rockylinux-8-master-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'}
-# default-debian-10-3002-8-py3: {extends: '.test_instance'}
-# default-debian-9-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
-# default-centos-7-3002-8-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2cb381e..1299a84 100644
--- 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.25.1
+    rev: v1.30.1
     hooks:
       - id: rubocop
         name: Check Ruby files with rubocop
diff --git a/.travis.yml b/.travis.yml
index 9cefb80..63db262 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,7 +106,6 @@ jobs:
     - env: INSTANCE=default-centos-7-master-py3
     - env: INSTANCE=default-fedora-36-master-py3
     - env: INSTANCE=default-fedora-35-master-py3
-    - env: INSTANCE=default-fedora-34-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
@@ -127,7 +126,6 @@ jobs:
     # - 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-fedora-34-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
@@ -148,14 +146,6 @@ jobs:
     # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
     # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
     # - env: INSTANCE=default-almalinux-8-3003-4-py3
-    # - env: INSTANCE=default-debian-10-3002-8-py3
-    # - env: INSTANCE=default-debian-9-3002-8-py3
-    # - env: INSTANCE=default-ubuntu-2004-3002-8-py3
-    # - env: INSTANCE=default-ubuntu-1804-3002-8-py3
-    # - env: INSTANCE=default-centos-7-3002-8-py3
-    # - env: INSTANCE=default-amazonlinux-2-3002-8-py3
-    # - env: INSTANCE=default-oraclelinux-8-3002-8-py3
-    # - env: INSTANCE=default-oraclelinux-7-3002-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
diff --git a/kitchen.yml b/kitchen.yml
index 66c2fdf..d4fd909 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -103,9 +103,6 @@ platforms:
   - name: fedora-35-master-py3
     driver:
       image: saltimages/salt-master-py3:fedora-35
-  - name: fedora-34-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-34
   - name: opensuse-leap-153-master-py3
     driver:
       image: saltimages/salt-master-py3:opensuse-leap-15.3
@@ -183,9 +180,6 @@ platforms:
   - name: fedora-35-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:fedora-35
-  - name: fedora-34-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-34
   - name: amazonlinux-2-3004-1-py3
     driver:
       image: saltimages/salt-3004.1-py3:amazonlinux-2
@@ -264,36 +258,6 @@ platforms:
     driver:
       image: saltimages/salt-3003.4-py3:almalinux-8
 
-  ## SALT `3002.8`
-  - name: debian-10-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-7-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:centos-7
-  - name: amazonlinux-2-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:amazonlinux-2
-  - name: oraclelinux-8-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:oraclelinux-8
-  - name: oraclelinux-7-3002-8-py3
-    driver:
-      image: saltimages/salt-3002.8-py3:oraclelinux-7
-
 verifier:
   # https://www.inspec.io/
   name: inspec

From 4ee72abb5d9bf250cc1a3e8024e28592d10f1d2b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 15 Jun 2022 23:02:25 +0100
Subject: [PATCH 11/15] chore(gemfile.lock): update to latest gem versions
 (2022-W24) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/452
---
 Gemfile.lock | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ed6cd1..35206e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 6bedc829b7fcec035311d8c6086db5d59414428c
+  revision: fdc592e2c7b999166f404ae28119866e805c3cd2
   branch: ssf
   specs:
-    inspec (5.17.9)
+    inspec (5.18.5)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.17.9)
+      inspec-core (= 5.18.5)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.17.9)
+    inspec-core (5.18.5)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -58,7 +58,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.596.0)
+    aws-partitions (1.598.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -83,7 +83,7 @@ GEM
     aws-sdk-batch (1.47.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.49.0)
+    aws-sdk-budgets (1.50.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudformation (1.69.0)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.74.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.317.0)
+    aws-sdk-ec2 (1.318.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -190,7 +190,7 @@ GEM
     aws-sdk-guardduty (1.57.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.68.0)
+    aws-sdk-iam (1.69.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kafka (1.49.0)
@@ -223,7 +223,7 @@ GEM
     aws-sdk-rds (1.146.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.82.0)
+    aws-sdk-redshift (1.83.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53 (1.63.0)
@@ -380,10 +380,10 @@ GEM
     inifile (3.0.0)
     jmespath (1.6.1)
     json (2.6.2)
-    jwt (2.4.0)
-    kitchen-inspec (2.6.0)
+    jwt (2.4.1)
+    kitchen-inspec (2.6.1)
       hashie (>= 3.4, <= 5.0)
-      inspec (>= 2.2.64, < 6.0)
+      inspec (>= 2.2.64, < 7.0)
       test-kitchen (>= 2.7, < 4)
     kitchen-salt (0.7.2)
       hashie (>= 3.5)
@@ -400,8 +400,8 @@ GEM
     memoist (0.16.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.15.0)
-    mixlib-config (3.0.9)
+    minitest (5.16.0)
+    mixlib-config (3.0.27)
       tomlrb
     mixlib-install (3.12.19)
       mixlib-shellout
@@ -423,7 +423,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       ms_rest (~> 0.7.6)
     multi_json (1.15.0)
-    multipart-post (2.2.0)
+    multipart-post (2.2.3)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
@@ -497,7 +497,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (3.2.2)
+    test-kitchen (3.3.0)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)

From c6a6baca58bd377312f3d43f615db5c9353fd0e6 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 30 Jun 2022 23:05:04 +0100
Subject: [PATCH 12/15] chore(gemfile.lock): update to latest gem versions
 (2022-W26) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/453
---
 Gemfile.lock | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 35206e0..4307147 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: fdc592e2c7b999166f404ae28119866e805c3cd2
+  revision: da3b324893676451fbe419cb11dff91372a9bb9e
   branch: ssf
   specs:
-    inspec (5.18.5)
+    inspec (5.18.9)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.18.5)
+      inspec-core (= 5.18.9)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
@@ -14,7 +14,7 @@ GIT
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.18.5)
+    inspec-core (5.18.9)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -58,14 +58,14 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.598.0)
+    aws-partitions (1.602.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-amplify (1.32.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.77.0)
+    aws-sdk-apigateway (1.78.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-apigatewayv2 (1.42.0)
@@ -74,7 +74,7 @@ GEM
     aws-sdk-applicationautoscaling (1.51.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.53.0)
+    aws-sdk-athena (1.54.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-autoscaling (1.63.0)
@@ -128,7 +128,7 @@ GEM
     aws-sdk-configservice (1.77.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.1)
+    aws-sdk-core (3.131.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -139,10 +139,10 @@ GEM
     aws-sdk-databasemigrationservice (1.53.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.74.0)
+    aws-sdk-dynamodb (1.75.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.318.0)
+    aws-sdk-ec2 (1.320.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -151,7 +151,7 @@ GEM
     aws-sdk-ecrpublic (1.12.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.99.0)
+    aws-sdk-ecs (1.100.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-efs (1.54.0)
@@ -169,7 +169,7 @@ GEM
     aws-sdk-elasticloadbalancing (1.40.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.77.0)
+    aws-sdk-elasticloadbalancingv2 (1.78.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticsearchservice (1.65.0)
@@ -187,13 +187,13 @@ GEM
     aws-sdk-glue (1.88.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.57.0)
+    aws-sdk-guardduty (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.69.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.49.0)
+    aws-sdk-kafka (1.50.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kinesis (1.41.0)
@@ -245,7 +245,7 @@ GEM
     aws-sdk-secretsmanager (1.46.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.65.0)
+    aws-sdk-securityhub (1.67.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-servicecatalog (1.60.0)
@@ -400,7 +400,7 @@ GEM
     memoist (0.16.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.16.0)
+    minitest (5.16.1)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-install (3.12.19)
@@ -486,9 +486,9 @@ GEM
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
     semverse (3.0.2)
-    signet (0.16.1)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     sslshake (1.3.1)
@@ -515,7 +515,7 @@ GEM
     timeliness (0.3.10)
     tomlrb (1.3.0)
     trailblazer-option (0.1.2)
-    train (3.9.2)
+    train (3.10.1)
       activesupport (>= 6.0.3.1)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
@@ -526,7 +526,7 @@ GEM
       google-api-client (>= 0.23.9, <= 0.52.0)
       googleauth (>= 0.6.6, <= 0.14.0)
       inifile (~> 3.0)
-      train-core (= 3.9.2)
+      train-core (= 3.10.1)
       train-winrm (~> 0.2)
     train-aws (0.2.24)
       aws-sdk-alexaforbusiness (~> 1.0)
@@ -604,7 +604,7 @@ GEM
       aws-sdk-synthetics (~> 1.19.0)
       aws-sdk-transfer (>= 1.26, < 1.35)
       aws-sdk-waf (~> 1.43.0)
-    train-core (3.9.2)
+    train-core (3.10.1)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
@@ -640,7 +640,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     unicode_utils (1.4.0)
     winrm (2.3.6)
       builder (>= 2.1.2)

From 42b603b6033a4ee7cd5ff184d9a4949c8a2f3512 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 17 Jul 2022 19:43:34 +0100
Subject: [PATCH 13/15] chore(gemfile.lock): update to latest gem versions
 (2022-W28) [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/454
---
 Gemfile.lock                               | 38 +++++++++++-----------
 bin/kitchen                                |  4 +--
 test/integration/share/libraries/system.rb |  2 ++
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4307147..471bb68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,20 +1,20 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: da3b324893676451fbe419cb11dff91372a9bb9e
+  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
   branch: ssf
   specs:
-    inspec (5.18.9)
+    inspec (5.18.15)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.18.9)
+      inspec-core (= 5.18.15)
       mongo (= 2.13.2)
       progress_bar (~> 1.3.3)
       rake
-      train (~> 3.0)
+      train (~> 3.10)
       train-aws (~> 0.2)
       train-habitat (~> 0.1)
       train-winrm (~> 0.2)
-    inspec-core (5.18.9)
+    inspec-core (5.18.15)
       addressable (~> 2.4)
       chef-telemetry (~> 1.0, >= 1.0.8)
       faraday (>= 0.9.0, < 1.5)
@@ -34,7 +34,7 @@ GIT
       sslshake (~> 1.2)
       thor (>= 0.20, < 2.0)
       tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.0)
+      train-core (~> 3.10)
       tty-prompt (~> 0.17)
       tty-table (~> 0.10)
 
@@ -49,7 +49,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -58,7 +58,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.602.0)
+    aws-partitions (1.607.0)
     aws-sdk-alexaforbusiness (1.56.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
@@ -74,7 +74,7 @@ GEM
     aws-sdk-applicationautoscaling (1.51.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.54.0)
+    aws-sdk-athena (1.55.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-autoscaling (1.63.0)
@@ -86,7 +86,7 @@ GEM
     aws-sdk-budgets (1.50.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.69.0)
+    aws-sdk-cloudformation (1.70.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-cloudfront (1.65.0)
@@ -125,7 +125,7 @@ GEM
     aws-sdk-cognitoidentityprovider (1.53.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.77.0)
+    aws-sdk-configservice (1.79.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-core (3.131.2)
@@ -142,7 +142,7 @@ GEM
     aws-sdk-dynamodb (1.75.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.320.0)
+    aws-sdk-ec2 (1.322.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -211,7 +211,7 @@ GEM
     aws-sdk-networkfirewall (1.17.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-networkmanager (1.23.0)
+    aws-sdk-networkmanager (1.24.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-organizations (1.59.0)
@@ -220,10 +220,10 @@ GEM
     aws-sdk-ram (1.26.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.146.0)
+    aws-sdk-rds (1.148.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.83.0)
+    aws-sdk-redshift (1.84.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53 (1.63.0)
@@ -375,7 +375,7 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     jmespath (1.6.1)
@@ -400,7 +400,7 @@ GEM
     memoist (0.16.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.16.1)
+    minitest (5.16.2)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-install (3.12.19)
@@ -479,7 +479,7 @@ GEM
       rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.19.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -497,7 +497,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (3.3.0)
+    test-kitchen (3.3.1)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
diff --git a/bin/kitchen b/bin/kitchen
index dcfdb4c..5d5663e 100755
--- 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
diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb
index 0db9d0b..64405bb 100644
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@@ -97,6 +97,8 @@ def build_finger_release
   # 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'

From 6336b3fe5d07a67d524a618df1f6e19aee2e3b6e Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Sun, 4 Feb 2024 21:07:44 +0100
Subject: [PATCH 14/15] feat(stats): refactor global stats sockets

This allows for multiple sockets to be defined, which is useful if
multiple sockets with different access levels are desired.

BREAKING CHANGE: The `haproxy:global:stats` pillar structure changed.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 haproxy/templates/haproxy.jinja |  9 +++------
 pillar.example                  | 19 ++++++++++++-------
 test/salt/pillar/default.sls    | 15 +++++++--------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/haproxy/templates/haproxy.jinja b/haproxy/templates/haproxy.jinja
index 0f014cc..9ad1544 100644
--- a/haproxy/templates/haproxy.jinja
+++ b/haproxy/templates/haproxy.jinja
@@ -45,12 +45,9 @@ global
 {%- if salt['pillar.get']('haproxy:global:daemon', 'no') == True %}
     daemon
 {%- endif %}
-{%- if salt['pillar.get']('haproxy:global:stats:enable', 'no') == True %}
-  {%- set socketpath = salt['pillar.get']('haproxy:global:stats:socketpath', '/tmp/ha_stats.sock') %}
-  {%- set mode = salt['pillar.get']('haproxy:global:stats:mode', '660') %}
-  {%- set level = salt['pillar.get']('haproxy:global:stats:level', 'operator') %}
-    stats socket {{ socketpath }} mode {{ mode }} level {{ level }}{% if 'extra' in salt['pillar.get']('haproxy:global:stats', {}) %} {{ salt['pillar.get']('haproxy:global:stats:extra') }}{% endif %}
-{%- endif %}
+{%- for socket, socket_config in salt['pillar.get']('haproxy:global:stats', {}).items() %}
+    stats socket {{ socket }} mode {{ socket_config.get('mode', '0600') }} level {{ socket_config.get('level', 'user') }} user {{ socket_config.get('user', 'haproxy') }} group {{ socket_config.get('group', 'haproxy') }}
+{%- endfor %}
 {%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %}
     maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }}
 {%- endif %}
diff --git a/pillar.example b/pillar.example
index 1daeab4..3a05a85 100644
--- a/pillar.example
+++ b/pillar.example
@@ -24,14 +24,19 @@ haproxy:
     log-tag: haproxy
     # Optional log-send-hostname parameter, sets the hostname field in the syslog header
     log-send-hostname: localhost
+    # stats sockets
     stats:
-      enable: true
-      socketpath: /var/lib/haproxy/stats
-      mode: 660
-      level: admin
-      # yamllint disable-line rule:line-length
-      # Optional extra bind parameter, for example to set the owner/group on the socket file
-      extra: user haproxy group haproxy
+      /run/haproxy/stats-ro:
+        # the defaults
+        level: user
+        mode: 600
+        user: haproxy
+        group: haproxy
+      /run/haproxy/stats-rw:
+        # custom example
+        level: admin
+        mode: 660
+        group: sysadmins
     # yamllint disable-line rule:line-length
     ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384"
     ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11"
diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
index 47b33a7..2bd03ac 100644
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@@ -21,14 +21,13 @@ haproxy:
     # Optional log-send-hostname parameter, sets the hostname field in the syslog header
     log-send-hostname: localhost
     stats:
-      enable: true
-      # Using the `haproxy:global:chroot:path`
-      socketpath: /var/lib/haproxy/stats
-      mode: 660
-      level: admin
-      # yamllint disable-line rule:line-length
-      # Optional extra bind parameter, for example to set the owner/group on the socket file
-      extra: user haproxy group haproxy
+      /run/haproxy/stats-operator:
+        level: operator
+        mode: 660
+        group: users
+      /run/haproxy/stats-admin:
+        level: admin
+        mode: 600
     # yamllint disable-line rule:line-length
     ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384"
     ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11"

From b51b833c9659f1b4ae2479c9b8ecbf7e202b561a Mon Sep 17 00:00:00 2001
From: Eric Veiras Galisson <eric@sietch-tabr.com>
Date: Thu, 6 Mar 2025 11:55:33 +0100
Subject: [PATCH 15/15] chore: update CODEOWNERS

---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 3d15bd0..f47783d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,7 +2,7 @@
 
 # SECTION: Owner(s) for everything in the repo, unless a later match takes precedence
 # FILE PATTERN                              OWNER(S)
-*                                           @daks
+*                                           @saltstack-formulas/wg
 
 # SECTION: Owner(s) for specific directories
 # FILE PATTERN                              OWNER(S)