Skip to content

TEMP: sketch on api.tf on what common variables to vendorize and where to pass #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yarikoptic wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

TEMP: sketch on api.tf on what common variables to vendorize and where to pass #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions terraform/api.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,16 @@ module "api" {
heroku_web_dyno_quantity = 3
heroku_worker_dyno_quantity = 1

django_default_from_email = "admin@api.dandiarchive.org"
django_cors_origin_whitelist = ["https://dandiarchive.org", "https://neurosift.app"]
# TODO: move to variables.tf?
dandi_instance_name = "dandi"
dandi_instance_tld = "dandiarhive.org"
dandi_instance_datacite_id = "48324"
Copy link
Member Author

@yarikoptic yarikoptic May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those likely should be moved out into terraform/variables.tf


# TODO: could we define for reuse below?
dandi_instance_url = "https://${var.dandi_instance_tld}"

django_default_from_email = "admin@api.${dandi_instance_tld}"
django_cors_origin_whitelist = [dandi_instance_url, "https://neurosift.app"]
django_cors_origin_regex_whitelist = ["^https:\\/\\/[0-9a-z\\-]+--gui-dandiarchive-org\\.netlify\\.app$"]

additional_django_vars = {
Expand All @@ -34,16 +42,18 @@ module "api" {
DJANGO_DANDI_DANDISETS_EMBARGO_LOG_BUCKET_NAME = module.sponsored_embargo_bucket.log_bucket_name
DJANGO_DANDI_DOI_API_URL = "https://api.datacite.org/dois"
DJANGO_DANDI_DOI_API_USER = "dartlib.dandi"
DJANGO_DANDI_DOI_API_PREFIX = "10.48324"
DJANGO_DANDI_DOI_API_PREFIX = "10.${var.dandi_instance_datacite_id}"
Copy link
Member

@asmacdo asmacdo May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: It is reasonable to hardcode the 10. since IIUC thats a universal for dois. However, IMO i think it will be friendlier to configure if the var would be set to 10.12345 because the full value is what is defined as "your prefix" from datacite. https://doi.test.datacite.org/repositories/dartlib.dandi/prefixes

DJANGO_DANDI_DOI_PUBLISH = "true"
DJANGO_SENTRY_DSN = data.sentry_key.this.dsn_public
DJANGO_SENTRY_ENVIRONMENT = "production"
DJANGO_CELERY_WORKER_CONCURRENCY = "4"
DJANGO_DANDI_WEB_APP_URL = "https://dandiarchive.org"
DJANGO_DANDI_API_URL = "https://api.dandiarchive.org"
DJANGO_DANDI_JUPYTERHUB_URL = "https://hub.dandiarchive.org/"
DJANGO_DANDI_WEB_APP_URL = var.dandi_instance_url
DJANGO_DANDI_API_URL = "https://api.${var.dandi_instance_tld}"
DJANGO_DANDI_JUPYTERHUB_URL = "https://hub.${var.dandi_instance_tld}"
DJANGO_DANDI_DEV_EMAIL = var.dev_email
DJANGO_DANDI_ADMIN_EMAIL = "info@dandiarchive.org"
DJANGO_DANDI_ADMIN_EMAIL = "info@${var.dandi_instance_tld}"
DANDI_INSTANCE_NAME = var.dandi_instance_name
DANDI_DATACITE_DOI_ID = var.dandi_instance_datacite_id
}
additional_sensitive_django_vars = {
DJANGO_DANDI_DOI_API_PASSWORD = var.doi_api_password
Expand Down
Loading