Merge branch 'voxpupuli:master' into master

.github/CONTRIBUTING.md

@@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian11-64 bundle exec rake beaker
+BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
-You can replace the string `debian10` with any common operating system.
+You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1804
 * ubuntu2004
-* debian10
+* ubuntu2204
 * debian11
 * centos7
 * centos8
+* centos9
+* almalinux8
+* almalinux9
+* fedora36
 
 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
 

.github/workflows/ci.yml

@@ -4,7 +4,12 @@
 
 name: CI
 
-on: pull_request
+on:
+  pull_request: {}
+  push:
+    branches:
+      - main
+      - master
 
 concurrency:
   group: ${{ github.ref_name }}
@@ -13,7 +18,7 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: 'false'
       additional_packages: 'libaugeas-dev augeas-tools'

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'voxpupuli'
     secrets:

.gitignore

@@ -1,23 +1,23 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-.vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-.vagrant/
-.bundle/
-.ruby-version
-coverage/
-log/
-.idea/
-.dependencies/
-.librarian/
-Puppetfile.lock
+/pkg/
+/Gemfile.lock
+/Gemfile.local
+/vendor/
+/.vendor/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/.vagrant/
+/.bundle/
+/.ruby-version
+/coverage/
+/log/
+/.idea/
+/.dependencies/
+/.librarian/
+/Puppetfile.lock
 *.iml
 .*.sw?
-.yardoc/
-Guardfile
+/.yardoc/
+/Guardfile

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "augeas"]
 	path = spec/fixtures/augeas
-	url = git://github.com/hercules-team/augeas.git
+	url = https://github.com/hercules-team/augeas.git

.msync.yml

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

.pmtignore

@@ -1,37 +1,38 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-docs/
-pkg/
-Gemfile
-Gemfile.lock
-Gemfile.local
-vendor/
-.vendor/
-spec/
-Rakefile
-.vagrant/
-.bundle/
-.ruby-version
-coverage/
-log/
-.idea/
-.dependencies/
-.github/
-.librarian/
-Puppetfile.lock
+/docs/
+/pkg/
+/Gemfile
+/Gemfile.lock
+/Gemfile.local
+/vendor/
+/.vendor/
+/spec/
+/Rakefile
+/.vagrant/
+/.bundle/
+/.ruby-version
+/coverage/
+/log/
+/.idea/
+/.dependencies/
+/.github/
+/.librarian/
+/Puppetfile.lock
 *.iml
-.editorconfig
-.fixtures.yml
-.gitignore
-.msync.yml
-.overcommit.yml
-.pmtignore
-.rspec
-.rspec_parallel
-.rubocop.yml
-.sync.yml
+/.editorconfig
+/.fixtures.yml
+/.gitignore
+/.msync.yml
+/.overcommit.yml
+/.pmtignore
+/.rspec
+/.rspec_parallel
+/.rubocop.yml
+/.sync.yml
 .*.sw?
-.yardoc/
-.yardopts
-Dockerfile
+/.yardoc/
+/.yardopts
+/Dockerfile
+/HISTORY.md

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-08-03 06:53:06 UTC using RuboCop version 1.22.3.
+# on 2023-08-17 21:30:05 UTC using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -13,6 +13,16 @@ Lint/ConstantDefinitionInBlock:
   Exclude:
     - 'lib/puppet/provider/sshd_config_match/augeas.rb'
 
+# Offense count: 11
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/unit/puppet/provider/ssh_config/augeas_spec.rb'
+    - 'spec/unit/puppet/provider/sshd_config/augeas_spec.rb'
+    - 'spec/unit/puppet/provider/sshd_config_match/augeas_spec.rb'
+    - 'spec/unit/puppet/provider/sshd_config_subsystem/augeas_spec.rb'
+    - 'spec/unit/puppet/provider/sshkey/augeas_spec.rb'
+
 # Offense count: 10
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
@@ -44,8 +54,3 @@ Style/AsciiComments:
     - 'lib/puppet/type/sshd_config.rb'
     - 'lib/puppet/type/sshd_config_match.rb'
     - 'lib/puppet/type/sshd_config_subsystem.rb'
-
-# Offense count: 1
-Style/MixinUsage:
-  Exclude:
-    - 'spec/spec_helper_local.rb'

.sync.yml

@@ -5,10 +5,6 @@ Gemfile:
   optional:
     ':test':
       - gem: ruby-augeas
-    ':system_tests':
-      - gem: 'simp-beaker-helpers'
-        version: '~> 1.24'
-      - gem: 'puppetlabs_spec_helper'
 spec/spec_helper.rb:
   spec_overrides:
     - "require 'augeas_spec'"

CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v6.0.0](https://github.com/voxpupuli/puppet-augeasproviders_ssh/tree/v6.0.0) (2023-06-22)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-augeasproviders_ssh/compare/v5.0.0...v6.0.0)
+
+**Breaking changes:**
+
+- Drop Puppet 6 support [\#88](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/88) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- puppet/augeasproviders\_core: Allow 4.x [\#91](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/91) ([bastelfreak](https://github.com/bastelfreak))
+- Add puppet 8 support [\#90](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/90) ([bastelfreak](https://github.com/bastelfreak))
+- Add Rocky 9 support [\#87](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/87) ([bastelfreak](https://github.com/bastelfreak))
+- Add support of PubkeyAcceptedKeyTypes for ssh\_config [\#81](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/81) ([hbenali](https://github.com/hbenali))
+
+**Merged pull requests:**
+
+- Fix incorrect Apache-2 license [\#85](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/85) ([bastelfreak](https://github.com/bastelfreak))
+- Fix License detection [\#84](https://github.com/voxpupuli/puppet-augeasproviders_ssh/pull/84) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v5.0.0](https://github.com/voxpupuli/puppet-augeasproviders_ssh/tree/v5.0.0) (2022-08-30)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-augeasproviders_ssh/compare/4.0.0...v5.0.0)

Gemfile

@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 1.0',  :require => false
+  gem 'puppet_metadata', '~> 3.5',  :require => false
   gem 'ruby-augeas',                :require => false
 end
 
@@ -17,21 +17,17 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
-  gem 'simp-beaker-helpers', '~> 1.24',  :require => false
-  gem 'puppetlabs_spec_helper',          :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '>= 1.2.0',            :require => false
-  gem 'puppet-strings', '>= 2.2',                 :require => false
+  gem 'voxpupuli-release', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby