Fix names of env variables.

backend/moonstreamapi/settings.py

@@ -13,7 +13,15 @@ BUGOUT_SPIRE_URL = os.environ.get("BUGOUT_SPIRE_URL", "https://spire.bugout.dev"
 ENTITY_URL = os.environ.get("ENTITY_URL", "https://api.moonstream.to")
 
 bugout_client = Bugout(brood_api_url=BUGOUT_BROOD_URL, spire_api_url=BUGOUT_SPIRE_URL)
-entity_client = Entity(ENTITY_URL)
+
+# Entity
+
+MOONSTREAM_ENTITY_URL = os.environ.get("MOONSTREAM_ENTITY_URL", "")
+if MOONSTREAM_ENTITY_URL == "":
+    raise ValueError("MOONSTREAM_ENTITY_URL environment variable must be set")
+
+entity_client = Entity(MOONSTREAM_ENTITY_URL)
+
 
 BUGOUT_REQUEST_TIMEOUT_SECONDS = 5
 

crawlers/mooncrawl/mooncrawl/api.py

@@ -34,7 +34,7 @@ from .settings import (
     NB_CONTROLLER_ACCESS_ID,
     ORIGINS,
     LINKS_EXPIRATION_TIME,
-    MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET,
+    MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET,
 )
 from .settings import bugout_client as bc, entity_client as ec
 from .stats_worker import dashboard, queries
@@ -181,13 +181,13 @@ async def status_handler(
                 result_key = f"{MOONSTREAM_S3_SMARTCONTRACTS_ABI_PREFIX}/{dashboard.blockchain_by_subscription_id[subscriprions_type]}/contracts_data/{subscription_entity.address}/{stats_update.dashboard_id}/v1/{timescale}.json"
 
                 object = s3_client.head_object(
-                    Bucket=MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET, Key=result_key
+                    Bucket=MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET, Key=result_key
                 )
 
                 stats_presigned_url = s3_client.generate_presigned_url(
                     "get_object",
                     Params={
-                        "Bucket": MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET,
+                        "Bucket": MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET,
                         "Key": result_key,
                     },
                     ExpiresIn=300,
@@ -204,7 +204,7 @@ async def status_handler(
                 }
             except Exception as err:
                 logger.warning(
-                    f"Can't generate S3 presigned url in stats endpoint for Bucket:{MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET}, Key:{result_key} get error:{err}"
+                    f"Can't generate S3 presigned url in stats endpoint for Bucket:{MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET}, Key:{result_key} get error:{err}"
                 )
 
     return presigned_urls_response

crawlers/mooncrawl/mooncrawl/settings.py

@@ -16,13 +16,12 @@ bugout_client = Bugout(brood_api_url=BUGOUT_BROOD_URL, spire_api_url=BUGOUT_SPIR
 
 # Entity
 
+
 MOONSTREAM_ENTITY_URL = os.environ.get("MOONSTREAM_ENTITY_URL", "")
 if MOONSTREAM_ENTITY_URL == "":
     raise ValueError("MOONSTREAM_ENTITY_URL environment variable must be set")
 
-ENTITY_URL = os.environ.get(MOONSTREAM_ENTITY_URL, "https://api.moonstream.to/entity")
+entity_client = Entity(MOONSTREAM_ENTITY_URL)
-
-entity_client = Entity(ENTITY_URL)
 
 
 BUGOUT_REQUEST_TIMEOUT_SECONDS_RAW = os.environ.get(
@@ -150,12 +149,12 @@ if MOONSTREAM_S3_SMARTCONTRACTS_ABI_PREFIX is None:
         "MOONSTREAM_S3_SMARTCONTRACTS_ABI_PREFIX environment variable must be set"
     )
 
-MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET = os.environ.get(
+MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET = os.environ.get(
-    "MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET"
+    "MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET"
 )
-if MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET is None:
+if MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET is None:
     raise ValueError(
-        "MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET environment variable must be set"
+        "MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET environment variable must be set"
     )
 
 MOONSTREAM_MOONWORM_TASKS_JOURNAL = os.environ.get(

crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py

@@ -33,7 +33,7 @@ from ..settings import (
     MOONSTREAM_ADMIN_ACCESS_TOKEN,
     MOONSTREAM_S3_SMARTCONTRACTS_ABI_PREFIX,
     NB_CONTROLLER_ACCESS_ID,
-    MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET,
+    MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET,
     BUGOUT_RESOURCE_TYPE_ENTITY_SUBSCRIPTION,
 )
 from ..settings import bugout_client as bc, entity_client as ec
@@ -972,7 +972,7 @@ def stats_generate_handler(args: argparse.Namespace):
                                     ],
                                     address=address,
                                     timescale=timescale,
-                                    bucket=MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET,  # type: ignore
+                                    bucket=MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET,  # type: ignore
                                     dashboard_id=dashboard_id,
                                 )
                             except Exception as err:
@@ -1144,7 +1144,7 @@ def stats_generate_api_task(
                         subscription_type_id=subscription_type_id,
                         address=address,
                         timescale=timescale,
-                        bucket=MOONSTREAM_S3_DASHBOARDS_DATA_BUCKET,  # type: ignore
+                        bucket=MOONSTREAM_S3_SMARTCONTRACTS_ABI_BUCKET,  # type: ignore
                         dashboard_id=dashboard.id,
                     )
             except Exception as err: