Merge branch 'saltstack-formulas:master' into master

.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'}
@@ -152,6 +153,9 @@ debian-10-master-py3: {extends: '.test_instance'}
 # default-debian-9-master-py3: {extends: '.test_instance'}
 # passenger-debian-9-master-py3: {extends: '.test_instance'}
 debian-9-master-py3: {extends: '.test_instance'}
+# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
+# passenger-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
+ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # passenger-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-2004-master-py3: {extends: '.test_instance'}
@@ -196,6 +200,7 @@ 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'}

.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
@@ -104,6 +105,9 @@ jobs:
     # - env: INSTANCE=default-debian-9-master-py3
     # - env: INSTANCE=passenger-debian-9-master-py3
     - env: INSTANCE=debian-9-master-py3
+    # - env: INSTANCE=default-ubuntu-2204-master-py3
+    # - env: INSTANCE=passenger-ubuntu-2204-master-py3
+    - env: INSTANCE=ubuntu-2204-master-py3
     # - env: INSTANCE=default-ubuntu-2004-master-py3
     # - env: INSTANCE=passenger-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-2004-master-py3
@@ -148,6 +152,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

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.

Gemfile.lock

@@ -1,12 +1,12 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: 1821d2dfd3365e8f05b8439845c58fa4d069806b
+  revision: 2b56b68db2a758041b9df5b2e4bdc3c6700558ea
   branch: ssf
   specs:
-    inspec (5.12.2)
+    inspec (5.17.4)
       cookstyle
       faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.12.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.12.2)
+    inspec-core (5.17.4)
       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.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -58,14 +58,14 @@ 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.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,10 +86,10 @@ 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.63.0)
+    aws-sdk-cloudfront (1.65.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)
@@ -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.130.1)
+    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.307.0)
+    aws-sdk-ec2 (1.317.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ecr (1.56.0)
@@ -157,10 +157,10 @@ 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.76.0)
+    aws-sdk-elasticache (1.78.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-elasticbeanstalk (1.51.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)
@@ -199,19 +199,19 @@ 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.57.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)
       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)
+    aws-sdk-networkmanager (1.23.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.143.0)
+    aws-sdk-rds (1.146.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.80.0)
+    aws-sdk-redshift (1.82.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53 (1.62.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.65.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.134.0)
+    aws-sdk-ssm (1.137.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
@@ -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)
@@ -372,14 +372,14 @@ 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)
       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)
@@ -396,7 +396,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)
@@ -449,8 +449,8 @@ GEM
     public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.3.0)
+    regexp_parser (2.5.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)
@@ -481,13 +481,13 @@ 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)
     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)
@@ -641,7 +641,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)

kitchen.vagrant.yml

@@ -9,8 +9,8 @@ driver:
   gui: false
   ssh:
     shell: /bin/sh
-  <% unless ENV['CI'] %>
   linked_clone: true
+  <% unless ENV['CI'] %>
   synced_folders:
     - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
       - '/vagrant'

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
@@ -317,6 +329,7 @@ suites:
       - debian-11-tiamat-py3
       - debian-10-tiamat-py3
       - debian-9-tiamat-py3
+      - ubuntu-2204-tiamat-py3
       - ubuntu-2004-tiamat-py3
       - ubuntu-1804-tiamat-py3
       - centos-stream8-tiamat-py3
@@ -327,6 +340,7 @@ suites:
       - debian-11-master-py3
       - debian-10-master-py3
       - debian-9-master-py3
+      - ubuntu-2204-master-py3
       - ubuntu-2004-master-py3
       - ubuntu-1804-master-py3
       - centos-stream8-master-py3
@@ -337,6 +351,7 @@ suites:
       - debian-11-3004-1-py3
       - debian-10-3004-1-py3
       - debian-9-3004-1-py3
+      - ubuntu-2204-3004-1-py3
       - ubuntu-2004-3004-1-py3
       - ubuntu-1804-3004-1-py3
       - centos-stream8-3004-1-py3

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

test/integration/passenger/inspec.yml

@@ -24,4 +24,5 @@ supports:
   - platform-name: gentoo
   - platform-name: almalinux
   - platform-name: rocky
+  - platform-name: mac_os_x
   - platform: windows

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

test/integration/share/libraries/system.rb

@@ -57,6 +57,8 @@ class SystemResource < Inspec.resource(1)
       '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]