From b3d124eda546232fa105bb5d6d96be1f226bb40b Mon Sep 17 00:00:00 2001 From: amarouane Date: Wed, 28 Apr 2021 09:36:07 -0500 Subject: [PATCH] Releasing v2.1.0 --- README.md | 4 ++-- docs/index.md | 24 ++++++++++++++++++++++++ main.tf | 18 +++++++++--------- modules/dmrpp_service/main.tf | 22 +++++++++++----------- modules/dmrpp_service/variables.tf | 6 +----- variables.tf | 6 +++--- 6 files changed, 50 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index db7685a..436603f 100644 --- a/README.md +++ b/README.md @@ -46,10 +46,10 @@ module "dmrpp-generator" { memory_reservation = 900 // default to 900 prefix = "Cumulus stack prefix" // default Cumulus stack prefix desired_count = 1 // Default to 1 - docker_image = "ghrcdaac/dmrpp-generator:" + log_destination_arn = var.aws_log_mechanism // default to null } -log_destination_arn = var.aws_log_mechanism (optional) + ``` In [variables.tf](https://github.com/nasa/cumulus-template-deploy/blob/master/cumulus-tf/variables.tf) file you need to define diff --git a/docs/index.md b/docs/index.md index d93c949..e7e4b18 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,27 @@ # 📖 Release notes +## v2.1.0 +This release: +* Fixes the issue [issue 12](https://github.com/ghrcdaac/dmrpp-generator/issues/12) + +## 🏃 Migration Steps to v2.1.0 + release +```code +module "dmrpp-generator" { +// Change the source url in your terraform file to point to v2.1.0 +source = "https://github.com/ghrcdaac/dmrpp-generator/releases/download/v2.1.0/dmrpp-generator.zip" +... +// Change the value of your docker image to point to v2.1.0 tag +docker_image = "ghrcdaac/dmrpp-generator:v2.1.0" +... +// Add destination log to remote kinesis (optional) +log_destination_arn = var.log_destination_arn +} +``` +## 🚨 Breaking Changes v2.1.0 +Only compatible with Cumulus v7+ + ## v2.0.1 This release: * Fixes the issue of `filepath` passed from `move-granules` step function @@ -28,6 +49,9 @@ This release fixes the problem adding a type of meta data for the dmrpp file and ## v1.0.4 This release fixes the problem of assuming the granuleId is the same as the file name [issue#9](https://github.com/ghrcdaac/dmrpp-generator/issues/9) + + + ## 🏃 Migration Steps to v2.0.1 Change the source url in your terraform file to point to v2.0.0 release ```code diff --git a/main.tf b/main.tf index 7947b5d..16e05c5 100644 --- a/main.tf +++ b/main.tf @@ -6,14 +6,14 @@ terraform { } module "dmrpp_service" { - source = "./modules/dmrpp_service" - prefix = var.prefix - cluster_arn = var.cluster_arn - desired_count = var.desired_count + source = "./modules/dmrpp_service" + prefix = var.prefix + cluster_arn = var.cluster_arn + desired_count = var.desired_count log_destination_arn = var.log_destination_arn - docker_image = var.docker_image - cpu = var.cpu - memory_reservation = var.memory_reservation - region = var.region - volumes = var.volumes + docker_image = var.docker_image + cpu = var.cpu + memory_reservation = var.memory_reservation + region = var.region + volumes = var.volumes } diff --git a/modules/dmrpp_service/main.tf b/modules/dmrpp_service/main.tf index 1e286ce..4ba6f6a 100644 --- a/modules/dmrpp_service/main.tf +++ b/modules/dmrpp_service/main.tf @@ -8,23 +8,23 @@ locals { module "dmrpp_ecs_task_module" { source = "../dmrpp_task" - name = "${var.prefix}-dmrpp-generator" + name = "${var.prefix}-dmrpp-generator" } module "dmrpp_service" { source = "https://github.com/nasa/cumulus/releases/download/v8.0.0/terraform-aws-cumulus-ecs-service.zip" - prefix = var.prefix - name = "${var.prefix}_dmrpp_generator" - tags = local.default_tags - cluster_arn = var.cluster_arn - desired_count = var.desired_count - image = var.docker_image - log_destination_arn = var.log_destination_arn - cpu = var.cpu - memory_reservation = var.memory_reservation - volumes = var.volumes + prefix = var.prefix + name = "${var.prefix}_dmrpp_generator" + tags = local.default_tags + cluster_arn = var.cluster_arn + desired_count = var.desired_count + image = var.docker_image + log_destination_arn = var.log_destination_arn + cpu = var.cpu + memory_reservation = var.memory_reservation + volumes = var.volumes environment = { AWS_DEFAULT_REGION = var.region diff --git a/modules/dmrpp_service/variables.tf b/modules/dmrpp_service/variables.tf index f82259d..75d30c6 100644 --- a/modules/dmrpp_service/variables.tf +++ b/modules/dmrpp_service/variables.tf @@ -4,10 +4,6 @@ variable "cpu" {} variable "memory_reservation" {} variable "region" {} variable "cluster_arn" {} -variable "log_destination_arn" { - type = string - default = null - description = "A shared AWS:Log:Destination that receives logs in log_groups" -} +variable "log_destination_arn" {} variable "docker_image" {} variable "volumes" {} diff --git a/variables.tf b/variables.tf index ba14ee9..646f20e 100644 --- a/variables.tf +++ b/variables.tf @@ -11,7 +11,7 @@ variable "region" { variable "prefix" { - type = string + type = string description = "Cumulus stack prefix" } @@ -37,7 +37,7 @@ variable "docker_image" { variable "volumes" { description = "Volumes to make accessible to the container(s)" - type = list(object({ name = string, host_path = string, container_path = string })) - default = [] + type = list(object({ name = string, host_path = string, container_path = string })) + default = [] }