Merge branch 'voxpupuli:master' into fix-role-regex

Author: dermsd

.github/CONTRIBUTING.md

@@ -245,15 +245,23 @@ with:
 BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
+or
+
+```sh
+BEAKER_PUPPET_COLLECTION=none BEAKER_setfile=archlinux-64 bundle exec rake beaker
+```
+
+This latter example will use the distribution's own version of Puppet.
+
 You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
 * ubuntu2004
 * ubuntu2204
 * debian11
-* centos7
-* centos8
+* debian12
 * centos9
+* archlinux
 * almalinux8
 * almalinux9
 * fedora36

.github/labeler.yml

@@ -0,0 +1,6 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+skip-changelog:
+ - head-branch: ['^release-*', 'release']

.github/release.yml

@@ -0,0 +1,42 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
+
+changelog:
+  exclude:
+    labels:
+      - duplicate
+      - invalid
+      - modulesync
+      - question
+      - skip-changelog
+      - wont-fix
+      - wontfix
+
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - backwards-incompatible
+
+    - title: New Features 🎉
+      labels:
+        - enhancement
+
+    - title: Bug Fixes 🐛
+      labels:
+        - bug
+
+    - title: Documentation Updates 📚
+      labels:
+        - documentation
+        - docs
+
+    - title: Dependency Updates ⬆️
+      labels:
+        - dependencies
+
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/ci.yml

@@ -4,6 +4,7 @@
 
 name: CI
 
+# yamllint disable-line rule:truthy
 on:
   pull_request: {}
   push:
@@ -18,7 +19,7 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
     with:
       beaker_hosts: 'host1:shard.ma;host2:slave,router.a'
-      beaker_facter: 'mongodb_repo_version:MongoDB:5.0,6.0,7.0'
+      beaker_facter: 'mongodb_repo_version:MongoDB:6.0,7.0'

.github/workflows/labeler.yml

@@ -0,0 +1,18 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+name: "Pull Request Labeler"
+
+# yamllint disable-line rule:truthy
+on:
+  pull_request_target: {}
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5

.github/workflows/prepare_release.yml

@@ -0,0 +1,23 @@
+---
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
+name: 'Prepare Release'
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Module version to be released. Must be a valid semver string without leading v. (1.2.3)'
+        required: false
+
+jobs:
+  release_prep:
+    uses: 'voxpupuli/gha-puppet/.github/workflows/prepare_release.yml@v3'
+    with:
+      version: ${{ github.event.inputs.version }}
+      allowed_owner: 'voxpupuli'
+    secrets:
+      # Configure secrets here:
+      #  https://docs.github.com/en/actions/security-guides/encrypted-secrets
+      github_pat: '${{ secrets.PCCI_PAT_RELEASE_PREP }}'

.github/workflows/release.yml

@@ -4,6 +4,7 @@
 
 name: Release
 
+# yamllint disable-line rule:truthy
 on:
   push:
     tags:
@@ -12,7 +13,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
     with:
       allowed_owner: 'voxpupuli'
     secrets:

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '8.0.1'
+modulesync_config_version: '9.7.0'

.pmtignore

@@ -20,6 +20,7 @@
 /.github/
 /.librarian/
 /Puppetfile.lock
+/Puppetfile
 *.iml
 /.editorconfig
 /.fixtures.yml

.puppet-lint.rc

@@ -1,3 +1,6 @@
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
+
 --fail-on-warnings
 --no-parameter_documentation-check
 --no-parameter_types-check

.sync.yml

@@ -4,4 +4,4 @@ appveyor.yml:
 .github/workflows/ci.yml:
   with:
     beaker_hosts: 'host1:shard.ma;host2:slave,router.a'
-    beaker_facter: 'mongodb_repo_version:MongoDB:5.0,6.0,7.0'
+    beaker_facter: 'mongodb_repo_version:MongoDB:6.0,7.0'

Gemfile

@@ -4,10 +4,8 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 7.2',   :require => false
-  gem 'coveralls',                  :require => false
-  gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 4.0',  :require => false
+  gem 'voxpupuli-test', '~> 10.0',  :require => false
+  gem 'puppet_metadata', '~> 5.0',  :require => false
 end
 
 group :development do
@@ -16,7 +14,7 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.5',  :require => false
 end
 
 group :release do
@@ -26,7 +24,7 @@ end
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

metadata.json

@@ -11,16 +11,13 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
-        "8",
         "9"
       ]
     },
@@ -48,15 +45,13 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
         "11",
         "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "20.04",
         "22.04"
       ]
     },
@@ -89,7 +84,7 @@
     },
     {
       "name": "puppet/systemd",
-      "version_requirement": ">= 5.1.0 < 8.0.0"
+      "version_requirement": ">= 5.1.0 < 9.0.0"
     },
     {
       "name": "puppet/zypprepo",

spec/classes/mongos_spec.rb

@@ -79,7 +79,7 @@
         # install
         it { is_expected.to contain_class('mongodb::mongos::install') }
 
-        if facts[:osfamily] == 'Suse'
+        if facts[:os]['family'] == 'Suse'
           it { is_expected.to contain_package('mongodb_mongos').with_ensure('absent') }
         else
           it { is_expected.to contain_package('mongodb_mongos').with_ensure('purged') }
@@ -95,12 +95,4 @@
       end
     end
   end
-
-  context 'when deploying on Solaris' do
-    let :facts do
-      { osfamily: 'Solaris' }
-    end
-
-    it { is_expected.to compile.and_raise_error(%r{is not applicable to an Undef Value}) }
-  end
 end

spec/classes/repo_spec.rb

@@ -20,7 +20,7 @@
           }
         end
 
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'RedHat'
           it { is_expected.to contain_class('mongodb::repo::yum') }
 
@@ -38,18 +38,18 @@
         when 'Debian'
           it { is_expected.to contain_class('mongodb::repo::apt') }
 
-          case facts[:operatingsystem]
+          case facts[:os]['name']
           when 'Debian'
             it do
               is_expected.to contain_apt__source('mongodb').
                 with_location('https://repo.mongodb.org/apt/debian').
-                with_release("#{facts[:lsbdistcodename]}/mongodb-org/5.0")
+                with_release("#{facts[:os]['distro']['codename']}/mongodb-org/5.0")
             end
           when 'Ubuntu'
             it do
               is_expected.to contain_apt__source('mongodb').
                 with_location('https://repo.mongodb.org/apt/ubuntu').
-                with_release("#{facts[:lsbdistcodename]}/mongodb-org/5.0")
+                with_release("#{facts[:os]['distro']['codename']}/mongodb-org/5.0")
             end
           end
         else
@@ -67,7 +67,7 @@
           }
         end
 
-        case facts[:osfamily]
+        case facts[:os]['family']
         when 'RedHat'
           it { is_expected.to contain_class('mongodb::repo::yum') }
 

spec/classes/server_spec.rb

@@ -833,12 +833,4 @@
       end
     end
   end
-
-  context 'when deploying on Solaris' do
-    let :facts do
-      { osfamily: 'Solaris' }
-    end
-
-    it { is_expected.to raise_error(Puppet::Error) }
-  end
 end

spec/spec_helper.rb

@@ -9,6 +9,10 @@
 
 require 'voxpupuli/test/spec_helper'
 
+RSpec.configure do |c|
+  c.facterdb_string_keys = false
+end
+
 add_mocked_facts!
 
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))

spec/support/acceptance/supported_version.rb

@@ -3,15 +3,11 @@
 def supported_version?(platform, version)
   return true if version.nil?
 
-  supported_versions = %w[5.0 6.0 7.0]
+  supported_versions = %w[6.0 7.0]
   return false unless supported_versions.include?(version)
 
   supported_versions.reject! do |v|
-    (v < '6.0' && platform.start_with?('el-9')) ||
-      (v > '6.0' && platform.start_with?('debian-10')) ||
-      (v < '5.0' && platform.start_with?('debian-11')) ||
-      (v < '7.0' && platform.start_with?('debian-12')) ||
-      (v < '6.0' && platform.start_with?('ubuntu-22'))
+    (v < '7.0' && platform.start_with?('debian-12'))
   end
 
   supported_versions.include?(version)