From d42fd4cb40e7ac6fd3e8fa1edcb46ecd61173aef Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Wed, 4 Nov 2020 19:18:04 +0100
Subject: [PATCH] Use non-deprecation password function in acceptance tests

700d2c5bb54b7ea91d518de96e2c7a22318d0afa claimed to complete the work
that c3b06d6093b0aab210ec06b11e92a731c608fccd started, but didn't
migrate the acceptance tests. This avoids deprecation warnings in the
output.
---
 spec/acceptance/overridden_settings_spec.rb       | 2 +-
 spec/acceptance/postgresql_conn_validator_spec.rb | 2 +-
 spec/acceptance/server/grant_role_spec.rb         | 4 ++--
 spec/acceptance/server/grant_spec.rb              | 2 +-
 spec/acceptance/server/reassign_owned_by_spec.rb  | 2 +-
 spec/acceptance/server/schema_spec.rb             | 2 +-
 spec/acceptance/sql_task_spec.rb                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/acceptance/overridden_settings_spec.rb b/spec/acceptance/overridden_settings_spec.rb
index b2f26ae632..246180b1b2 100644
--- a/spec/acceptance/overridden_settings_spec.rb
+++ b/spec/acceptance/overridden_settings_spec.rb
@@ -8,7 +8,7 @@
     class { 'postgresql::server':
       roles          => {
         'testusername' => {
-          password_hash => postgresql_password('testusername', 'supersecret'),
+          password_hash => postgresql::postgresql_password('testusername', 'supersecret'),
           createdb      => true,
         },
       },
diff --git a/spec/acceptance/postgresql_conn_validator_spec.rb b/spec/acceptance/postgresql_conn_validator_spec.rb
index 21bf22184b..94101c0911 100644
--- a/spec/acceptance/postgresql_conn_validator_spec.rb
+++ b/spec/acceptance/postgresql_conn_validator_spec.rb
@@ -7,7 +7,7 @@ class { 'postgresql::server':
         postgres_password => 'space password',
       }->
       postgresql::server::role { 'testuser':
-        password_hash => postgresql_password('testuser','test1'),
+        password_hash => postgresql::postgresql_password('testuser','test1'),
       }->
       postgresql::server::database { 'testdb':
         owner   => 'testuser',
diff --git a/spec/acceptance/server/grant_role_spec.rb b/spec/acceptance/server/grant_role_spec.rb
index 9515780847..3b2647550b 100644
--- a/spec/acceptance/server/grant_role_spec.rb
+++ b/spec/acceptance/server/grant_role_spec.rb
@@ -26,7 +26,7 @@ class { 'postgresql::server': }
       }
 
       postgresql::server::role { $user:
-        password_hash => postgresql_password($user, $password),
+        password_hash => postgresql::postgresql_password($user, $password),
       }
 
       postgresql::server::database { $db:
@@ -80,7 +80,7 @@ class { 'postgresql::server': }
       }
 
       postgresql::server::role { $user:
-        password_hash => postgresql_password($user, $password),
+        password_hash => postgresql::postgresql_password($user, $password),
       }
 
       postgresql::server::database { $db:
diff --git a/spec/acceptance/server/grant_spec.rb b/spec/acceptance/server/grant_spec.rb
index 05aef5f6bc..95b31e2f9a 100644
--- a/spec/acceptance/server/grant_spec.rb
+++ b/spec/acceptance/server/grant_spec.rb
@@ -15,7 +15,7 @@
       class { 'postgresql::server': }
 
       postgresql::server::role { $owner:
-        password_hash => postgresql_password($owner, $password),
+        password_hash => postgresql::postgresql_password($owner, $password),
       }
 
       # Since we are not testing pg_hba or any of that, make a local user for ident auth
diff --git a/spec/acceptance/server/reassign_owned_by_spec.rb b/spec/acceptance/server/reassign_owned_by_spec.rb
index cd9059e305..0e1bd8c277 100644
--- a/spec/acceptance/server/reassign_owned_by_spec.rb
+++ b/spec/acceptance/server/reassign_owned_by_spec.rb
@@ -17,7 +17,7 @@
       class { 'postgresql::server': }
 
       postgresql::server::role { $old_owner:
-        password_hash => postgresql_password($old_owner, $password),
+        password_hash => postgresql::postgresql_password($old_owner, $password),
       }
 
       # Since we are not testing pg_hba or any of that, make a local user for ident auth
diff --git a/spec/acceptance/server/schema_spec.rb b/spec/acceptance/server/schema_spec.rb
index fd6d30a597..da813602b5 100644
--- a/spec/acceptance/server/schema_spec.rb
+++ b/spec/acceptance/server/schema_spec.rb
@@ -21,7 +21,7 @@ class { 'postgresql::server': }
       }
 
       postgresql::server::role { $user:
-        password_hash => postgresql_password($user, $password),
+        password_hash => postgresql::postgresql_password($user, $password),
       }
 
       postgresql::server::database { $db:
diff --git a/spec/acceptance/sql_task_spec.rb b/spec/acceptance/sql_task_spec.rb
index 52ebfd4e16..62252cdaa1 100644
--- a/spec/acceptance/sql_task_spec.rb
+++ b/spec/acceptance/sql_task_spec.rb
@@ -7,7 +7,7 @@
         class { 'postgresql::server': } ->
         postgresql::server::db { 'spec1':
           user     => 'root1',
-          password => postgresql_password('root1', 'password'),
+          password => postgresql::postgresql_password('root1', 'password'),
         }
     MANIFEST