From 4ca1c521ef6ba4d5955e3d0baf99298620951a5b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 31 Oct 2023 02:13:53 +0900 Subject: [PATCH] Fix broken unit tests with puppetlabs-postgresql >= v9.2.0 The default password encryption in Ubuntu/Debian has been changed from md5 to scram-sha-256 by [1]. [1] https://github.com/puppetlabs/puppetlabs-postgresql/commit/985309e2df83aa16b1b5430ef1607eca56981de7 Change-Id: I7f1218a3dc1377305b5eb7296b3ef03645f6a085 --- .../openstacklib_db_postgresql_spec.rb | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/spec/defines/openstacklib_db_postgresql_spec.rb b/spec/defines/openstacklib_db_postgresql_spec.rb index 35923c55..feb29f6f 100644 --- a/spec/defines/openstacklib_db_postgresql_spec.rb +++ b/spec/defines/openstacklib_db_postgresql_spec.rb @@ -19,9 +19,18 @@ describe 'openstacklib::db::postgresql' do required_params end + let :password_hash do + case platform_params[:password_encryption] + when 'scram-sha-256' + 'SCRAM-SHA-256$4096:bm92YQ==$LiUdLrky9dt8Js3NPwLr3TrmmuQBa0NG/xmahcp98UM=:dVY0oEQewk/17+9zFMDkBTek1NRyTAt3iyyfLKHIR8M=' + else + 'md557ae0608fad632bf0155cb9502a6b454' + end + end + it { should contain_postgresql__server__db(title).with( :user => title, - :password => 'md557ae0608fad632bf0155cb9502a6b454' + :password => password_hash, )} end @@ -95,6 +104,15 @@ describe 'openstacklib::db::postgresql' do })) end + let :platform_params do + case os[:os]['family'] + when 'Debian' + { :password_encryption => 'scram-sha-256' } + when 'RedHat' + { :password_encryption => 'ms5' } + end + end + it_behaves_like 'openstacklib::db::postgresql examples' end end