Unverified Commit 7abd60f6 authored by Michael Klishin's avatar Michael Klishin

Merge branch 'dud225-backslash_fix' into v5.x

parents 06ff4148 21dda41f
......@@ -70,7 +70,7 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
# export RABBITMQ_VERSION="3.7.14-alpha.11"
version: <%= ENV['RABBITMQ_VERSION'] %>
......@@ -90,7 +90,7 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "23.0.2"
version: "23.0.3"
# export RABBITMQ_VERSION="3.7.13-alpha.21"
version: <%= ENV['RABBITMQ_VERSION'] %>
......@@ -109,7 +109,7 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
# export RABBITMQ_VERSION="3.8.6-alpha.21"
version: <%= ENV['RABBITMQ_VERSION'] %>
......
......@@ -154,9 +154,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-2"
version: "1:23.0.3-2"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
virtualhosts:
- vhost1
- vhost2
......@@ -197,9 +197,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/management_plugin
......@@ -214,9 +214,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
systemd:
limits:
NOFILE: 54000
......@@ -285,9 +285,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "23.0.2-1"
version: "23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -302,8 +302,8 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "22.3.4"
version: "3.8.5"
version: "22.3.4.10"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -318,9 +318,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "23.0.2-1"
version: "23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
systemd:
limits:
NOFILE: 54000
......@@ -337,9 +337,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -354,9 +354,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -371,9 +371,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "23.0.2-1"
version: "23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -388,9 +388,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
attributes:
apt:
confd:
......@@ -399,9 +399,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -419,9 +419,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -442,7 +442,7 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_deb
......@@ -457,8 +457,8 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "1:22.3.4.4-1"
version: "3.8.5"
version: "1:22.3.4.10.4-1"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/pinned_deb
......@@ -476,7 +476,7 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_rpm
......@@ -495,7 +495,7 @@ suites:
yum:
baseurl: https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/23/el/8
repo_gpgcheck: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/pinned_rpm
......@@ -512,7 +512,7 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_rpm
......@@ -527,11 +527,11 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "22.3.4.4"
version: "22.3.4.10.4"
yum:
baseurl: https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/7
repo_gpgcheck: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/pinned_rpm
......@@ -549,7 +549,7 @@ suites:
yum:
baseurl: https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/23/el/6
repo_gpgcheck: false
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_rpm
......@@ -564,11 +564,11 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "22.3.4.4"
version: "22.3.4.10.4"
yum:
baseurl: https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/6
repo_gpgcheck: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/pinned_rpm
......@@ -585,7 +585,7 @@ suites:
enabled: true
zypper:
baseurl: https://download.opensuse.org/repositories/network:/messaging:/amqp/openSUSE_Leap_15.1/
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_rpm
......
......@@ -40,9 +40,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
virtualhosts:
- vhost1
- vhost2
......@@ -83,9 +83,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/management_plugin
......@@ -100,9 +100,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
systemd:
limits:
NOFILE: 54000
......@@ -171,9 +171,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "23.0.2-1"
version: "23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -187,8 +187,8 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "22.3.4.4"
version: "3.8.5"
version: "22.3.4.10.4"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -204,9 +204,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "23.0.2-1"
version: "23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
systemd:
limits:
NOFILE: 54000
......@@ -223,9 +223,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -240,9 +240,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -257,9 +257,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "23.0.2-1"
version: "23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -274,9 +274,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
attributes:
apt:
confd:
......@@ -285,9 +285,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -305,9 +305,9 @@ suites:
erlang:
install_method: "esl"
esl:
version: "1:23.0.2-1"
version: "1:23.0.3-1"
rabbitmq:
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/integration/default
......@@ -328,7 +328,7 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_deb
......@@ -343,8 +343,8 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "1:22.2-1"
version: "3.8.5"
version: "1:22.3.4.10.10-1"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/pinned_deb
......@@ -361,7 +361,7 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_rpm
......@@ -380,7 +380,7 @@ suites:
yum:
baseurl: https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/23/el/8
repo_gpgcheck: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/pinned_rpm
......@@ -398,7 +398,7 @@ suites:
yum:
baseurl: https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/23/el/6
repo_gpgcheck: false
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_rpm
......@@ -413,11 +413,11 @@ suites:
rabbitmq:
erlang:
enabled: true
version: "22.3.4.4"
version: "22.3.4.10.4"
yum:
baseurl: https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/6
repo_gpgcheck: true
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/pinned_rpm
......@@ -434,7 +434,7 @@ suites:
enabled: true
zypper:
baseurl: https://download.opensuse.org/repositories/network:/messaging:/amqp/openSUSE_Leap_15.1
version: "3.8.5"
version: "3.8.8"
verifier:
inspec_tests:
- test/erlang_package/latest_rpm
......
......@@ -176,19 +176,19 @@ Note that Erlang Solutions repositories can be behind the latest Erlang/OTP patc
node['erlang']['install_method'] = "esl"
```
to provision a specific version, e.g. `22.3.4.4`:
to provision a specific version, e.g. `22.3.4.10.4`:
``` ruby
node['erlang']['install_method'] = "esl"
# Ubuntu and Debian
# note the "1:" package epoch prefix
node['erlang']['esl']['version'] = "1:22.3.4.4"
node['erlang']['esl']['version'] = "1:22.3.4.10.4"
```
``` ruby
node['erlang']['install_method'] = "esl"
# CentOS, RHEL, Fedora
node['erlang']['esl']['version'] = "22.3.4.4-1"
node['erlang']['esl']['version'] = "22.3.4.10.4-1"
```
### Seting RabbitMQ Version
......@@ -196,7 +196,7 @@ node['erlang']['esl']['version'] = "22.3.4.4-1"
Set `node['rabbitmq']['version']` to specify a version:
``` ruby
node['rabbitmq']['version'] = "3.8.5"
node['rabbitmq']['version'] = "3.8.8"
```
If you have `node['rabbitmq']['deb_package_url']` or `node['rabbitmq']['rpm_package_url']` overridden
......@@ -251,10 +251,10 @@ To override package version, use `node['rabbitmq']['erlang']['version']`:
``` ruby
# Debian
node['rabbitmq']['erlang']['version'] = '1:22.3.4.4-1'
node['rabbitmq']['erlang']['version'] = '1:22.3.4.10.4-1'
# RPM
node['rabbitmq']['erlang']['version'] = '22.3.4.4'
node['rabbitmq']['erlang']['version'] = '22.3.4.10.4'
```
On Ubuntu and Debian the distribution will be picked from node attributes.
......@@ -307,19 +307,19 @@ The Erlang cookbook will provision packages from Erlang Solutions if `node['erla
node['erlang']['install_method'] = "esl"
```
to provision a specific version, e.g. `22.3.4.4`:
to provision a specific version, e.g. `22.3.4.10.4`:
``` ruby
node['erlang']['install_method'] = "esl"
# Ubuntu and Debian
# note the "1:" package epoch prefix
node['erlang']['esl']['version'] = "1:22.3.4.4"
node['erlang']['esl']['version'] = "1:22.3.4.10.4"
```
``` ruby
node['erlang']['install_method'] = "esl"
# CentOS, RHEL, Fedora
node['erlang']['esl']['version'] = "22.3.4.4-1"
node['erlang']['esl']['version'] = "22.3.4.10.4-1"
```
### Seting RabbitMQ Version
......@@ -327,7 +327,7 @@ node['erlang']['esl']['version'] = "22.3.4.4-1"
Set `node['rabbitmq']['version']` to specify a version:
``` ruby
node['rabbitmq']['version'] = "3.7.26"
node['rabbitmq']['version'] = "3.7.28"
```
If you have `node['rabbitmq']['deb_package_url']` or `node['rabbitmq']['rpm_package_url']` overridden
......
# frozen_string_literal: true
# Version to install
default['rabbitmq']['version'] = '3.7.26'
default['rabbitmq']['version'] = '3.7.28'
# When true, distribution-provided package will be used.
# This may be useful e.g. on old distributions.
......
......@@ -82,7 +82,7 @@ def user_has_expected_permissions?(name, vhost, perm_list = nil)
return true
end
# existing match search
if perm_list == cmd.stdout.split.drop(1)
if perm_list == %(\"#{cmd.stdout}\").undump.split.drop(1)
Chef::Log.debug 'rabbitmq_user_has_expected_permissions?: matching permissions already found'
return true
end
......
......@@ -23,7 +23,7 @@ describe 'rabbitmq::community_plugins' do
:source => download_url,
:owner => 'rabbitmq',
:group => 'rabbitmq',
:mode => 0644
:mode => '644'
)
end
......
......@@ -4,7 +4,7 @@ require 'spec_helper'
describe 'rabbitmq::default' do
let(:runner) do
ChefSpec::ServerRunner.new(REDHAT_OPTS) do |node, _|
node.override['rabbitmq']['version'] = '3.7.26'
node.override['rabbitmq']['version'] = '3.7.28'
end
end
let(:node) { runner.node }
......@@ -29,7 +29,7 @@ describe 'rabbitmq::default' do
:user => 'root',
:group => 'root',
:source => 'rabbitmq-env.conf.erb',
:mode => 00644)
:mode => '644')
end
it 'has no erl args by default' do
......@@ -109,7 +109,7 @@ describe 'rabbitmq::default' do
describe 'when Erlang is provisioned from ESL' do
let(:runner) do
ChefSpec::ServerRunner.new(REDHAT_OPTS) do |node, _|
node.override['rabbitmq']['version'] = '3.7.26'
node.override['rabbitmq']['version'] = '3.7.28'
node.override['rabbitmq']['erlang']['enabled'] = false
end
end
......@@ -128,7 +128,7 @@ describe 'rabbitmq::default' do
:user => 'root',
:group => 'root',
:source => 'default.rabbitmq-server.erb',
:mode => 00644
:mode => '644'
)
end
......@@ -137,7 +137,7 @@ describe 'rabbitmq::default' do
:user => 'root',
:group => 'root',
:source => 'rabbitmq.config.erb',
:mode => 00644)
:mode => '644')
if Gem::Version.new(Chef::VERSION.to_s) >= Gem::Version.new('11.14.2')
expect(chef_run).to create_template('/etc/rabbitmq/rabbitmq.config').with(:sensitive => true)
......@@ -262,7 +262,7 @@ describe 'rabbitmq::default' do
describe 'suse' do
let(:runner) do
ChefSpec::ServerRunner.new(SUSE_OPTS) do |node, _|
node.override['rabbitmq']['version'] = '3.7.26'
node.override['rabbitmq']['version'] = '3.7.28'
end
end
let(:node) { runner.node }
......@@ -290,12 +290,12 @@ describe 'rabbitmq::default' do
describe 'ubuntu' do
let(:runner) do
ChefSpec::ServerRunner.new(UBUNTU_OPTS) do |node, _|
node.override['rabbitmq']['version'] = '3.7.26'
node.override['rabbitmq']['version'] = '3.7.28'
end
end
let(:node) { runner.node }
let(:chef_run) do
node.override['rabbitmq']['version'] = '3.7.26'
node.override['rabbitmq']['version'] = '3.7.28'
runner.converge(described_recipe)
end
......@@ -315,7 +315,7 @@ describe 'rabbitmq::default' do
end
it 'creates a rabbitmq-server deb in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server_3.7.26-1_all.deb')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server_3.7.28-1_all.deb')
end
it 'installs the rabbitmq-server deb_package with the default action' do
......@@ -327,7 +327,7 @@ describe 'rabbitmq::default' do
:user => 'root',
:group => 'root',
:source => 'default.rabbitmq-server.erb',
:mode => 00644)
:mode => '644')
end
describe 'uses distro version' do
......@@ -348,7 +348,7 @@ describe 'rabbitmq::default' do
describe 'redhat' do
let(:runner) do
ChefSpec::ServerRunner.new(REDHAT_OPTS) do |node, _|
node.override['rabbitmq']['version'] = '3.7.26'
node.override['rabbitmq']['version'] = '3.7.28'
end
end
let(:node) { runner.node }
......@@ -356,7 +356,7 @@ describe 'rabbitmq::default' do
runner.converge(described_recipe)
end
let(:rpm_file) { 'rabbitmq-server-3.7.26-1.el7.noarch.rpm' }
let(:rpm_file) { 'rabbitmq-server-3.7.28-1.el7.noarch.rpm' }
it 'creates a rabbitmq-server rpm in the cache path' do
expect(chef_run).to create_remote_file_if_missing("/tmp/#{rpm_file}")
......@@ -407,7 +407,7 @@ describe 'rabbitmq::default' do
describe 'CentOS 7' do
let(:runner) do
ChefSpec::ServerRunner.new(CENTOS7_OPTS) do |node, _|
node.override['rabbitmq']['version'] = '3.7.26'
node.override['rabbitmq']['version'] = '3.7.28'
node.override['rabbitmq']['use_distro_version'] = false
end
end
......@@ -416,7 +416,7 @@ describe 'rabbitmq::default' do
runner.converge(described_recipe)
end
let(:rpm_file) { 'rabbitmq-server-3.7.26-1.el7.noarch.rpm' }
let(:rpm_file) { 'rabbitmq-server-3.7.28-1.el7.noarch.rpm' }
it 'should install the logrotate package' do