Merge branch 'develop' into full-transaction-support

.example.env

@@ -4,12 +4,13 @@ CDK_DEFAULT_REGION=[REQUIRED IF DEPLOYING TO EXISTING VPC]
 
 STAGE=[FILL ME IN]
 
-VEDA_PROJECT_NAME=
-VEDA_PROJECT_DESCRIPTION=
-
-VEDA_DB_PGSTAC_VERSION=0.6.6
+VEDA_DB_PGSTAC_VERSION=0.7.10
 VEDA_DB_SCHEMA_VERSION=0.1.0
 VEDA_DB_SNAPSHOT_ID=[OPTIONAL BUT **REQUIRED** FOR ALL DEPLOYMENTS AFTER BASING DEPLOYMENT ON SNAPSHOT]
+VEDA_DB_PUBLICLY_ACCESSIBLE=TRUE
+VEDA_DB_USE_RDS_PROXY=[OPTIONAL]
+VEDA_DB_RDS_INSTANCE_CLASS=[OPTIONAL]
+VEDA_DB_RDS_INSTANCE_SIZE=[OPTIONAL]
 
 VEDA_DOMAIN_HOSTED_ZONE_ID=[OPTIONAL]
 VEDA_DOMAIN_HOSTED_ZONE_NAME=[OPTIONAL]
@@ -21,14 +22,17 @@ VEDA_DOMAIN_ALT_HOSTED_ZONE_NAME=[OPTIONAL SECOND DOMAIN]
 VEDA_RASTER_ENABLE_MOSAIC_SEARCH=TRUE
 VEDA_RASTER_DATA_ACCESS_ROLE_ARN=[OPTIONAL ARN OF IAM ROLE TO BE ASSUMED BY RASTER API]
 VEDA_RASTER_EXPORT_ASSUME_ROLE_CREDS_AS_ENVS=False
-
-VEDA_DB_PUBLICLY_ACCESSIBLE=TRUE
-
 VEDA_RASTER_ROOT_PATH=
-VEDA_STAC_ROOT_PATH=
 
+VEDA_STAC_ROOT_PATH=
 VEDA_STAC_ENABLE_TRANSACTIONS=FALSE
 
+VEDA_USERPOOL_ID=
+VEDA_CLIENT_ID=
+VEDA_CLIENT_SECRET=secret
+VEDA_DATA_ACCESS_ROLE_ARN=
+VEDA_COGNITO_DOMAIN=
+
 STAC_BROWSER_BUCKET=
 STAC_URL=
 CERT_ARN=

.github/workflows/tests/test_raster.py

@@ -19,29 +19,31 @@ def test_raster_api():
 def test_mosaic_api():
     """test mosaic."""
     query = {"collections": ["noaa-emergency-response"], "filter-lang": "cql-json"}
-    resp = httpx.post(f"{raster_endpoint}/mosaic/register", json=query)
+    resp = httpx.post(f"{raster_endpoint}/searches/register", json=query)
     assert resp.headers["content-type"] == "application/json"
     assert resp.status_code == 200
-    assert resp.json()["searchid"]
+    assert resp.json()["id"]
     assert resp.json()["links"]
 
-    searchid = resp.json()["searchid"]
+    searchid = resp.json()["id"]
 
-    resp = httpx.get(f"{raster_endpoint}/mosaic/{searchid}/-85.6358,36.1624/assets")
+    resp = httpx.get(f"{raster_endpoint}/searches/{searchid}/-85.6358,36.1624/assets")
     assert resp.status_code == 200
     assert len(resp.json()) == 1
     assert list(resp.json()[0]) == ["id", "bbox", "assets", "collection"]
     assert resp.json()[0]["id"] == "20200307aC0853900w361030"
 
-    resp = httpx.get(f"{raster_endpoint}/mosaic/{searchid}/tiles/15/8589/12849/assets")
+    resp = httpx.get(
+        f"{raster_endpoint}/searches/{searchid}/tiles/15/8589/12849/assets"
+    )
     assert resp.status_code == 200
     assert len(resp.json()) == 1
     assert list(resp.json()[0]) == ["id", "bbox", "assets", "collection"]
     assert resp.json()[0]["id"] == "20200307aC0853900w361030"
 
     z, x, y = 15, 8589, 12849
     resp = httpx.get(
-        f"{raster_endpoint}/mosaic/{searchid}/tiles/{z}/{x}/{y}",
+        f"{raster_endpoint}/searches/{searchid}/tiles/{z}/{x}/{y}",
         params={"assets": "cog"},
         headers={"Accept-Encoding": "br, gzip"},
         timeout=10.0,
@@ -105,11 +107,11 @@ def test_mosaic_search():
         },
     ]
     for search in searches:
-        resp = httpx.post(f"{raster_endpoint}/mosaic/register", json=search)
+        resp = httpx.post(f"{raster_endpoint}/searches/register", json=search)
         assert resp.status_code == 200
-        assert resp.json()["searchid"]
+        assert resp.json()["id"]
 
-    resp = httpx.get(f"{raster_endpoint}/mosaic/list")
+    resp = httpx.get(f"{raster_endpoint}/searches/list")
     assert resp.headers["content-type"] == "application/json"
     assert resp.status_code == 200
     assert (
@@ -118,16 +120,18 @@ def test_mosaic_search():
     assert resp.json()["context"]["returned"] == 10  # default limit is 10
 
     # Make sure all mosaics returned have
-    for mosaic in resp.json()["searches"]:
-        assert mosaic["search"]["metadata"]["type"] == "mosaic"
+    for search in resp.json()["searches"]:
+        assert search["search"]["metadata"]["type"] == "mosaic"
 
     links = resp.json()["links"]
     assert len(links) == 2
     assert links[0]["rel"] == "self"
     assert links[1]["rel"] == "next"
-    assert links[1]["href"] == f"{raster_endpoint}/mosaic/list?limit=10&offset=10"
+    assert links[1]["href"] == f"{raster_endpoint}/searches/list?limit=10&offset=10"
 
-    resp = httpx.get(f"{raster_endpoint}/mosaic/list", params={"limit": 1, "offset": 1})
+    resp = httpx.get(
+        f"{raster_endpoint}/searches/list", params={"limit": 1, "offset": 1}
+    )
     assert resp.status_code == 200
     assert resp.json()["context"]["matched"] > 10
     assert resp.json()["context"]["limit"] == 1
@@ -136,62 +140,56 @@ def test_mosaic_search():
     links = resp.json()["links"]
     assert len(links) == 3
     assert links[0]["rel"] == "self"
-    assert links[0]["href"] == f"{raster_endpoint}/mosaic/list?limit=1&offset=1"
+    assert links[0]["href"] == f"{raster_endpoint}/searches/list?limit=1&offset=1"
     assert links[1]["rel"] == "next"
-    assert links[1]["href"] == f"{raster_endpoint}/mosaic/list?limit=1&offset=2"
+    assert links[1]["href"] == f"{raster_endpoint}/searches/list?limit=1&offset=2"
     assert links[2]["rel"] == "prev"
-    assert links[2]["href"] == f"{raster_endpoint}/mosaic/list?limit=1&offset=0"
+    assert links[2]["href"] == f"{raster_endpoint}/searches/list?limit=1&offset=0"
 
     # Filter on mosaic metadata
-    resp = httpx.get(f"{raster_endpoint}/mosaic/list", params={"owner": "vincent"})
+    resp = httpx.get(f"{raster_endpoint}/searches/list", params={"owner": "vincent"})
     assert resp.status_code == 200
     assert resp.json()["context"]["matched"] == 7
     assert resp.json()["context"]["limit"] == 10
     assert resp.json()["context"]["returned"] == 7
 
     # sortBy
-    resp = httpx.get(f"{raster_endpoint}/mosaic/list", params={"sortby": "lastused"})
+    resp = httpx.get(f"{raster_endpoint}/searches/list", params={"sortby": "lastused"})
     assert resp.status_code == 200
 
-    resp = httpx.get(f"{raster_endpoint}/mosaic/list", params={"sortby": "usecount"})
+    resp = httpx.get(f"{raster_endpoint}/searches/list", params={"sortby": "usecount"})
     assert resp.status_code == 200
 
-    resp = httpx.get(f"{raster_endpoint}/mosaic/list", params={"sortby": "-owner"})
+    resp = httpx.get(f"{raster_endpoint}/searches/list", params={"sortby": "-owner"})
     assert resp.status_code == 200
     assert (
         "owner" not in resp.json()["searches"][0]["search"]["metadata"]
     )  # some mosaic don't have owners
 
-    resp = httpx.get(f"{raster_endpoint}/mosaic/list", params={"sortby": "owner"})
+    resp = httpx.get(f"{raster_endpoint}/searches/list", params={"sortby": "owner"})
     assert resp.status_code == 200
     assert "owner" in resp.json()["searches"][0]["search"]["metadata"]
 
 
 def test_item():
     """test stac endpoints."""
+    collection_id = "noaa-emergency-response"
+    item_id = "20200307aC0853300w361200"
     resp = httpx.get(
-        f"{raster_endpoint}/stac/assets",
-        params={
-            "collection": "noaa-emergency-response",
-            "item": "20200307aC0853300w361200",
-        },
+        f"{raster_endpoint}/collections/{collection_id}/items/{item_id}/assets"
     )
     assert resp.status_code == 200
     assert resp.headers["content-type"] == "application/json"
     assert resp.json() == ["cog"]
 
     resp = httpx.get(
-        f"{raster_endpoint}/stac/tilejson.json",
+        f"{raster_endpoint}/collections/{collection_id}/items/{item_id}/WebMercatorQuad/tilejson.json",
         params={
-            "collection": "noaa-emergency-response",
-            "item": "20200307aC0853300w361200",
             "assets": "cog",
         },
     )
     assert resp.status_code == 200
     assert resp.headers["content-type"] == "application/json"
     assert resp.json()["tilejson"]
     assert "assets=cog" in resp.json()["tiles"][0]
-    assert "item=20200307aC0853300w361200" in resp.json()["tiles"][0]
-    assert "collection=noaa-emergency-response" in resp.json()["tiles"][0]
     assert resp.json()["bounds"] == [-85.5501, 36.1749, -85.5249, 36.2001]

.gitignore

@@ -143,3 +143,6 @@ cdk-dev.out
 stac-browser
 
 container_logs.log
+
+# Jetbrains IDEs
+.idea

README.md

@@ -28,7 +28,7 @@ This project uses an AWS CDK [CloudFormation](https://docs.aws.amazon.com/AWSClo
 
 ### Enviroment variables
 
-An [.example.env](.example.env) template is supplied for for local deployments. If updating an existing deployment, it is essential to check the most current values for these variables by fetching these values from AWS Secrets Manager. The environment secrets are named `<app-name>-<stage>-env`, for example `veda-backend-dev-env`.
+An [.example.env](.example.env) template is supplied for local deployments. If updating an existing deployment, it is essential to check the most current values for these variables by fetching these values from AWS Secrets Manager. The environment secrets are named `<app-name>-<stage>-env`, for example `veda-backend-dev-env`.
 > **Warning** The environment variables stored as AWS secrets are manually maintained and should be reviewed before deploying updates to existing stacks.
 
 ### Fetch environment variables using AWS CLI
@@ -92,6 +92,8 @@ python3 -m pip install -e ".[dev,deploy,test]"
 #### Run the deployment
 
 ```
+# Login to ECR so that you can pull public docker images
+aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
 # Review what infrastructure changes your deployment will cause
 cdk diff
 # Execute deployment and standby--security changes will require approval for deployment

raster_api/runtime/setup.py

@@ -8,10 +8,10 @@
 inst_reqs = [
     "boto3",
     "rio-tiler==6.5.0",
-    "titiler.pgstac==0.8.3",
-    "titiler.core>=0.15.5,<0.16",
-    "titiler.mosaic>=0.15.5,<0.16",
-    "titiler.extensions[cogeo]>=0.15.5,<0.16",
+    "titiler.pgstac==1.3.0",
+    "titiler.core>=0.18.5,<0.19",
+    "titiler.mosaic>=0.18.5,<0.19",
+    "titiler.extensions[cogeo]>=0.18.5,<0.19",
     "starlette-cramjam>=0.3,<0.4",
     "aws_xray_sdk>=2.6.0,<3",
     "aws-lambda-powertools>=1.18.0",