
Add support for providing additional parameters to be used when constructing the database uri. This change adds an 'extra' parameter which is a hash that will be joined together when constructing the database uri. It should be noted that the charset option, which can be provided as a standalone option, will override charset when passed in the 'extra' parameter. This is to maintain backwards compatibility. Usage Example: os_database_connection({ ... extra => { 'charset' => 'utf-8', 'read_timeout' => 60 } }) Change-Id: I7ef078b76ac6cd7bea42a0ac92b383cefd47167a Co-Authored-By: Alex Schultz <aschultz@mirantis.com>
158 lines
5.2 KiB
Ruby
158 lines
5.2 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'os_database_connection' do
|
|
|
|
it 'refuses String' do
|
|
is_expected.to run.with_params('foo').\
|
|
and_raise_error(Puppet::ParseError, /Requires an hash/)
|
|
end
|
|
|
|
it 'refuses Array' do
|
|
is_expected.to run.with_params(['foo']).\
|
|
and_raise_error(Puppet::ParseError, /Requires an hash/)
|
|
end
|
|
|
|
it 'refuses without at least one argument' do
|
|
is_expected.to run.with_params().\
|
|
and_raise_error(Puppet::ParseError, /Wrong number of arguments/)
|
|
end
|
|
|
|
it 'refuses too many arguments' do
|
|
is_expected.to run.with_params('foo', 'bar').\
|
|
and_raise_error(Puppet::ParseError, /Wrong number of arguments/)
|
|
end
|
|
|
|
it 'refuses extra params passed as String' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'sqlite',
|
|
'database' => '/var/lib/keystone/keystone.db',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'extra' => 'charset=utf-8'
|
|
}).and_raise_error(Puppet::ParseError, /extra should be a Hash/)
|
|
end
|
|
|
|
it 'fails if port is provided with missing host' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'sqlite',
|
|
'database' => '/var/lib/keystone/keystone.db',
|
|
'port' => '3306',
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_raise_error(Puppet::ParseError, /host is required with port/)
|
|
end
|
|
|
|
context 'creates the correct connection URI' do
|
|
|
|
it 'with all parameters' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'username' => 'guest',
|
|
'password' => 's3cr3t',
|
|
'extra' => { 'charset' => 'utf-8', 'read_timeout' => '60' }
|
|
}).and_return('mysql://guest:s3cr3t@127.0.0.1:3306/test?charset=utf-8&read_timeout=60')
|
|
end
|
|
|
|
it 'with all parameters and charset set' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'username' => 'guest',
|
|
'password' => 's3cr3t',
|
|
'charset' => 'utf-8',
|
|
'extra' => { 'charset' => 'latin1', 'read_timeout' => '60' }
|
|
}).and_return('mysql://guest:s3cr3t@127.0.0.1:3306/test?charset=utf-8&read_timeout=60')
|
|
end
|
|
|
|
it 'without port' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'database' => 'test',
|
|
'username' => 'guest',
|
|
'password' => 's3cr3t',
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('mysql://guest:s3cr3t@127.0.0.1/test?charset=utf-8')
|
|
end
|
|
|
|
it 'without host and port' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'sqlite',
|
|
'database' => '/var/lib/keystone/keystone.db',
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('sqlite:////var/lib/keystone/keystone.db?charset=utf-8')
|
|
end
|
|
|
|
it 'without username and password' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('mysql://127.0.0.1:3306/test?charset=utf-8')
|
|
end
|
|
|
|
it 'with username set to undef' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'username' => :undef,
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('mysql://127.0.0.1:3306/test?charset=utf-8')
|
|
end
|
|
|
|
it 'with username set to an empty string' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'username' => '',
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('mysql://127.0.0.1:3306/test?charset=utf-8')
|
|
end
|
|
|
|
it 'without password' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'username' => 'guest',
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('mysql://guest@127.0.0.1:3306/test?charset=utf-8')
|
|
end
|
|
|
|
it 'with password set to undef' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'username' => 'guest',
|
|
'password' => :undef,
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('mysql://guest@127.0.0.1:3306/test?charset=utf-8')
|
|
end
|
|
|
|
it 'with password set to an empty string' do
|
|
is_expected.to run.with_params({
|
|
'dialect' => 'mysql',
|
|
'host' => '127.0.0.1',
|
|
'port' => '3306',
|
|
'database' => 'test',
|
|
'username' => 'guest',
|
|
'password' => '',
|
|
'extra' => { 'charset' => 'utf-8' }
|
|
}).and_return('mysql://guest@127.0.0.1:3306/test?charset=utf-8')
|
|
end
|
|
end
|
|
end
|