Skip to content

fix: configurable dapa url #554

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

Merged
merged 1 commit into from
Apr 9, 2025
Merged

fix: configurable dapa url #554

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions tf-module/stac_browser/ec2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ resource "aws_instance" "ds_stac_browser" {
user_data = templatefile("${path.module}/ec2_start.txt", {
github_image_url: var.github_image_url,
image_tag: var.image_tag,
dapa_api_url_base_val: var.dapa_api_url_base_val
})
tags = merge(var.tags, {
Name = "${var.prefix}-ds_stac_browser"
Expand Down
2 changes: 1 addition & 1 deletion tf-module/stac_browser/ec2_start.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ echo 'done script permission' >> /var/log/user-data-whoami.log;

echo "script wrote";

docker run -d --name my_service --restart always --tty --workdir /usr/src/app/unity/cumulus_lambda_functions/uds_api -v "/root/ss.sh":"/usr/src/app/unity/cumulus_lambda_functions/uds_api/ss.sh":z -p 8005:8005 -e AWS_REGION='us-west-2' -e PYTHONPATH='$PYTHONPATH:/usr/src/app/unity' -e LOG_LEVEL='10' -e DAPA_API_URL_BASE='https://d3vc8w9zcq658.cloudfront.net/am-uds-dapa' -e DAPA_API_PREIFX_KEY='data' -e STATIC_PARENT_DIR='/usr/src/app/unity/cumulus_lambda_functions/uds_api/' --entrypoint /usr/src/app/unity/cumulus_lambda_functions/uds_api/ss.sh ${github_image_url}:${image_tag}
docker run -d --name my_service --restart always --tty --workdir /usr/src/app/unity/cumulus_lambda_functions/uds_api -v "/root/ss.sh":"/usr/src/app/unity/cumulus_lambda_functions/uds_api/ss.sh":z -p 8005:8005 -e AWS_REGION='us-west-2' -e PYTHONPATH='$PYTHONPATH:/usr/src/app/unity' -e LOG_LEVEL='10' -e DAPA_API_URL_BASE=${dapa_api_url_base_val} -e DAPA_API_PREIFX_KEY='data' -e STATIC_PARENT_DIR='/usr/src/app/unity/cumulus_lambda_functions/uds_api/' --entrypoint /usr/src/app/unity/cumulus_lambda_functions/uds_api/ss.sh ${github_image_url}:${image_tag}
3 changes: 2 additions & 1 deletion tf-module/stac_browser/terraform.tfvars.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ cumulus_lambda_vpc_id = "vpc-xxx"
image_tag="9.6.0"
subnet_ids = ["subnet-private-subnet-id-1", "subnet-private-subnet-id-2"]
shared_services_ec2_subnet_cidr = "10.52.0.0/16"
alb_subnet_cidr = "10.52.0.0/16"
alb_subnet_cidr = "10.52.0.0/16"
dapa_api_url_base_val = "https://d3vc8w9zcq658.cloudfront.net/am-uds-dapa"
5 changes: 5 additions & 0 deletions tf-module/stac_browser/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,9 @@ variable "shared_services_ec2_subnet_cidr" {
variable "alb_subnet_cidr" {
type = string
description = "CIDR of the Subnet where ALB resides. This is to allow connections from ALB to Stac Browser EC2. Example: 10.52.0.0/16"
}

variable "dapa_api_url_base_val" {
type = string
description = "Base URL to hit Stac API to retrieve catalog and so on.. It must start with https and must include the prefix such as `/am-uds-dapa` example: https://d3vc8w9zcq658.cloudfront.net/am-uds-dapa."
}
Loading