From e31ce2b7612d4fd9540afc00b9f4987bf62ebbeb Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Tue, 25 Nov 2025 16:18:41 +0100 Subject: [PATCH] Accept Sensive instead of Sensitive[String] --- manifests/server/db.pp | 2 +- manifests/server/role.pp | 2 +- spec/acceptance/db_deferred_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/server/db.pp b/manifests/server/db.pp index 9542dcc618..8ab28c8900 100644 --- a/manifests/server/db.pp +++ b/manifests/server/db.pp @@ -17,7 +17,7 @@ # @param instance The name of the Postgresql database instance. define postgresql::server::db ( String[1] $user, - Optional[Variant[String, Sensitive[String]]] $password = undef, + Optional[Variant[String, Sensitive]] $password = undef, Optional[String[1]] $comment = undef, String[1] $dbname = $title, Optional[String[1]] $encoding = $postgresql::server::encoding, diff --git a/manifests/server/role.pp b/manifests/server/role.pp index f71ecf599c..b77ac13284 100644 --- a/manifests/server/role.pp +++ b/manifests/server/role.pp @@ -27,7 +27,7 @@ # @param instance The name of the Postgresql database instance. define postgresql::server::role ( Boolean $update_password = true, - Variant[Boolean, String, Sensitive[String]] $password_hash = false, + Variant[Boolean, String, Sensitive] $password_hash = false, Boolean $createdb = false, Boolean $createrole = false, String[1] $db = $postgresql::server::default_database, diff --git a/spec/acceptance/db_deferred_spec.rb b/spec/acceptance/db_deferred_spec.rb index 731e0742b8..0081bd8eac 100644 --- a/spec/acceptance/db_deferred_spec.rb +++ b/spec/acceptance/db_deferred_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper_acceptance' -describe 'postgresql::server::db:' do +describe 'postgresql::server::db' do let(:user) { 'user_test' } let(:password) { 'deferred_password_test' } let(:database) { 'test_database' } @@ -16,7 +16,7 @@ include postgresql::server postgresql::server::db { $database: user => $user, - password => Deferred('unwrap', [$password]), + password => Deferred('unwrap', [Sensitive.new($password)]), } MANIFEST end