Update PKIConfigParser.read_pki_configuration_file()

The PKIConfigParser.read_pki_configuration_file() has been updated to take a user_deployment_cfg param instead of using the global config.user_deployment_cfg.
dogtagpki · May 30, 2024 · 7141dd7 · 7141dd7
1 parent 76fc0be
commit 7141dd7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
@@ -500,11 +500,11 @@ def read_password(self, message, section=None, key=None,  # noqa: N803
 
         return password
 
-    def read_pki_configuration_file(self):
+    def read_pki_configuration_file(self, user_deployment_cfg):
         """Read configuration file sections into dictionaries"""
         rv = 0
         try:
-            if config.user_deployment_cfg:
+            if user_deployment_cfg:
                 # We don't allow interpolation in password settings, which
                 # means that we need to deal with escaping '%' characters
                 # that might be present.
@@ -525,12 +525,12 @@ def read_pki_configuration_file(self):
                     'pki_token_password')
 
                 print('Loading deployment configuration from ' +
-                      config.user_deployment_cfg + '.')
+                      user_deployment_cfg + '.')
 
-                self.validate_user_config(config.user_deployment_cfg)
+                self.validate_user_config(user_deployment_cfg)
 
-                self.deployer.main_config.read([config.user_deployment_cfg])
-                self.deployer.user_config.read([config.user_deployment_cfg])
+                self.deployer.main_config.read([user_deployment_cfg])
+                self.deployer.user_config.read([user_deployment_cfg])
 
                 # Look through each section and see if any password settings
                 # are present.  If so, escape any '%' characters.
@@ -564,7 +564,7 @@ def read_pki_configuration_file(self):
                             except configparser.NoOptionError:
                                 continue
         except configparser.ParsingError:
-            logger.exception(log.PKI_UNABLE_TO_PARSE_1, config.user_deployment_cfg)
+            logger.exception(log.PKI_UNABLE_TO_PARSE_1, user_deployment_cfg)
             rv = 1
         return rv
 

diff --git a/base/server/python/pki/server/pkidestroy.py b/base/server/python/pki/server/pkidestroy.py
@@ -219,7 +219,7 @@ def main(argv):
                        'v' * args.pki_verbosity)
 
     # Read the specified PKI configuration file.
-    rv = parser.read_pki_configuration_file()
+    rv = parser.read_pki_configuration_file(config.user_deployment_cfg)
     if rv != 0:
         sys.exit(1)
 

diff --git a/base/server/python/pki/server/pkispawn.py b/base/server/python/pki/server/pkispawn.py
@@ -531,7 +531,7 @@ def main(argv):
                        'v' * args.pki_verbosity)
 
     # Read the specified PKI configuration file.
-    rv = parser.read_pki_configuration_file()
+    rv = parser.read_pki_configuration_file(config.user_deployment_cfg)
     if rv != 0:
         sys.exit(1)