Rebase changs -- to be verified

canonical · Oct 13, 2023 · f5ddc6a · f5ddc6a
1 parent 3e5fbea
commit f5ddc6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/lib/charms/mongodb/v0/helpers.py b/lib/charms/mongodb/v0/helpers.py
@@ -7,7 +7,7 @@
 import secrets
 import string
 import subprocess
-from typing import List
+from typing import List, Optional, Union
 
 from charms.mongodb.v0.mongodb import MongoDBConfiguration, MongoDBConnection
 from ops.model import (

diff --git a/src/charm.py b/src/charm.py
@@ -6,7 +6,6 @@
 import logging
 import os
 import pwd
-import re
 import subprocess
 import time
 from pathlib import Path
@@ -73,18 +72,8 @@
 from tenacity import Retrying, before_log, retry, stop_after_attempt, wait_fixed
 
 from config import Config
-from exceptions import (
-    AdminUserCreationError,
-    ApplicationHostNotFoundError,
-    SecretNotAddedError,
-)
-from machine_helpers import MONGO_USER, ROOT_USER_GID, update_mongod_service
 from exceptions import AdminUserCreationError, ApplicationHostNotFoundError
-from machine_helpers import (
-    push_file_to_unit,
-    remove_file_from_unit,
-    update_mongod_service,
-)
+from machine_helpers import MONGO_USER, ROOT_USER_GID, update_mongod_service
 
 logger = logging.getLogger(__name__)
 
@@ -1355,8 +1344,6 @@ def _generate_relation_departed_key(rel_id: int) -> str:
         """Generates the relation departed key for a specified relation id."""
         return f"relation_{rel_id}_departed"
 
-=======
->>>>>>> d20f1d6 (Secret labels)
     # END: helper functions