Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support policy format change in v3.7.0 - #671 (Replaces #674) #676

Merged
merged 7 commits into from
Jan 11, 2018
Merged

Support policy format change in v3.7.0 - #671 (Replaces #674) #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5fb7b6b
Change regex to match Rabbitmq v3.7.0
alex123321-wq Dec 27, 2017
2622bc3
Update version comparison - set to 3.7, rather to 3.7.0
alex123321-wq Dec 28, 2017
c86e325
Rework the logic to only call 'rabbitmq_version' once, and store regex
fatmcgav Jan 10, 2018
57cd64a
Fix format of exchange policy fixture
fatmcgav Jan 10, 2018
9eb70cd
Resolve test failures
wyardley Jan 11, 2018
bf7eec7
Merge pull request #1 from wyardley/676
fatmcgav Jan 11, 2018
a3673c3
Instantiate a new provider
fatmcgav Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions lib/puppet/provider/rabbitmq_policy/rabbitmqctl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,38 @@
confine feature: :posix

# cache policies
def self.policies(name, vhost)
def self.policies(vhost, name)
@policies = {} unless @policies
unless @policies[vhost]
@policies[vhost] = {}
policy_list = run_with_retries do
rabbitmqctl('list_policies', '-q', '-p', vhost)
end

# rabbitmq<3.2 does not support the applyto field
# 1 2 3? 4 5 6
# / ha-all all .* {"ha-mode":"all","ha-sync-mode":"automatic"} 0 << This is for RabbitMQ v < 3.7.0
# / ha-all .* all {"ha-mode":"all","ha-sync-mode":"automatic"} 0 << This is for RabbitMQ v >= 3.7.0
if Puppet::Util::Package.versioncmp(rabbitmq_version, '3.7') >= 0
regex = %r{^(\S+)\s+(\S+)\s+(\S+)\s+(all|exchanges|queues)?\s+(\S+)\s+(\d+)$}
applyto_index = 4
pattern_index = 3
else
regex = %r{^(\S+)\s+(\S+)\s+(all|exchanges|queues)?\s*(\S+)\s+(\S+)\s+(\d+)$}
applyto_index = 3
pattern_index = 4
end

policy_list.split(%r{\n}).each do |line|
# rabbitmq<3.2 does not support the applyto field
# 1 2 3? 4 5 6
# / ha-all all .* {"ha-mode":"all","ha-sync-mode":"automatic"} 0
raise Puppet::Error, "cannot parse line from list_policies:#{line}" unless line =~ %r{^(\S+)\s+(\S+)\s+(all|exchanges|queues)?\s*(\S+)\s+(\S+)\s+(\d+)$}
raise Puppet::Error, "cannot parse line from list_policies:#{line}" unless line =~ regex
n = Regexp.last_match(2)
applyto = Regexp.last_match(3) || 'all'
applyto = Regexp.last_match(applyto_index) || 'all'
priority = Regexp.last_match(6)
definition = JSON.parse(Regexp.last_match(5))
# be aware that the gsub will reset the captures
# from the regexp above
pattern = Regexp.last_match(4).to_s.gsub(%r{\\\\}, '\\')
pattern = Regexp.last_match(pattern_index).to_s.gsub(%r{\\\\}, '\\')

@policies[vhost][n] = {
applyto: applyto,
pattern: pattern,
Expand All @@ -36,7 +49,7 @@ def self.policies(name, vhost)
@policies[vhost][name]
end

def policies(name, vhost)
def policies(vhost, name)
self.class.policies(vhost, name)
end

Expand Down
66 changes: 45 additions & 21 deletions spec/unit/puppet/provider/rabbitmq_policy/rabbitmqctl_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
pattern: '.*',
definition: {
'ha-mode' => 'all'
},
provider: described_class.name
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wasn't 100% sure about this, but seems to work without it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeh, it does :)

}
)
end
let(:provider) { resource.provider }
let(:provider) { described_class.new(resource) }

after do
described_class.instance_variable_set(:@policies, nil)
Expand Down Expand Up @@ -40,39 +39,64 @@
end

it 'fails with invalid output from list' do
provider.class.expects(:rabbitmqctl).with('-q', 'status').returns '{rabbit,"RabbitMQ","3.1.5"}'
provider.class.expects(:rabbitmqctl).with('list_policies', '-q', '-p', '/').returns 'foobar'
expect { provider.exists? }.to raise_error(Puppet::Error, %r{cannot parse line from list_policies})
end

it 'matches policies from list (>=3.2.0)' do
provider.class.expects(:rabbitmqctl).with('list_policies', '-q', '-p', '/').returns <<-EOT
context 'with RabbitMQ version >=3.7.0' do
it 'matches policies from list' do
provider.class.expects(:rabbitmq_version).returns '3.7.0'
provider.class.expects(:rabbitmqctl).with('list_policies', '-q', '-p', '/').returns <<-EOT
/ ha-all .* all {"ha-mode":"all","ha-sync-mode":"automatic"} 0
/ test .* exchanges {"ha-mode":"all"} 0
EOT
expect(provider.exists?).to eq(applyto: 'all',
pattern: '.*',
priority: '0',
definition: {
'ha-mode' => 'all',
'ha-sync-mode' => 'automatic'
})
end
end

context 'with RabbitMQ version >=3.2.0 and < 3.7.0' do
it 'matches policies from list' do
provider.class.expects(:rabbitmq_version).returns '3.6.9'
provider.class.expects(:rabbitmqctl).with('list_policies', '-q', '-p', '/').returns <<-EOT
/ ha-all all .* {"ha-mode":"all","ha-sync-mode":"automatic"} 0
/ test exchanges .* {"ha-mode":"all"} 0
EOT
expect(provider.exists?).to eq(applyto: 'all',
pattern: '.*',
priority: '0',
definition: {
'ha-mode' => 'all',
'ha-sync-mode' => 'automatic'
})
expect(provider.exists?).to eq(applyto: 'all',
pattern: '.*',
priority: '0',
definition: {
'ha-mode' => 'all',
'ha-sync-mode' => 'automatic'
})
end
end

it 'matches policies from list (<3.2.0)' do
provider.class.expects(:rabbitmqctl).with('list_policies', '-q', '-p', '/').returns <<-EOT
context 'with RabbitMQ version <3.2.0' do
it 'matches policies from list (<3.2.0)' do
provider.class.expects(:rabbitmq_version).returns '3.1.5'
provider.class.expects(:rabbitmqctl).with('list_policies', '-q', '-p', '/').returns <<-EOT
/ ha-all .* {"ha-mode":"all","ha-sync-mode":"automatic"} 0
/ test .* {"ha-mode":"all"} 0
EOT
expect(provider.exists?).to eq(applyto: 'all',
pattern: '.*',
priority: '0',
definition: {
'ha-mode' => 'all',
'ha-sync-mode' => 'automatic'
})
expect(provider.exists?).to eq(applyto: 'all',
pattern: '.*',
priority: '0',
definition: {
'ha-mode' => 'all',
'ha-sync-mode' => 'automatic'
})
end
end

it 'does not match an empty list' do
provider.class.expects(:rabbitmqctl).with('-q', 'status').returns '{rabbit,"RabbitMQ","3.1.5"}'
provider.class.expects(:rabbitmqctl).with('list_policies', '-q', '-p', '/').returns ''
expect(provider.exists?).to eq(nil)
end
Expand Down