bug: api stage now set properly, more nisar static layer endpoint prototyping

Author: SpicyGarlicAlbacoreRoll

.github/workflows/deploy-prod-staging.yml

@@ -78,6 +78,7 @@ jobs:
           with:
             aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
             staging: true
+            maturity: prod-staging
 
     run-prod-staging-integration-tests:
       needs: [deploy-prod-staging]

.github/workflows/deploy-prod.yml

@@ -40,4 +40,5 @@ jobs:
         uses: ./.github/workflows/search-api-composite
         with:
           aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
+          maturity: prod
 

.github/workflows/deploy-test-staging.yml

@@ -78,6 +78,7 @@ jobs:
           with:
             aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
             staging: true
+            maturity: test-staging
 
     run-test-staging-integration-tests:
       needs: [deploy-test-staging]

.github/workflows/deploy-test.yml

@@ -40,3 +40,4 @@ jobs:
         uses: ./.github/workflows/search-api-composite
         with:
           aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
+          maturity: test

.github/workflows/search-api-composite/action.yml

@@ -13,10 +13,9 @@ inputs:
   security-group:
     required: true
     type: string
-  
-  staging:
-    required: false
-    type: boolean
+  maturity:
+    required: true
+    type: string
 
 runs:
   using: "composite"
@@ -57,5 +56,4 @@ runs:
           --context vpc_id=${{ inputs.vpc-id }} \
           --context subnet_ids=${{ inputs.subnet-ids }} \
           --context security_group=${{ inputs.security-group }} \
-          --context staging=${{ inputs.staging }}
-
+          --context api_stage=${{ inputs.maturity }}

CHANGELOG.md

@@ -32,7 +32,7 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Fixed
 - boolean values are properly capitalized in `python` output file
-
+- API maturity set for each level of deployment stage
 ------
 ## [1.0.7](https://github.com/asfadmin/Discovery-SearchAPI-v3/compare/v1.0.6...v1.0.7)
 ### Changed

cdk/app.py

@@ -8,12 +8,12 @@
 
 app = cdk.App()
 
-staging = app.node.try_get_context('staging')
-if staging is None:
-    staging = False
-
+staging = False
 suffix = ''
-if staging:
+api_stage = app.node.try_get_context('api_stage')
+
+if api_stage.endswith('staging'):
+    staging = True
     suffix = '-Staging'
 
 SearchAPIStack(app, f"SearchAPIStack{suffix}",
@@ -24,6 +24,7 @@
     # Uncomment the next line to specialize this stack for the AWS Account
     # and Region that are implied by the current CLI configuration.
     staging=staging,
+    api_stage=api_stage,
     env=cdk.Environment(
         account=os.getenv('CDK_DEFAULT_ACCOUNT'),
         region=os.getenv('CDK_DEFAULT_REGION')

cdk/cdk/cdk_stack.py

@@ -12,7 +12,7 @@
 
 class SearchAPIStack(Stack):
 
-    def __init__(self, scope: Construct, construct_id: str, staging: bool = False, **kwargs) -> None:
+    def __init__(self, scope: Construct, construct_id: str, api_stage: str, staging: bool = False, **kwargs) -> None:
         super().__init__(scope, construct_id, **kwargs)
 
         try:
@@ -60,7 +60,7 @@ def __init__(self, scope: Construct, construct_id: str, staging: bool = False, *
             memory_size=5308,
             code=lambda_.DockerImageCode.from_image_asset(
                 directory='..',
-                # build_args={'MATURITY': }
+                build_args={'MATURITY': api_stage},
                 ),
             **lambda_vpc_kwargs,
         )

src/SearchAPI/application/application.py

@@ -1,13 +1,11 @@
-from datetime import datetime
 import json
 
 import os
-from typing import Optional
 import dateparser
 
 import asf_search as asf
 from fastapi import Depends, FastAPI, Request, HTTPException, APIRouter, UploadFile
-from fastapi.responses import RedirectResponse, Response, JSONResponse
+from fastapi.responses import Response, JSONResponse
 from fastapi.middleware.cors import CORSMiddleware
 
 from .log_router import LoggingRoute
@@ -228,17 +226,19 @@ async def file_to_wkt(files: list[UploadFile]):
         headers=constants.DEFAULT_HEADERS
     )
 
-# @router.get('/redirect/{shortName}')
-# async def nisar_static_layer(shortName: str, granule_id: str, cmr_token: Optional[str], cmr_host: Optional[str]='uat'):
+# @router.get('/redirect/{short_name}/{granule_id}')
+# async def nisar_static_layer(environment: Literal['prod', 'test'], short_name: str, granule_id: str):
+#         """
+#         environment: 'prod' or 'test' (whether to search the cmr prod or uat record)
+#         short_name: the CMR static layer collection short name to search
+#         granule_id: the granule id of the product to find the static layer for
+
+#         returns: redirect to file url
+#         """
 #         opts = asf.ASFSearchOptions()
-#         if cmr_token is not None:
-#             if cmr_host == 'uat':
-#                 host = asf.INTERNAL.CMR_HOST_UAT
-#             else:
-#                 host = asf.INTERNAL.CMR_HOST
-#             session = asf.ASFSession(cmr_host=host).auth_with_token(cmr_token)
-#             opts.session = session
-#             opts.host = host
+#         if environment == 'test':
+#             opts.host = asf.INTERNAL.CMR_HOST_UAT
+
 #         try:
 #             granule = asf.search(
 #                 granule_list=[granule_id],
@@ -247,7 +247,7 @@ async def file_to_wkt(files: list[UploadFile]):
 #         except IndexError:
 #             raise HTTPException(status_code=400, detail=f'Unable to find static layer, provided scene named "{granule_id}" not found in CMR record')
 
-#         static_layer = granule.get_static_layer(opts=asf.ASFSearchOptions(shortName=shortName))
+#         static_layer = granule.get_static_layer(opts=asf.ASFSearchOptions(shortName=short_name))
 #         if static_layer is None:
 #             raise HTTPException(status_code=500, detail=f'Static layer not found for scene named "{granule_id}"')