Skip to content

Commit

Permalink
refactor: remove S3_BUCKET_NAME_OVERLAYS (handled by raw-data-api)
Browse files Browse the repository at this point in the history
  • Loading branch information
spwoodcock committed Nov 8, 2023
1 parent 007f1e1 commit a477002
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ S3_ENDPOINT=${S3_ENDPOINT:-"http://s3:9000"}
S3_ACCESS_KEY=${S3_ACCESS_KEY:-"fmtm"}
S3_SECRET_KEY=${S3_SECRET_KEY:-"somelongpassword"}
S3_BUCKET_NAME_BASEMAPS=${S3_BUCKET_NAME_BASEMAPS:-"basemaps"}
S3_BUCKET_NAME_OVERLAYS=${S3_BUCKET_NAME_OVERLAYS:-"overlays"}

### Database (optional) ###
CENTRAL_DB_HOST=${CENTRAL_DB_HOST:-"central-db"}
Expand Down
1 change: 0 additions & 1 deletion src/backend/app/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
S3_ACCESS_KEY: str
S3_SECRET_KEY: str
S3_BUCKET_NAME_BASEMAPS: str = "basemaps"
S3_BUCKET_NAME_OVERLAYS: str = "overlays"

UNDERPASS_API_URL: str = "https://raw-data-api0.hotosm.org/v1"
SENTRY_DSN: Optional[str] = None
Expand Down
5 changes: 3 additions & 2 deletions src/backend/app/s3.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ def startup_init_buckets():

# Init S3 Buckets
client = s3_client()
create_bucket_if_not_exists(client, settings.S3_BUCKET_NAME_BASEMAPS)
create_bucket_if_not_exists(client, settings.S3_BUCKET_NAME_OVERLAYS)
create_bucket_if_not_exists(
client, settings.S3_BUCKET_NAME_BASEMAPS, is_public=True
)


if __name__ == "__main__":
Expand Down

0 comments on commit a477002

Please sign in to comment.