AWS Secrets Handling

hyp3rd · Jan 3, 2024 · fb5058d · fb5058d
1 parent fae228c
commit fb5058d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/release.py b/release.py
@@ -9,5 +9,5 @@
 
 __metaclass__ = type  # pylint: disable=invalid-name
 
-__version__ = "v0.1.8"
+__version__ = "v0.1.9"
 __author__ = "F."
diff --git a/tracker/config/config.py b/tracker/config/config.py
@@ -47,21 +47,19 @@ def _load_config(self):
 
         self._update_threshold = int(os.getenv("UPDATE_THRESHOLD", "5"))
 
+        self._telegram_token = os.getenv("TELEGRAM_TOKEN")
+        self._etherscan_api_key = os.getenv("ETHERSCAN_API_KEY")
+
         if AWSUtils.is_aws_environment():
-            _telegram_token_secret = AWSUtils.get_secret_value(
-                "prod/telegram-gas-tracker/TELEGRAM_TOKEN"
-            )
-            self._telegram_token = AWSUtils.get_secret_value(_telegram_token_secret)
-
-            _etherscan_api_key_secret = AWSUtils.get_secret_value(
-                "prod/telegram-gas-tracker/ETHERSCAN_API_KEY"
-            )
-            self._etherscan_api_key = AWSUtils.get_secret_value(
-                _etherscan_api_key_secret
-            )
-        else:
-            self._telegram_token = os.getenv("TELEGRAM_TOKEN")
-            self._etherscan_api_key = os.getenv("ETHERSCAN_API_KEY")
+            # _telegram_token_secret = AWSUtils.get_secret_value(
+            #     "prod/telegram-gas-tracker/TELEGRAM_TOKEN"
+            # )
+            self._telegram_token = AWSUtils.get_secret_value(self._telegram_token)
+
+            # _etherscan_api_key_secret = AWSUtils.get_secret_value(
+            #     "prod/telegram-gas-tracker/ETHERSCAN_API_KEY"
+            # )
+            self._etherscan_api_key = AWSUtils.get_secret_value(self._etherscan_api_key)
 
         self._telegram_api_url = f"https://api.telegram.org/bot{self._telegram_token}/"
         self._etherscan_api_url = (