import eoapi-cdk constructs and reuse them #144

emileten · 2023-10-12T09:00:03Z

Another take at #135. This one is much simpler. All modifications are in infrastructure/aws, and are all about swapping direct native AWS CDK calls with eoapi-cdk construct calls.

There is no change in behavior in this PR ; i.e, the deployed infrastructure should be identical for a given set of environment variables after this PR is merged.

The code in this branch synthesized successfully and I'm trying to deploy right now.

infrastructure/aws/cdk/config.py

infrastructure/aws/requirements-cdk.txt

infrastructure/aws/cdk/app.py

emileten · 2023-10-12T09:15:04Z

One significant difference with the other PR, in addition, is that I'm not adding the ingestor & browser, I'd like to keep things simple and do that later in another PR if possible.

emileten · 2023-10-12T09:37:06Z

Looks like it mostly works, here are links of services vector, stac, raster.

There is just some formatting left to be done and then we should try to deploy to the existing staging and see if anything gets broken.

vincentsarago · 2023-10-12T10:56:10Z

One significant difference with the other PR, in addition, is that I'm not adding the ingestor & browser, I'd like to keep things simple and do that later in another PR if possible.

🙏 yeah we def want stac-browser and ingestor to be deployed but 👍 for doing it later :-)

emileten · 2023-10-31T08:29:51Z

@vincentsarago this is ready to be merged. Important notes :

I deployed this to a stack named eoapi-dev in the devseed account. I swapped the domain mappings : *.eoapi.dev point to APIs in this stack (I copied the content of the DB over).
removed the NAT gateway (and made corresponding necessary networking changes we discussed on slack).
added the STAC ingestor. I created a custom domain name for this with a record at ingestor.eoapi.dev, for now it's not working but we might need to wait -- otherwise it's available at the non custom URL that's shown in the stack.
added the STAC browser, see this public endpoint : http://eoapi-dev-stac-browser.s3-website-us-east-1.amazonaws.com.

emileten · 2023-10-31T08:30:11Z

When you're 👍 I can merge and later delete the eoapi-staging stack.

emileten · 2023-10-31T08:34:54Z

Edit : ingestor.eoapi.dev works now

infrastructure/aws/cdk/config.py

vincentsarago · 2023-10-31T10:33:56Z

@emileten I'm getting an error at https://ingestor.eoapi.dev/docs is that expected?

emileten · 2023-10-31T12:52:34Z

@vincentsarago
Yes the /docs is broken in the custom domain name, there is a ticket for this in eoAPI-cdk. I'll try to fix that tomorrow.

You can reach /docs with the api gateway url though (not on my computer right now, but that url is one of the outputs of the stack).

emileten · 2023-11-01T04:07:26Z

@vincentsarago

🤔 can we avoid setting a default to our stack here?

☝️ done

the /docs is broken

☝️ fixed https://ingestor.eoapi.dev/docs with developmentseed/eoapi-cdk#82

vincentsarago · 2023-11-09T15:09:33Z

infrastructure/aws/cdk/app.py

-                    eostac_settings.stac_api_custom_domain_name is not None
-                ), "stac_api_custom_domain_name must be set if stac_browser_github_tag is not None. The browser deployment needs a resolved STAC API url at deployment time and so needs to rely on a predefined custom domain name."
+                    eostac_settings.stac_browser_github_tag is not None
+                ), "stac_browser_github_tag must be set if stac_api_custom_domain_name is not None."


@emileten can you explain again the relationship between the custom domain name and the GitHub tag?

sorry, the way I wrote it, it's confusing.

In eoSTACSettings, I defined two parameters for the purpose of the STAC browser :

the catalog URL, which I named stac_api_custom_domain_name, that the browser is going to show

the version of the browser, stac_browser_github_tag

These two things should probably go in another configuration class named eoStacBrowserSettings for clarity.

And the assertion just checks that a version is provided if a catalog url is provided to avoid unclear errors downstream.

Does that make sense @vincentsarago ?

👍 thanks

These two things should probably go in another configuration class named eoStacBrowserSettings for clarity.

That would be lovely

… to our tiler

…dd example instead

- add stac browser to docker deployment - make use of radiant earth browser config to have control over which tiler is used - create a separate settings object for the browser for readability

emileten requested a review from vincentsarago October 12, 2023 09:06

emileten commented Oct 12, 2023

View reviewed changes

infrastructure/aws/cdk/config.py Show resolved Hide resolved

emileten commented Oct 12, 2023

View reviewed changes

infrastructure/aws/requirements-cdk.txt Show resolved Hide resolved

emileten commented Oct 12, 2023

View reviewed changes

infrastructure/aws/cdk/app.py Show resolved Hide resolved

emileten commented Oct 12, 2023

View reviewed changes

infrastructure/aws/cdk/app.py Show resolved Hide resolved

emileten mentioned this pull request Oct 12, 2023

Draft: Use eoapi-cdk #135

Closed

emileten force-pushed the feat/use-eoapi-cdk-v3 branch from 9c24ebe to 6ca768d Compare October 13, 2023 09:29

import eoapi-cdk constructs and reuse them

d1f5cfe

emileten force-pushed the feat/use-eoapi-cdk-v3 branch from 6ca768d to d1f5cfe Compare October 26, 2023 09:10

emileten mentioned this pull request Oct 31, 2023

feat: custom runtimes, optional VPC, python 3.11 developmentseed/eoapi-cdk#74

Merged

add ingestor, browser, bump eoapi-cdk

8e40f0c

vincentsarago reviewed Oct 31, 2023

View reviewed changes

infrastructure/aws/cdk/config.py Outdated Show resolved Hide resolved

remove default API url

0f138f5

sharkinsspatial mentioned this pull request Nov 1, 2023

Transition eoAPI infrastructure to external repositories #94

Closed

vincentsarago mentioned this pull request Nov 2, 2023

add documentation about ingestion #154

Open

Merge branch 'main' into feat/use-eoapi-cdk-v3

987672e

vincentsarago reviewed Nov 9, 2023

View reviewed changes

Merge branch 'main' into feat/use-eoapi-cdk-v3

3437f85

emileten mentioned this pull request Nov 10, 2023

feat: add integration tests developmentseed/eoapi-cdk#69

Merged

emileten added 2 commits November 11, 2023 19:07

add stac browser to docker deployment, change tiler in aws deployment…

5eaf505

… to our tiler

fix version

37ac057

hrodmn mentioned this pull request Nov 13, 2023

add config settings for package versions (e.g. titiler-pgstac==0.5.1) developmentseed/eoapi-cdk#85

Open

emileten added 5 commits November 14, 2023 17:21

fix port

a4bfad4

create a settings class for browser, remove browser demo config and a…

e507234

…dd example instead

fix docker compose set up

1997b48

Merge pull request #159 from developmentseed/feat/stac-browser-tiler

b69a779

- add stac browser to docker deployment - make use of radiant earth browser config to have control over which tiler is used - create a separate settings object for the browser for readability

mention browser in README, improve structure of README for deployment

edcfeb4

emileten force-pushed the feat/use-eoapi-cdk-v3 branch from af1f67a to edcfeb4 Compare November 14, 2023 09:26

emileten added 2 commits November 14, 2023 18:32

add default browser to gitignore, along with the compiled browser code

f231fb0

docs for browser in services docs

b3b66d1

vincentsarago approved these changes Nov 14, 2023

View reviewed changes

update service docs

ef64a59

emileten merged commit 3aec2f5 into main Nov 14, 2023
2 checks passed

emileten deleted the feat/use-eoapi-cdk-v3 branch November 14, 2023 10:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

import eoapi-cdk constructs and reuse them #144

import eoapi-cdk constructs and reuse them #144

emileten commented Oct 12, 2023 •

edited

Loading

emileten commented Oct 12, 2023

emileten commented Oct 12, 2023 •

edited

Loading

vincentsarago commented Oct 12, 2023

emileten commented Oct 31, 2023

emileten commented Oct 31, 2023

emileten commented Oct 31, 2023

vincentsarago commented Oct 31, 2023

emileten commented Oct 31, 2023

emileten commented Nov 1, 2023 •

edited

Loading

vincentsarago Nov 9, 2023

emileten Nov 10, 2023

vincentsarago Nov 10, 2023

import eoapi-cdk constructs and reuse them #144

import eoapi-cdk constructs and reuse them #144

Conversation

emileten commented Oct 12, 2023 • edited Loading

emileten commented Oct 12, 2023

emileten commented Oct 12, 2023 • edited Loading

vincentsarago commented Oct 12, 2023

emileten commented Oct 31, 2023

emileten commented Oct 31, 2023

emileten commented Oct 31, 2023

vincentsarago commented Oct 31, 2023

emileten commented Oct 31, 2023

emileten commented Nov 1, 2023 • edited Loading

vincentsarago Nov 9, 2023

Choose a reason for hiding this comment

emileten Nov 10, 2023

Choose a reason for hiding this comment

vincentsarago Nov 10, 2023

Choose a reason for hiding this comment

emileten commented Oct 12, 2023 •

edited

Loading

emileten commented Oct 12, 2023 •

edited

Loading

emileten commented Nov 1, 2023 •

edited

Loading