Skip to content

Commit 4ad7173

Browse files
authored
Merge pull request #1078 from voxpupuli/modulesync
modulesync 10.6.0
2 parents f01895f + a4dcc85 commit 4ad7173

File tree

30 files changed

+413
-393
lines changed

30 files changed

+413
-393
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
21
{
32
"name": "VoxBox",
43
"image": "ghcr.io/voxpupuli/voxbox:latest"

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '10.5.0'
5+
modulesync_config_version: '10.6.0'

.rubocop_todo.yml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
3-
# using RuboCop version 1.50.2.
3+
# using RuboCop version 1.85.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9-
# Offense count: 8
9+
# Offense count: 5
1010
# This cop supports unsafe autocorrection (--autocorrect-all).
1111
RSpec/BeEq:
1212
Exclude:
1313
- 'spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb'
1414
- 'spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb'
1515
- 'spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb'
16-
- 'spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb'
1716
- 'spec/unit/puppet/type/rabbitmq_user_permissions_spec.rb'
1817

19-
# Offense count: 185
18+
# Offense count: 13
19+
RSpec/LeakyLocalVariable:
20+
Exclude:
21+
- 'spec/classes/rabbitmq_spec.rb'
22+
- 'spec/unit/puppet/provider/rabbitmq_binding/rabbitmqadmin_spec.rb'
23+
- 'spec/unit/puppet/provider/rabbitmq_cli_spec.rb'
24+
- 'spec/unit/puppet/provider/rabbitmq_cluster/rabbitmqctl_spec.rb'
25+
- 'spec/unit/puppet/provider/rabbitmq_exchange/rabbitmqadmin_spec.rb'
26+
- 'spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_federation_spec.rb'
27+
- 'spec/unit/puppet/provider/rabbitmq_parameter/rabbitmqctl_spec.rb'
28+
- 'spec/unit/puppet/provider/rabbitmq_plugin/rabbitmqctl_spec.rb'
29+
- 'spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb'
30+
- 'spec/unit/puppet/provider/rabbitmq_user/rabbitmqctl_spec.rb'
31+
- 'spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb'
32+
33+
# Offense count: 172
2034
# Configuration parameters: .
2135
# SupportedStyles: have_received, receive
2236
RSpec/MessageSpies:
@@ -37,7 +51,7 @@ RSpec/RepeatedExampleGroupDescription:
3751
Exclude:
3852
- 'spec/classes/rabbitmq_spec.rb'
3953

40-
# Offense count: 125
54+
# Offense count: 118
4155
RSpec/StubbedMock:
4256
Exclude:
4357
- 'spec/unit/facter/util/fact_rabbitmq_clustername_spec.rb'
@@ -54,4 +68,11 @@ RSpec/StubbedMock:
5468
- 'spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb'
5569
- 'spec/unit/puppet/provider/rabbitmq_queue/rabbitmqadmin_spec.rb'
5670
- 'spec/unit/puppet/provider/rabbitmq_user_permissions/rabbitmqctl_spec.rb'
57-
- 'spec/unit/puppet/provider/rabbitmq_vhost/rabbitmqctl_spec.rb'
71+
72+
# Offense count: 1
73+
# This cop supports unsafe autocorrection (--autocorrect-all).
74+
# Configuration parameters: AllowedReceivers.
75+
# AllowedReceivers: Thread.current
76+
Style/HashEachMethods:
77+
Exclude:
78+
- 'lib/puppet/type/rabbitmq_parameter.rb'

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 13.0', :require => false
7+
gem 'voxpupuli-test', '~> 14.0', :require => false
88
gem 'puppet_metadata', '~> 6.0', :require => false
99
end
1010

@@ -18,7 +18,7 @@ group :system_tests do
1818
end
1919

2020
group :release do
21-
gem 'voxpupuli-release', '~> 5.0', :require => false
21+
gem 'voxpupuli-release', '~> 5.3', :require => false
2222
end
2323

2424
gem 'rake', :require => false

lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def self.instances
5454
routing_key: routing_key,
5555
arguments: JSON.parse(arguments),
5656
ensure: :present,
57-
name: hashed_name
57+
name: hashed_name,
5858
}
5959
resources << new(binding) if binding[:name]
6060
end

lib/puppet/provider/rabbitmq_cluster/rabbitmqctl.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmq_cli'))
44
Puppet::Type.type(:rabbitmq_cluster).provide(
55
:rabbitmqctl,
6-
parent: Puppet::Provider::RabbitmqCli
6+
parent: Puppet::Provider::RabbitmqCli,
77
) do
88
desc 'Rabbitmqctl provider for rabbitmq cluster'
99
confine feature: :posix
@@ -19,7 +19,7 @@ def create
1919
local_node = @resource[:local_node].to_s.gsub(%r{^.*@}, '')
2020

2121
if local_node == init_node || [Facter.value(:networking)['hostname'], Facter.value(:networking)['fqdn']].include?(init_node)
22-
return rabbitmqctl('set_cluster_name', @resource[:name]) unless cluster_name == resource[:name].to_s
22+
rabbitmqctl('set_cluster_name', @resource[:name]) unless cluster_name == resource[:name].to_s
2323
else
2424
rabbitmqctl('stop_app')
2525
rabbitmqctl('join_cluster', "rabbit@#{init_node}", "--#{storage_type}")

lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def self.instances
4949
durable: durable,
5050
auto_delete: auto_delete,
5151
name: format('%s@%s', name, vhost),
52-
arguments: JSON.parse(arguments)
52+
arguments: JSON.parse(arguments),
5353
}
5454
resources << new(exchange) if exchange[:type]
5555
end

lib/puppet/provider/rabbitmq_parameter/rabbitmqctl.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
mk_resource_methods
1212

1313
def initialize(value = {})
14-
super(value)
14+
super
1515
@property_flush = {}
1616
end
1717

@@ -33,7 +33,7 @@ def self.instances
3333
ensure: :present,
3434
component_name: Regexp.last_match(1),
3535
name: format('%s@%s', Regexp.last_match(2), vhost),
36-
value: JSON.parse(Regexp.last_match(3))
36+
value: JSON.parse(Regexp.last_match(3)),
3737
}
3838
resources << new(parameter)
3939
end

lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def self.policies(vhost, name)
4646
applyto: applyto,
4747
pattern: pattern,
4848
definition: definition,
49-
priority: priority
49+
priority: priority,
5050
}
5151
end
5252
end

lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def self.instances
4242
auto_delete: auto_delete,
4343
arguments: JSON.parse(arguments),
4444
ensure: :present,
45-
name: format('%s@%s', name, vhost)
45+
name: format('%s@%s', name, vhost),
4646
}
4747
resources << new(queue) if queue[:name]
4848
end

0 commit comments

Comments
 (0)