diff --git a/.env.example b/.env.example index ed01590e..f45821c3 100644 --- a/.env.example +++ b/.env.example @@ -29,8 +29,8 @@ JSON_LOGS=false # Set to 'true' for JSON-formatted logs (recommended for produc # UPSTASH_REDIS_TOKEN=your-redis-token # S3 Assets Configuration -CRITERIA_ASSETS_BUCKET_NAME=autograder-assets -CRITERIA_ASSETS_IN_MEMORY_CACHE_LIMIT=100 +EXTERNAL_ASSETS_BUCKET_NAME=autograder-assets +EXTERNAL_ASSETS_IN_MEMORY_CACHE_LIMIT=100 AWS_ACCESS_KEY_ID=test AWS_SECRET_ACCESS_KEY=test AWS_REGION=us-east-1 diff --git a/autograder/services/assets/resolver.py b/autograder/services/assets/resolver.py index 2e8d62ac..b09fb6ea 100644 --- a/autograder/services/assets/resolver.py +++ b/autograder/services/assets/resolver.py @@ -10,7 +10,7 @@ class AssetSourceResolver: def __init__(self): - in_memory_limit = int(os.getenv("CRITERIA_ASSETS_IN_MEMORY_CACHE_LIMIT", "100")) + in_memory_limit = int(os.getenv("EXTERNAL_ASSETS_IN_MEMORY_CACHE_LIMIT", "100")) self.cache_manager = AssetCacheManager(in_memory_limit=in_memory_limit) self.provider = S3AssetProvider(self.cache_manager) diff --git a/autograder/services/assets/s3_provider.py b/autograder/services/assets/s3_provider.py index 75f498d2..4f3b3a5c 100644 --- a/autograder/services/assets/s3_provider.py +++ b/autograder/services/assets/s3_provider.py @@ -13,7 +13,7 @@ def __init__(self, cache_manager: AssetCacheManager): self.cache_manager = cache_manager # Environment variables - self.bucket_name = os.getenv("CRITERIA_ASSETS_BUCKET_NAME") + self.bucket_name = os.getenv("EXTERNAL_ASSETS_BUCKET_NAME") self.access_key = os.getenv("AWS_ACCESS_KEY_ID") or os.getenv("AWS_ACCESS_ID") self.secret_key = os.getenv("AWS_SECRET_ACCESS_KEY") self.region = os.getenv("AWS_REGION", "us-east-1") diff --git a/docker-compose.yml b/docker-compose.yml index 727ce6b3..8e15deff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: API_PORT: 8000 # S3 Assets Configuration - CRITERIA_ASSETS_BUCKET_NAME: autograder-assets + EXTERNAL_ASSETS_BUCKET_NAME: autograder-assets AWS_ACCESS_ID: test AWS_SECRET_ACCESS_KEY: test AWS_REGION: us-east-1 diff --git a/docs/features/setup_config_feature.md b/docs/features/setup_config_feature.md index 97925fbf..c57d32df 100644 --- a/docs/features/setup_config_feature.md +++ b/docs/features/setup_config_feature.md @@ -65,7 +65,7 @@ Assets are resolved and injected **before** language-specific setup commands run For asset injection to work, the autograder API must be configured with S3 credentials. In a development environment using the provided `docker-compose.yml`, this is handled by the `ministack` service. Required environment variables: -- `CRITERIA_ASSETS_BUCKET_NAME`: The name of the S3 bucket. +- `EXTERNAL_ASSETS_BUCKET_NAME`: The name of the S3 bucket. - `S3_ENDPOINT_URL`: The URL of the S3 service (e.g., `http://ministack:4566`). - `AWS_ACCESS_ID` & `AWS_SECRET_ACCESS_KEY`: Credentials for the S3 provider.