From fc541f0e97586f45c45bfd493d32d80ac337b804 Mon Sep 17 00:00:00 2001
From: Scott Wallace <scott@wallace.sh>
Date: Wed, 14 Jun 2023 13:38:00 +0100
Subject: [PATCH] Remove deprecated code (#41)

* Tidy typing

* Remove deprecated code (and non-standard dependency)
---
 bw_add_sshkeys.py | 43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/bw_add_sshkeys.py b/bw_add_sshkeys.py
index 8d10258..0a8320e 100755
--- a/bw_add_sshkeys.py
+++ b/bw_add_sshkeys.py
@@ -8,16 +8,14 @@ import json
 import logging
 import os
 import subprocess
-from typing import Any, Callable, Dict, List, Optional
-
-from pkg_resources import parse_version
+from typing import Any, Callable
 
 
 def memoize(func: Callable[..., Any]) -> Callable[..., Any]:
     """
     Decorator function to cache the results of another function call
     """
-    cache: Dict[Any, Callable[..., Any]] = {}
+    cache: dict[Any, Callable[..., Any]] = {}
 
     def memoized_func(*args: Any) -> Any:
         if args in cache:
@@ -29,33 +27,6 @@ def memoize(func: Callable[..., Any]) -> Callable[..., Any]:
     return memoized_func
 
 
-@memoize
-def bwcli_version() -> str:
-    """
-    Function to return the version of the Bitwarden CLI
-    """
-    proc_version = subprocess.run(
-        ["bw", "--version"],
-        stdout=subprocess.PIPE,
-        universal_newlines=True,
-        check=True,
-    )
-    return proc_version.stdout
-
-
-@memoize
-def cli_supports(feature: str) -> bool:
-    """
-    Function to return whether the current Bitwarden CLI supports a particular
-    feature
-    """
-    version = parse_version(bwcli_version())
-
-    if feature == "nointeraction" and version >= parse_version("1.9.0"):
-        return True
-    return False
-
-
 def get_session(session: str) -> str:
     """
     Function to return a valid Bitwarden session
@@ -119,7 +90,7 @@ def get_folders(session: str, foldername: str) -> str:
     return str(folders[0]["id"])
 
 
-def folder_items(session: str, folder_id: str) -> List[Dict[str, Any]]:
+def folder_items(session: str, folder_id: str) -> list[dict[str, Any]]:
     """
     Function to return items from a folder
     """
@@ -133,14 +104,14 @@ def folder_items(session: str, folder_id: str) -> List[Dict[str, Any]]:
         encoding="utf-8",
     )
 
-    data: List[Dict[str, Any]] = json.loads(proc_items.stdout)
+    data: list[dict[str, Any]] = json.loads(proc_items.stdout)
 
     return data
 
 
 def add_ssh_keys(
     session: str,
-    items: List[Dict[str, Any]],
+    items: list[dict[str, Any]],
     keyname: str,
     pwkeyname: str,
 ) -> None:
@@ -162,7 +133,7 @@ def add_ssh_keys(
             continue
         logging.debug("Private key file declared")
 
-        private_key_pw = None
+        private_key_pw = ""
         try:
             private_key_pw = [
                 k["value"] for k in item["fields"] if k["name"] == pwkeyname
@@ -196,7 +167,7 @@ def add_ssh_keys(
             logging.warning("Could not add key to the SSH agent")
 
 
-def ssh_add(session: str, item_id: str, key_id: str, key_pw: Optional[str]) -> None:
+def ssh_add(session: str, item_id: str, key_id: str, key_pw: str = "") -> None:
     """
     Function to get the key contents from the Bitwarden vault
     """