improve configurator

Author: BioWilko

varys/utils.py

@@ -38,39 +38,45 @@ def __init__(self, profile, config_path):
 
                 if self.use_tls:
                     if os.environ.get("VARYS_CA_CERTIFICATE"):
-                        self.ca_certificate = os.environ.get("VARYS_CA_CERTIFICATE")
+                        self.ca_certificate = os.environ["VARYS_CA_CERTIFICATE"]
 
                     if profile_dict.get("ca_certificate"):
-                        self.ca_certificate = profile_dict.get("ca_certificate", None)
+                        self.ca_certificate = profile_dict["ca_certificate"]
 
                     if os.environ.get("VARYS_CLIENT_CERTIFICATE"):
-                        self.client_certificate = os.environ.get("VARYS_CLIENT_CERTIFICATE")
+                        self.client_certificate = os.environ["VARYS_CLIENT_CERTIFICATE"]
 
                     if profile_dict.get("client_certificate"):
                         self.client_certificate = profile_dict["client_certificate"]
 
                     if os.environ.get("VARYS_CLIENT_KEY"):
-                        self.client_key = os.environ.get("VARYS_CLIENT_KEY")
+                        self.client_key = os.environ["VARYS_CLIENT_KEY"]
 
                     if profile_dict.get("client_key"):
                         self.client_key = profile_dict["client_key"]
-                
-                    if not self.ca_certificate or not self.client_certificate or not self.client_key:
+
+                    if (
+                        not self.ca_certificate
+                        or not self.client_certificate
+                        or not self.client_key
+                    ):
                         print(
                             "Varys configuration JSON does not appear to contain the necessary fields for TLS configuration",
                             file=sys.stderr,
                         )
                         sys.exit(11)
-                    
-                    if not os.path.exists(self.ca_certificate) or not os.path.exists(self.client_certificate) or not os.path.exists(self.client_key):
+
+                    if (
+                        not os.path.exists(self.ca_certificate)
+                        or not os.path.exists(self.client_certificate)
+                        or not os.path.exists(self.client_key)
+                    ):
                         print(
                             "Varys configuration JSON does not appear to contain the necessary files for TLS configuration",
                             file=sys.stderr,
                         )
                         sys.exit(11)
 
-                        
-
             except KeyError:
                 print(
                     f"Varys configuration JSON does not appear to contain the necessary fields for profile: {profile}",