Bump libs and migrate resotolib -> fixlib

fixca/__main__.py

@@ -1,12 +1,12 @@
 import os
 import sys
-import resotolib.proc
+import fixlib.proc
 from signal import SIGTERM
 from tempfile import TemporaryDirectory
-from resotolib.logger import log, setup_logger, add_args as logging_add_args
-from resotolib.web import WebServer
-from resotolib.event import EventType, add_event_listener
-from resotolib.x509 import gen_csr, gen_rsa_key, write_cert_to_file, write_key_to_file
+from fixlib.logger import log, setup_logger, add_args as logging_add_args
+from fixlib.web import WebServer
+from fixlib.event import EventType, add_event_listener
+from fixlib.x509 import gen_csr, gen_rsa_key, write_cert_to_file, write_key_to_file
 from .args import parse_args
 from .ca import CA, WebApp, CaApp
 from threading import Event
@@ -25,8 +25,8 @@ def main() -> None:
     setup_logger("fixca")
     args = parse_args([logging_add_args])  # type: ignore
     log.info(f"Starting FIX CA on port {args.port}")
-    resotolib.proc.initializer()
-    resotolib.proc.parent_pid = os.getpid()
+    fixlib.proc.initializer()
+    fixlib.proc.parent_pid = os.getpid()
 
     add_event_listener(EventType.SHUTDOWN, shutdown)
 
@@ -71,7 +71,7 @@ def main() -> None:
         shutdown_event.wait()
         web_server.shutdown()
 
-    resotolib.proc.kill_children(SIGTERM, ensure_death=True)
+    fixlib.proc.kill_children(SIGTERM, ensure_death=True)
     log.info("Shutdown complete")
     sys.exit(0)
 

fixca/args.py

@@ -1,6 +1,6 @@
 import os
 from argparse import ArgumentParser, Namespace
-from resotolib.args import ArgumentParser as ResotoArgumentParser
+from fixlib.args import ArgumentParser as ResotoArgumentParser
 from typing import Callable, List, Union
 
 

fixca/ca.py

@@ -5,8 +5,8 @@
 from typing import Optional, Dict, Callable, Tuple, Union, Any, List
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
 from cryptography.x509.base import Certificate, CertificateSigningRequest
-from resotolib.logger import log
-from resotolib.x509 import (
+from fixlib.logger import log
+from fixlib.x509 import (
     bootstrap_ca,
     sign_csr,
     cert_to_bytes,
@@ -19,7 +19,7 @@
     gen_csr,
     gen_ca_bundle_bytes,
 )
-from resotolib.jwt import encode_jwt, decode_jwt_from_headers
+from fixlib.jwt import encode_jwt, decode_jwt_from_headers
 from .k8s import get_secret, set_secret, get_namespaces
 from .utils import str_to_bool
 

fixca/k8s.py

@@ -1,7 +1,7 @@
 import sys
 import base64
 from typing import Optional
-from resotolib.logger import log
+from fixlib.logger import log
 from kubernetes import client, config
 from kubernetes.client.exceptions import ApiException
 from kubernetes.client.models.v1_namespace_list import V1NamespaceList

pyproject.toml

@@ -29,7 +29,7 @@ keywords = ["cloud security"]
 
 dependencies = [
     "cryptography",
-    "resotolib",
+    "fixinventorylib",
     "kubernetes",
 ]