packaging: setup: Filter from logs secrets from otopi answer files

For details, see oVirt/ovirt-engine#585 .
didib · Aug 24, 2022 · 7fa971b · 7fa971b
1 parent 015cadc
commit 7fa971b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/ovirt-engine-keycloak.spec.in b/ovirt-engine-keycloak.spec.in
@@ -53,7 +53,7 @@ BuildRequires:	python3
 BuildRequires:	python3-devel
 
 Requires:	%{name} >= 15.0.2
-Requires:	ovirt-engine-setup-plugin-ovirt-engine >= 4.5.0
+Requires:	ovirt-engine-setup-plugin-ovirt-engine >= 4.5.3
 Requires:	python%{python3_pkgversion}-ovirt-setup-lib
 
 %description setup

diff --git a/packaging/setup/ovirt_engine_setup/keycloak/constants.py b/packaging/setup/ovirt_engine_setup/keycloak/constants.py
@@ -89,6 +89,7 @@ def KEYCLOAK_DB_ENV_KEYS(self):
             DEK.DUMPER: DBEnv.DUMPER,
             DEK.FILTER: DBEnv.FILTER,
             DEK.RESTORE_JOBS: DBEnv.RESTORE_JOBS,
+            DEK.CREDS_Q_NAME_FUNC: keycloak_question_name,
         }
 
     @classproperty
@@ -151,6 +152,11 @@ def OVIRT_ADMIN_USER(self):
     KEYCLOAK_WRAPPER_SCRIPT = 'OVESETUP_KEYCLOAK_CONFIG/kkWrapperScript'
     KEYCLOAK_ADMIN_CONSOLE_URL= 'OVESETUP_KEYCLOAK_CONFIG/keycloakAdminConsoleUrl'
 
+
+def keycloak_question_name(what):
+    return f'OVESETUP_KEYCLOAK_DB_{what.upper()}'
+
+
 @util.export
 @util.codegen
 @osetupattrsclass
@@ -162,6 +168,7 @@ class DBEnv(object):
             ProvisioningEnv.POSTGRES_PROVISIONING_ENABLED
         ),
         is_secret=True,
+        asked_on=(keycloak_question_name(DEK.PASSWORD),),
     )
     def PASSWORD(self):
         return 'OVESETUP_KEYCLOAK_DB/password'
@@ -214,15 +221,6 @@ def DATABASE(self):
     def USER(self):
         return 'OVESETUP_KEYCLOAK_DB/user'
 
-    @osetupattrs(
-        answerfile=True,
-        answerfile_condition=lambda env: not env.get(
-            ProvisioningEnv.POSTGRES_PROVISIONING_ENABLED
-        ),
-    )
-    def PASSWORD(self):
-        return 'OVESETUP_KEYCLOAK_DB/password'
-
     @osetupattrs(
         answerfile=True,
     )

diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-keycloak/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-keycloak/db/connection.py
@@ -46,7 +46,6 @@ def _customization(self):
             dbenvkeys=okkcons.Const.KEYCLOAK_DB_ENV_KEYS,
         ).getCredentials(
             name='Keycloak',
-            queryprefix='OVESETUP_KEYCLOAK_DB_',
             defaultdbenvkeys=okkcons.Const.DEFAULT_KEYCLOAK_DB_ENV_KEYS,
             show_create_msg=True,
         )