Merge from develop to master (7 PRs) #640
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… caching because we build with nocache
Fix extract_level_gid to deal with misformatting of gids for Ghana and Indonesia in GADM 4.1. I just localized the fixes to a few lines in extract_level_gid, and the adjustments only happen if the gid is misformatted. Added a few tests of extract_level_gid().
Change s3:PutBucketLifecycleConfiguration to s3:PutLifecycleConfiguration And re-enable the use of expire_s3_objects().
GTC-3137 Fix extract_level_gid to deal with misformats in GADM 4.1
The main issue was that the correct lifecycle action permission is actually s3:PutLifecycleConfiguration, but we've always had s3:PutBucketLifecycleConfiguration in the policy templates. A second issue is that the expiration time for a bucket/folder must be a date specified as midnight UTC. We were just using the current time, so that caused an error when trying to set the lifecycle rule. In both cases, we weren't seeing the error, because delete_all_assets was called from a background task, so any exception was getting lost without being logged. So, I added a try-except around the call to put_bucket_lifecycle_configuration(), so we log future errors (and don't kill the task). Given these fixes, I was able to re-enable the use of expire_s3_objects() and it worked!
service url update
Also, just noting here that lifecycle rules themselves don't expire, so we will want to clean them up periodically at: https://us-east-1.console.aws.amazon.com/s3/management/gfw-tiles/lifecycle?bucketType=general®ion=us-east-1#
GTC-2708 Fix deleting of the tile cache when deleting a version
Correct type of tags column, add metadata models to env.py
Replace PostgreSQL versions in compose files with those deployed to AWS
solomon-negusse
approved these changes
Feb 27, 2025
|
@danscales #637 is good to be merged. |
dmannarino
approved these changes
Feb 27, 2025
|
I'm assuming that Justin's mock endpoint is fine to be merged. So I'll merge now, in case other folks want to merge into develop without being immediately merged into master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes these PRs:
Let me know if you are OK with merging all your PRs in this list to master, or if any particular PR should be excluded (in which case I am fine with creating a special PR from develop to master that excludes some of these PRs).