Merge remote-tracking branch 'origin' into demo/stac-admin

NASA-IMPACT · Jan 11, 2024 · 6e61c26 · 6e61c26
2 parents 134c3e2 + 68b4bfb
commit 6e61c26
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.github/actions/cdk-deploy/action.yml b/.github/actions/cdk-deploy/action.yml
@@ -4,6 +4,9 @@ inputs:
   env_aws_secret_name:
     required: true
     type: string
+  auth_env_aws_secret_name:
+    required: true
+    type: string
   dir:
     required: false
     type: string
@@ -76,11 +79,13 @@ runs:
     - name: Get dev environment configuration for develop branch
       shell: bash
       working-directory: ${{ inputs.dir }}
-      run: ./scripts/get-env.sh ${{ inputs.env_aws_secret_name }}
+      run: |
+        ./scripts/get-env.sh ${{ inputs.env_aws_secret_name }}
+        ./scripts/get-env.sh ${{ inputs.auth_env_aws_secret_name }}
 
     - name: Deploy
       shell: bash
       working-directory: ${{ inputs.dir }}
       run: |
         echo $STAGE
-        cdk deploy --require-approval never
+        cdk deploy --require-approval never --outputs-file ${HOME}/cdk-outputs.json
diff --git a/ingest_api/infrastructure/construct.py b/ingest_api/infrastructure/construct.py
@@ -84,7 +84,14 @@ def __init__(
             custom_host=config.custom_host,
         )
 
-        CfnOutput(self, "ingest-api", value=self.api.url)
+        # CfnOutput(self, "ingest-api", value=self.api.url)
+        stack_name = Stack.of(self).stack_name
+        CfnOutput(
+            self,
+            "stac-ingestor-api-url",
+            export_name=f"{stack_name}-stac-ingestor-api-url",
+            value=self.api.url,
+        )
 
         register_ssm_parameter(
             self,