Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cumulus-std #3638

Draft
wants to merge 82 commits into
base: feature/es-phase-2
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
62fe356
cumulus_distribution and s3 access log
jennyhliu Apr 29, 2022
b00a9b8
DiscoverGranulesWithOrca
jennyhliu May 2, 2022
942be44
Merge branch 'master' of https://github.com/nasa/cumulus into cumulus…
jennyhliu May 11, 2022
cd0b049
Merge branch 'master' of https://github.com/nasa/cumulus into cumulus…
jennyhliu Dec 13, 2022
4d893f4
update cumulus-std config
jennyhliu Dec 13, 2022
52661bb
Merge branch 'master' of https://github.com/nasa/cumulus into cumulus…
jennyhliu Jan 24, 2023
25e998c
release v15.0.0 (#3303)
jennyhliu Mar 10, 2023
15986ab
fix @aws-sdk/[email protected] error
jennyhliu Mar 10, 2023
d4f7f41
Merge tag 'v15.0.0' into cumulus-std
jennyhliu Mar 13, 2023
ea822cc
Update xml2js 0.4.22->0.5 strict (#3330) (#3339)
jennyhliu Apr 20, 2023
2223e93
CUMULUS-3285: Updated isAuthBearTokenRequest to handle non-Bearer aut…
jennyhliu Apr 20, 2023
723694e
update version to 15.0.1
jennyhliu Apr 20, 2023
ae4627c
update changelog
jennyhliu Apr 20, 2023
fb73047
Merge pull request #3342 from nasa/release-15.0.1
jennyhliu Apr 20, 2023
60f9950
Release 15.0.2 (#3349)
Nnaga1 Apr 26, 2023
4c85ec3
CUMULUS-3243:Updated granule delete logic (#3338)
jennyhliu Apr 28, 2023
8357358
update to v15.0.3
jennyhliu Apr 28, 2023
82bebfd
update changelog
jennyhliu Apr 28, 2023
5fd5feb
Merge pull request #3361 from nasa/release-15.0.3
jennyhliu Apr 28, 2023
92f8987
CUMULUS-3223: Fix failed granule stuck in queued (#3373)
jennyhliu May 18, 2023
5d012d9
[Cumulus-3115] - DiscoverGranules 'skip' or 'error' duplicate handlin…
Nnaga1 Mar 29, 2023
a50460e
Update deployment docs to exclude ACL setting (#3388)
botanical May 24, 2023
9119998
update pg to 8.10.x, cherry-pick did not pickup changes
jennyhliu Jun 23, 2023
44031a8
resolve merge for #3373
jennyhliu Jun 23, 2023
8a29c48
update version to 15.0.4
jennyhliu Jun 23, 2023
9251d6d
CUMULUS-3135 - Update integration test scripts to fail on test timeou…
Jkovarik Jun 1, 2023
f461e95
Merge pull request #3415 from nasa/release-15.0.4
jennyhliu Jun 24, 2023
324e02b
Release 16.1.0 (#3450)
npauzenga Aug 4, 2023
e96bba5
Release 16.1.1 (#3454)
npauzenga Aug 7, 2023
d13efc4
Merge tag 'v15.0.4' into cumulus-std
jennyhliu Aug 30, 2023
8a3ed33
CUMULUS-3218: Fix ingest lock count issue (#3481)
jennyhliu Sep 26, 2023
30da4f3
CUMULUS-3393: Fix PUT collection endpoint to update collection in s3 …
jennyhliu Sep 22, 2023
7996ae4
Fix compilation error due to aws-sdk upgrade (#3500)
jennyhliu Oct 24, 2023
fda5bd6
CUMULUS-3286:Handle get temporal info from non-existing CMR file (#3490)
jennyhliu Oct 9, 2023
98b720a
fix bamboo docker-compose to use CUMULUS_BASE_IMAGE
jennyhliu Oct 31, 2023
7e3fe74
fix tea-cache RequestEntityTooLargeException
jennyhliu Oct 31, 2023
5ce00e7
set bamboo_CUMULUS_BASE_IMAGE
jennyhliu Oct 31, 2023
f1066b8
switch to docker compose from docker-compose (#3464)
etcart Aug 26, 2023
c24939d
[CUMULUS-3293] Fix Process Dead Letter Archive (#3504)
botanical Oct 31, 2023
3d222d5
CUMULUS-3467:Add childWorkflowMeta to QueueWorkflow task config (#3505)
jennyhliu Oct 31, 2023
658e70b
v16.1.2
jennyhliu Nov 1, 2023
3abc9c8
Merge pull request #3506 from nasa/release-16.1.2
jennyhliu Nov 1, 2023
2cadd0b
Release-16.1.3 backport for CUMULUS-3474 (#3524)
Nnaga1 Jan 16, 2024
40a1e7f
CUMULUS-3432/CUMULUS-3506 - Upgrade to Aurora PG v13 (#3516) (#3553)
Jkovarik Jan 23, 2024
77dbeef
CUMULUS-3444 : Jk/backports/cumulus 3444 v16.1.x (#3569)
Jkovarik Feb 1, 2024
d4a8b8a
Jk/cumulus 3444 (#3554)
Jkovarik Jan 31, 2024
c3b3d1a
Release 18.2.0 (#3570)
Jkovarik Feb 6, 2024
aa27995
dbRecreation false
jennyhliu Apr 26, 2024
8206b55
remove added workflow
jennyhliu Apr 26, 2024
61460b9
Release 16.1.4 (#3634)
npauzenga Apr 29, 2024
d880126
Merge branch 'release-16.1.x' into cumulus-std
jennyhliu Apr 30, 2024
7fd731f
remove files in in 16.1.4
jennyhliu Apr 30, 2024
49713f4
remove extra changelog entry
jennyhliu Apr 30, 2024
76f6824
Jk/cumulus 3701 fix null rules (#3641) (#3645)
Jkovarik May 7, 2024
be885e0
CUMULUS-3721 -- V18.2 backport + Release 18.2.1 (#3650)
Jkovarik May 9, 2024
ac810ba
CUMULUS-3738 - v18.2.2 Backport (3527, 3547, 3587, 3673) (#3668)
paulpilone May 31, 2024
ed34d93
CUMULUS-3738 - v18.2.2 Backport (CUMULUS-3591) (#3671)
paulpilone May 31, 2024
d2f030f
Release 18.2.2 (#3677)
paulpilone Jun 4, 2024
9df1352
Merge branch 'release-18.2.x' into cumulus-std
jennyhliu Jul 5, 2024
acce9be
remove v16 doc from branch
jennyhliu Jul 5, 2024
0bf4a66
update conflict
jennyhliu Jul 5, 2024
3efb600
Merge branch 'master' into cumulus-std
jennyhliu Aug 29, 2024
45b5b3e
add cumulus-std ci build
jennyhliu Aug 29, 2024
576b431
remove extra update from branch
jennyhliu Aug 29, 2024
faaf8e9
remove extra update
jennyhliu Aug 29, 2024
ec7ad1a
Revert "remove extra update"
jennyhliu Aug 29, 2024
1cca758
Revert "remove extra update from branch"
jennyhliu Aug 29, 2024
c6ac649
remove extra update from branch
jennyhliu Aug 29, 2024
6adee4d
add es config to stack
jennyhliu Aug 29, 2024
18129df
correct config
jennyhliu Aug 29, 2024
8bab393
fix config
jennyhliu Aug 29, 2024
8ab7c7a
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Sep 9, 2024
c5116da
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Nov 13, 2024
e7de344
target_region is optional
jennyhliu Nov 13, 2024
ce86307
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Nov 25, 2024
bed6f80
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Dec 16, 2024
90160cb
remove log_destination_arn from config
jennyhliu Dec 18, 2024
ca38bbb
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Dec 19, 2024
7b869f3
remove newline added
jennyhliu Dec 19, 2024
46d63cd
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Jan 7, 2025
9bd7f32
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Jan 8, 2025
062712d
Merge branch 'feature/es-phase-2' into cumulus-std
jennyhliu Jan 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bamboo/bootstrap-tf-deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ echo "Deploying Cumulus example to $DEPLOYMENT"
-var "region=$AWS_REGION" \
-var "vpc_id=$VPC_ID" \
-var "lambda_subnet_ids=[$AWS_LAMBDA_SUBNET]" \
-var "log_destination_arn=$SHARED_LOG_DESTINATION_ARN" \
-var "urs_client_id=$EARTHDATA_CLIENT_ID" \
-var "urs_client_password=$EARTHDATA_CLIENT_PASSWORD" \
-var "token_secret=$TOKEN_SECRET" \
Expand Down
24 changes: 18 additions & 6 deletions example/cumulus-tf/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ module "cumulus" {

# Thin Egress App settings. Uncomment to use TEA.
# must match stage_name variable for thin-egress-app module
# tea_api_gateway_stage = local.tea_stage_name
# tea_rest_api_id = module.thin_egress_app.rest_api.id
# tea_rest_api_root_resource_id = module.thin_egress_app.rest_api.root_resource_id
# tea_internal_api_endpoint = module.thin_egress_app.internal_api_endpoint
# tea_external_api_endpoint = module.thin_egress_app.api_endpoint
tea_api_gateway_stage = local.tea_stage_name
tea_rest_api_id = module.thin_egress_app.rest_api.id
tea_rest_api_root_resource_id = module.thin_egress_app.rest_api.root_resource_id
tea_internal_api_endpoint = module.thin_egress_app.internal_api_endpoint
tea_external_api_endpoint = module.thin_egress_app.api_endpoint

log_destination_arn = var.log_destination_arn

Expand All @@ -214,7 +214,7 @@ module "cumulus" {


# Cumulus Distribution settings. Remove/comment to use TEA
tea_external_api_endpoint = module.cumulus_distribution.api_uri
#tea_external_api_endpoint = module.cumulus_distribution.api_uri

deploy_cumulus_distribution = var.deploy_cumulus_distribution

Expand Down Expand Up @@ -306,3 +306,15 @@ module "s3_access_test_lambda" {

tags = local.tags
}

module "s3-replicator" {
source = "../../tf-modules/s3-replicator"
prefix = var.prefix
vpc_id = var.vpc_id
subnet_ids = var.lambda_subnet_ids
permissions_boundary = var.permissions_boundary_arn
source_bucket = var.s3_replicator_config.source_bucket
source_prefix = var.s3_replicator_config.source_prefix
target_bucket = var.s3_replicator_config.target_bucket
target_prefix = var.s3_replicator_config.target_prefix
}
1 change: 1 addition & 0 deletions example/cumulus-tf/tea_s3_credentials_endpoint_test.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module "tea_s3_credentials_endpoint_test" {
count = 0
source = "../../tf-modules/distribution"

tea_api_gateway_stage = local.tea_stage_name
Expand Down
2 changes: 1 addition & 1 deletion example/data-persistence-tf/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module "provision_database" {
permissions_boundary_arn = var.permissions_boundary_arn
rds_user_password = var.rds_user_password == "" ? random_string.db_pass.result : var.rds_user_password
rds_connection_timing_configuration = var.rds_connection_timing_configuration
dbRecreation = true
dbRecreation = false
lambda_timeouts = var.lambda_timeouts
lambda_memory_sizes = var.lambda_memory_sizes
}
Expand Down