- Removed resolved TODO annotations.

Author: rvelaVenafi

vcert/common.py

@@ -67,13 +67,13 @@ class ScopeAction(Enum):
 # Configuration Management scope
 _SCOPE_CFG = f"{Scope.CONFIGURATION.value}:{ScopeAction.MANAGE.value}"
 # Certificate Management scope
-SCOPE_CM = f"{Scope.CERTIFICATE.value}:{ScopeAction.MANAGE.value},{ScopeAction.REVOKE.value}"  # TODO: REMOVE 'certificate:manage,revoke'  # type: str
+SCOPE_CM = f"{Scope.CERTIFICATE.value}:{ScopeAction.MANAGE.value},{ScopeAction.REVOKE.value}"
 # Policy Management scope
-SCOPE_PM = f"{Scope.CERTIFICATE.value}:{ScopeAction.MANAGE.value};{_SCOPE_CFG}"  # TODO: REMOVE 'certificate:manage;configuration:manage'  # type: str
+SCOPE_PM = f"{Scope.CERTIFICATE.value}:{ScopeAction.MANAGE.value};{_SCOPE_CFG}"
 # SSH Certificate Management scope
-SCOPE_SSH = f"{Scope.SSH.value}:{ScopeAction.MANAGE.value}"  # TODO: REMOVE 'ssh:manage'  # type: str
+SCOPE_SSH = f"{Scope.SSH.value}:{ScopeAction.MANAGE.value}"
 # Full Management scope
-SCOPE_FULL = f"{SCOPE_CM};{_SCOPE_CFG};{SCOPE_SSH}"  # TODO: REMOVE 'certificate:manage,revoke;configuration:manage;ssh:manage'  # type: str
+SCOPE_FULL = f"{SCOPE_CM};{_SCOPE_CFG};{SCOPE_SSH}"
 
 
 class CertField:

vcert/pem.py

@@ -82,7 +82,7 @@ def full_chain(self):
         if not self.chain:
             return self.cert
         full_chain = "\n".join(self.chain)
-        return f"{self.cert}\n{full_chain}"  # TODO: REMOVE self.cert + "\n" + "\n".join(self.chain)
+        return f"{self.cert}\n{full_chain}"
 
     def as_pkcs12(self, passphrase=None):
         """

vcert/ssh_utils.py

@@ -23,7 +23,7 @@
 from .errors import ClientBadData, ServerUnexptedBehavior
 
 PATH_SEPARATOR = "\\"
-CA_ROOT_PATH = f"{PATH_SEPARATOR}VED{PATH_SEPARATOR}Certificate Authority{PATH_SEPARATOR}SSH{PATH_SEPARATOR}Templates"  # TODO: REMOVE PATH_SEPARATOR + "VED" + PATH_SEPARATOR + "Certificate Authority" + PATH_SEPARATOR + "SSH" + PATH_SEPARATOR + "Templates"
+CA_ROOT_PATH = f"{PATH_SEPARATOR}VED{PATH_SEPARATOR}Certificate Authority{PATH_SEPARATOR}SSH{PATH_SEPARATOR}Templates"
 DEFAULT_SSH_KEY_SIZE = 3072
 F_P_DETAILS = 'ProcessingDetails'
 
@@ -84,7 +84,7 @@ def get_public_key_data(self):
             return None
         temp = self._public_key_data.rstrip("\r\n")
         if self.key_id:
-            return f"{temp} {self.key_id}"  # TODO: REMOVE "%s %s" % (temp, self.key_id)
+            return f"{temp} {self.key_id}"
         else:
             return temp