Merge pull request #560 from unity-sds/develop

release/9.11.0

Author: ngachung

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [9.11.0] - 2025-04-09
+### Changed
+- [#556](https://github.com/unity-sds/unity-data-services/pull/556) feat: bump uds-lib version
+
+## [9.10.1] - 2025-04-09
+### Fixed
+- [#554](https://github.com/unity-sds/unity-data-services/pull/554) fix: configurable dapa url
+
 ## [9.10.0] - 2025-03-25
 ### Changed
 - [#547](https://github.com/unity-sds/unity-data-services/pull/547) feat: stac browser from terraform

requirements.txt

@@ -15,7 +15,7 @@ jsonschema==4.23.0
 jsonschema-specifications==2023.12.1
 lark==0.12.0
 mangum==0.18.0
-mdps-ds-lib==1.1.1.dev300
+mdps-ds-lib==1.1.1.dev700
 pydantic==2.9.2
 pydantic_core==2.23.4
 pygeofilter==0.2.4

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="cumulus_lambda_functions",
-    version="9.10.0",
+    version="9.11.0",
     packages=find_packages(),
     install_requires=install_requires,
     package_data={

tf-module/stac_browser/ec2.tf

@@ -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"

tf-module/stac_browser/ec2_start.txt

@@ -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}

tf-module/stac_browser/terraform.tfvars.example

@@ -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"

tf-module/stac_browser/variables.tf

@@ -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."
 }