fix: dotenv error (#962)

integration_tests/automatic_setup.sh

@@ -130,7 +130,7 @@ wait_for_pod_initialization
 wait_for_sc4snmp_pods_to_be_up
 check_metallb_status
 
-if [ $1 == 'integration' ]; then
+if [[ $1 == 'integration' ]]; then
   define_python
   deploy_poetry
 fi

splunk_connect_for_snmp/celery_config.py

@@ -18,7 +18,7 @@
 
 from kombu import Queue
 
-with suppress(ImportError):
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()

splunk_connect_for_snmp/common/collection_manager.py

@@ -1,17 +1,16 @@
 import os
 from abc import abstractmethod
+from contextlib import suppress
 
 import yaml
 from celery.utils.log import get_task_logger
 
 from splunk_connect_for_snmp.common.hummanbool import human_bool
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
 
 CONFIG_PATH = os.getenv("CONFIG_PATH", "/app/config/config.yaml")
 CONFIG_FROM_MONGO = human_bool(os.getenv("CONFIG_FROM_MONGO", "false").lower())

splunk_connect_for_snmp/common/custom_translations.py

@@ -14,15 +14,14 @@
 # limitations under the License.
 #
 import os
+from contextlib import suppress
 
 import yaml
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
 
 CONFIG_PATH = os.getenv("CONFIG_PATH", "/app/config/config.yaml")
 

splunk_connect_for_snmp/common/inventory_processor.py

@@ -1,5 +1,6 @@
 import copy
 import os
+from contextlib import suppress
 from csv import DictReader
 from typing import List
 
@@ -11,13 +12,10 @@
 from splunk_connect_for_snmp.common.task_generator import WalkTaskGenerator
 from splunk_connect_for_snmp.poller import app
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
-
 
 CONFIG_PATH = os.getenv("CONFIG_PATH", "/app/config/config.yaml")
 INVENTORY_PATH = os.getenv("INVENTORY_PATH", "/app/inventory/inventory.csv")

splunk_connect_for_snmp/enrich/tasks.py

@@ -14,17 +14,16 @@
 # limitations under the License.
 #
 import time
+from contextlib import suppress
 
 from pymongo import UpdateOne
 
 from splunk_connect_for_snmp import customtaskmanager
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
 
 import os
 

splunk_connect_for_snmp/inventory/loader.py

@@ -17,6 +17,7 @@
 import logging
 import os
 import sys
+from contextlib import suppress
 from csv import DictReader
 
 import pymongo
@@ -40,12 +41,10 @@
 from splunk_connect_for_snmp.common.inventory_record import InventoryRecord
 from splunk_connect_for_snmp.common.schema_migration import migrate_database
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
 
 formatter = CustomisedJSONFormatter()
 

splunk_connect_for_snmp/inventory/tasks.py

@@ -14,19 +14,19 @@
 # limitations under the License.
 #
 import typing
+from contextlib import suppress
 
 from splunk_connect_for_snmp.snmp.manager import get_inventory
 
 from ..common.collection_manager import ProfilesManager
 from ..common.task_generator import PollTaskGenerator
 from .loader import transform_address_to_key
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
+
 import os
 import re
 

splunk_connect_for_snmp/poller.py

@@ -17,7 +17,7 @@
 # Support use of .env file for developers
 from contextlib import suppress
 
-with suppress(ImportError):
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()

splunk_connect_for_snmp/snmp/manager.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 import typing
+from contextlib import suppress
 
 from pysnmp.proto.errind import EmptyResponse
 from pysnmp.smi import error
@@ -23,12 +24,11 @@
 from splunk_connect_for_snmp.inventory.loader import transform_address_to_key
 from splunk_connect_for_snmp.snmp.varbinds_resolver import ProfileCollection
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
+
 import csv
 import os
 import time

splunk_connect_for_snmp/snmp/tasks.py

@@ -20,12 +20,10 @@
 
 from splunk_connect_for_snmp.snmp.exceptions import SnmpActionError
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
 
 import os
 import socket

splunk_connect_for_snmp/splunk/tasks.py

@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from contextlib import suppress
+
 from splunk_connect_for_snmp.common.custom_translations import load_custom_translations
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
 
 import json
 import os

splunk_connect_for_snmp/traps.py

@@ -14,17 +14,16 @@
 # limitations under the License.
 #
 import logging
+from contextlib import suppress
 
 from pysnmp.proto.api import v2c
 
 from splunk_connect_for_snmp.snmp.auth import get_secret_value
 
-try:
+with suppress(ImportError, OSError):
     from dotenv import load_dotenv
 
     load_dotenv()
-except OSError:
-    pass
 
 import asyncio
 import os