Showing with 569 additions and 570 deletions.
  1. +20 −7 .github/CONTRIBUTING.md
  2. +0 −3 .github/SECURITY.md
  3. +7 −2 .github/workflows/ci.yml
  4. +1 −1 .github/workflows/release.yml
  5. +20 −18 .gitignore
  6. +1 −1 .msync.yml
  7. +33 −32 .pmtignore
  8. +0 −2 .puppet-lint.rc
  9. +3 −0 .rubocop.yml
  10. +32 −0 .rubocop_todo.yml
  11. +4 −0 .sync.yml
  12. +22 −1 CHANGELOG.md
  13. +0 −24 Dockerfile
  14. +5 −7 Gemfile
  15. +46 −40 REFERENCE.md
  16. +4 −32 Rakefile
  17. +2 −2 data/common.yaml
  18. +1 −1 lib/facter/rabbitmq_nodename.rb
  19. +1 −0 lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb
  20. +1 −0 lib/puppet/provider/rabbitmq_cluster/rabbitmqctl.rb
  21. +1 −0 lib/puppet/provider/rabbitmq_erlang_cookie/ruby.rb
  22. +1 −0 lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb
  23. +1 −0 lib/puppet/provider/rabbitmq_parameter/rabbitmqctl.rb
  24. +1 −0 lib/puppet/provider/rabbitmq_plugin/rabbitmqplugins.rb
  25. +1 −0 lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
  26. +1 −0 lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb
  27. +1 −0 lib/puppet/provider/rabbitmq_user/rabbitmqctl.rb
  28. +1 −0 lib/puppet/provider/rabbitmq_user_permissions/rabbitmqctl.rb
  29. +6 −0 lib/puppet/provider/rabbitmq_vhost/rabbitmqctl.rb
  30. +1 −0 lib/puppet/type/rabbitmq_binding.rb
  31. +1 −0 lib/puppet/type/rabbitmq_cluster.rb
  32. +8 −1 lib/puppet/type/rabbitmq_erlang_cookie.rb
  33. +1 −0 lib/puppet/type/rabbitmq_exchange.rb
  34. +8 −4 lib/puppet/type/rabbitmq_parameter.rb
  35. +1 −0 lib/puppet/type/rabbitmq_plugin.rb
  36. +1 −0 lib/puppet/type/rabbitmq_policy.rb
  37. +1 −0 lib/puppet/type/rabbitmq_queue.rb
  38. +1 −0 lib/puppet/type/rabbitmq_user.rb
  39. +1 −0 lib/puppet/type/rabbitmq_user_permissions.rb
  40. +1 −0 lib/puppet/type/rabbitmq_vhost.rb
  41. +14 −29 manifests/config.pp
  42. +6 −3 manifests/init.pp
  43. +15 −6 manifests/repo/apt.pp
  44. +8 −3 manifests/repo/rhel.pp
  45. +8 −3 manifests/service.pp
  46. +4 −4 metadata.json
  47. +14 −61 spec/classes/rabbitmq_spec.rb
  48. +3 −0 spec/spec_helper.rb
  49. +2 −2 spec/spec_helper_acceptance.rb
  50. +2 −11 spec/unit/facter/util/fact_rabbitmq_plugins_dirs_spec.rb
  51. +1 −2 spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb
  52. +3 −4 spec/unit/puppet/type/rabbitmq_parameter_spec.rb
  53. +0 −14 templates/default.erb
  54. +3 −0 templates/enabled_plugins.epp
  55. +0 −19 templates/enabled_plugins.erb
  56. +5 −0 templates/rabbitmq-env.conf.epp
  57. +0 −5 templates/rabbitmq-env.conf.erb
  58. +223 −0 templates/rabbitmq.config.epp
  59. +0 −210 templates/rabbitmq.config.erb
  60. +16 −0 templates/rabbitmqadmin.conf.epp
  61. +0 −16 templates/rabbitmqadmin.conf.erb
27 changes: 20 additions & 7 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by
running:

```sh
bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
bundle config set --local path '.vendor/'
bundle config set --local without 'development system_tests release'
bundle install --jobs "$(nproc)"
```

If you also want to run acceptance tests:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
bundle config set --local path '.vendor/'
bundle config set --local without 'development release'
bundle config set --local with 'system_tests'
bundle install --jobs "$(nproc)"
```

Our all in one solution if you don't know if you need to install or update gems:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
bundle config set --local path '.vendor/'
bundle config set --local without 'development release'
bundle config set --local with 'system_tests'
bundle install --jobs "$(nproc)"
bundle update
bundle clean
```

As an alternative to the `--jobs "$(nproc)` parameter, you can set an
Expand Down Expand Up @@ -232,18 +242,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).

Expand Down
3 changes: 0 additions & 3 deletions .github/SECURITY.md

This file was deleted.

9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

name: CI

on: pull_request
on:
pull_request: {}
push:
branches:
- main
- master

concurrency:
group: ${{ github.ref_name }}
Expand All @@ -13,6 +18,6 @@ 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'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
38 changes: 20 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
# 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
bolt-debug.log
.rerun.json
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '5.2.0'
modulesync_config_version: '7.5.0'
65 changes: 33 additions & 32 deletions .pmtignore
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
--fail-on-warnings
--no-parameter_documentation-check
--no-parameter_types-check
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
inherit_from: .rubocop_todo.yml

# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

inherit_from: .rubocop_todo.yml
inherit_gem:
voxpupuli-test: rubocop.yml
32 changes: 32 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2024-05-18 22:27:55 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
# versions of RuboCop, may require this file to be generated again.

# Offense count: 8
# This cop supports unsafe autocorrection (--autocorrect-all).
RSpec/BeEq:
Exclude:
- 'spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb'
- 'spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb'
- 'spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb'
- 'spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb'
- 'spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb'

# Offense count: 3
RSpec/PendingWithoutReason:
Exclude:
- 'spec/acceptance/class_spec.rb'

# Offense count: 4
RSpec/RepeatedExampleGroupBody:
Exclude:
- 'spec/classes/rabbitmq_spec.rb'

# Offense count: 14
RSpec/RepeatedExampleGroupDescription:
Exclude:
- 'spec/classes/rabbitmq_spec.rb'
4 changes: 4 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
spec/spec_helper.rb:
spec_overrides: "require 'spec_helper_local'"
mock_with: ':mocha'
.puppet-lint.rc:
enabled_lint_checks:
- parameter_documentation
- parameter_types
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,27 @@ 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.

## [v13.3.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v13.3.0) (2024-05-19)

[Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v13.2.0...v13.3.0)

**Implemented enhancements:**

- Use epp template to handle sensitive data [\#966](https://github.com/voxpupuli/puppet-rabbitmq/issues/966)
- systemd: migrate from service\_limits-\>manage\_dropin [\#982](https://github.com/voxpupuli/puppet-rabbitmq/pull/982) ([bastelfreak](https://github.com/bastelfreak))
- Remove leftovers from Linux systems without systemd [\#981](https://github.com/voxpupuli/puppet-rabbitmq/pull/981) ([bastelfreak](https://github.com/bastelfreak))
- update puppet-systemd upper bound to 8.0.0 [\#977](https://github.com/voxpupuli/puppet-rabbitmq/pull/977) ([TheMeier](https://github.com/TheMeier))
- Harden codebase and add documentation stubs [\#974](https://github.com/voxpupuli/puppet-rabbitmq/pull/974) ([zilchms](https://github.com/zilchms))

**Fixed bugs:**

- add a workaround for rabbitmq\_vhost when running with --noop or --tags [\#969](https://github.com/voxpupuli/puppet-rabbitmq/pull/969) ([bugfood](https://github.com/bugfood))

**Merged pull requests:**

- Migrate erb to epp templates [\#978](https://github.com/voxpupuli/puppet-rabbitmq/pull/978) ([nosrio](https://github.com/nosrio))
- Use a more expressive method of rewriting values [\#975](https://github.com/voxpupuli/puppet-rabbitmq/pull/975) ([ekohl](https://github.com/ekohl))

## [v13.2.0](https://github.com/voxpupuli/puppet-rabbitmq/tree/v13.2.0) (2023-12-10)

[Full Changelog](https://github.com/voxpupuli/puppet-rabbitmq/compare/v13.1.2...v13.2.0)
Expand Down Expand Up @@ -643,7 +664,7 @@ Debian 8 is EOL since some months now. Release 10.2.0 will be the last one with
- \[Bugfix\] convert $ssl\_depth from string to integer [\#539](https://github.com/voxpupuli/puppet-rabbitmq/pull/539) ([bastelfreak](https://github.com/bastelfreak))
- Extend rabbitmqadmin config template with SSL options. [\#526](https://github.com/voxpupuli/puppet-rabbitmq/pull/526) ([justahero](https://github.com/justahero))
- \[MODULES-4223\] don't set NODE\_PORT and NODE\_IP\_ADDRESS if ssl\_only [\#524](https://github.com/voxpupuli/puppet-rabbitmq/pull/524) ([JAORMX](https://github.com/JAORMX))
- \[MODULES-3733\] rabbitmq provider env\_path does not locate ruby gem installed puppet binary [\#517](https://github.com/voxpupuli/puppet-rabbitmq/pull/517) ([lowstorage](https://github.com/lowstorage))
- \[MODULES-3733\] rabbitmq provider env\_path does not locate ruby gem installed puppet binary [\#517](https://github.com/voxpupuli/puppet-rabbitmq/pull/517) ([growthstock](https://github.com/growthstock))

**Closed issues:**

Expand Down
24 changes: 0 additions & 24 deletions Dockerfile

This file was deleted.

12 changes: 5 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 5.0', :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
end

group :development do
Expand All @@ -16,19 +16,17 @@ group :development do
end

group :system_tests do
gem 'voxpupuli-acceptance', '~> 1.0', :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
Loading