Merge pull request #127 from asfadmin/v10.0.1.0-rc

upgrade to Cumulus v10.1.2
asfadmin · Mar 29, 2022 · 2b0b6d3 · 2b0b6d3
2 parents f55308d + d2f141b
commit 2b0b6d3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v10.1.2.0
+
+* Upgrade to Cumulus [v10.1.2](https://github.com/nasa/Cumulus/releases/tag/v10.1.2)
+    * see [Cumulus v10.0.0](https://github.com/nasa/Cumulus/releases/tag/v10.0.0) release notes for required migration steps for workflows and collection configurations
+        * note that some lambdas and other workflow components may need to be updated for compatibility with the message format changes made in Cumulus v10.0.0, e.g., the dmrpp-generator must be upgraded to [v3.3.0.beta](https://ghrcdaac.github.io/dmrpp-generator/#v330beta)
+    * add `scripts/cumulus-v10.1.1/data-migration1.sh` to execute the `data-migration1` lambda, per the migration step note for [Cumulus v10.1.1](https://github.com/nasa/Cumulus/releases/tag/v10.1.1). It must be run after `data_migration1` and `data-persistence` are deployed, but before `cumulus` is deployed.
+    * upgrade TEA to [v1.0.2](https://github.com/asfadmin/thin-egress-app/releases/tag/tea-build.121)
+
 ## v9.9.0.0
 
 * Upgrade to Cumulus [v9.9.0](https://github.com/nasa/Cumulus/releases/tag/v9.9.0)
@@ -40,7 +48,7 @@ executed multiple times to fully destroy the environment.  Also need to run `mak
 
 ## v9.2.0.1
 
-* Upgrade to TEA to build [1.1.1](https://github.com/asfadmin/thin-egress-app/releases/tag/tea-build.111) 
+* Upgrade to TEA to build [1.1.1](https://github.com/asfadmin/thin-egress-app/releases/tag/tea-build.111)
 to resolve several CVE's
 
 ## v9.2.0.0
@@ -62,7 +70,7 @@ to resolve several CVE's
     also be reviewed
   * a serverless RDS requires at least 2 subnets to be defined, CIRRUS had only been
     using one via commands like this:
-  * Added `MAKE_COMMAND` to `jenkins/Jenkinsfile` to allow specific cumulus modules to be deployed from Jenkins.  
+  * Added `MAKE_COMMAND` to `jenkins/Jenkinsfile` to allow specific cumulus modules to be deployed from Jenkins.
 
 ```terraform
 data "aws_subnet_ids" "subnet_ids" {

diff --git a/cumulus/main.tf b/cumulus/main.tf
@@ -1,5 +1,5 @@
 module "cumulus" {
-  source = "https://github.com/nasa/cumulus/releases/download/v9.9.0/terraform-aws-cumulus.zip//tf-modules/cumulus"
+  source = "https://github.com/nasa/cumulus/releases/download/v10.1.2/terraform-aws-cumulus.zip//tf-modules/cumulus"
 
   cumulus_message_adapter_lambda_layer_version_arn = data.terraform_remote_state.daac.outputs.cma_layer_arn
 

diff --git a/cumulus/thin-egress.tf b/cumulus/thin-egress.tf
@@ -1,5 +1,5 @@
 module "thin_egress_app" {
-  source = "s3::https://s3.amazonaws.com/asf.public.code/thin-egress-app/tea-terraform-build.121.zip"
+  source = "s3::https://s3.amazonaws.com/asf.public.code/thin-egress-app/tea-terraform-build.1.0.2.zip"
 
   auth_base_url                      = var.urs_url
   bucket_map_file                    = local.bucket_map_key == null ? aws_s3_bucket_object.bucket_map_yaml.id : local.bucket_map_key

diff --git a/data-migration1/main.tf b/data-migration1/main.tf
@@ -57,7 +57,7 @@ data "terraform_remote_state" "rds" {
 }
 
 module "data_migration1" {
-  source = "https://github.com/nasa/cumulus/releases/download/v9.9.0/terraform-aws-cumulus-data-migrations1.zip"
+  source = "https://github.com/nasa/cumulus/releases/download/v10.1.2/terraform-aws-cumulus-data-migrations1.zip"
 
   prefix = local.prefix
 

diff --git a/data-persistence/main.tf b/data-persistence/main.tf
@@ -20,7 +20,7 @@ provider "aws" {
 }
 
 module "data_persistence" {
-  source = "https://github.com/nasa/cumulus/releases/download/v9.9.0/terraform-aws-cumulus.zip//tf-modules/data-persistence"
+  source = "https://github.com/nasa/cumulus/releases/download/v10.1.2/terraform-aws-cumulus.zip//tf-modules/data-persistence"
 
   prefix                = local.prefix
   subnet_ids            = data.aws_subnet_ids.subnet_ids.ids

diff --git a/scripts/cumulus-v10.1.1/data_migration1.sh b/scripts/cumulus-v10.1.1/data_migration1.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# run this lambda after deploying the data-persistence module and before deploying the cumulus module
+
+PAYLOAD=$(echo '{"forceRulesMigration": true}')
+
+aws lambda invoke --function-name $DEPLOY_NAME-cumulus-$MATURITY-data-migration1 \
+  --payload "$PAYLOAD" $DEPLOY_NAME-cumulus-$MATURITY-dm1.log