Merge pull request asfadmin#90 from asfadmin/dms/feat/v17.0.0

Update Cumulus to v17.0.0
lindsleycj · Aug 22, 2023 · a409787 · a409787
2 parents cb1e81b + d1eb87e
commit a409787
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 
 # CHANGELOG
 
+
+## v17.0.0.0
+* Upgrade to [Cumulus v17.0.0](https://github.com/nasa/cumulus/releases/tag/v17.0.0)
+* Upgrade terraform modules to use AWS provider version 5.0
+* Remove data-migration1 from repo
+
 ## v16.0.0.0
 
 * Upgrade to [Cumulus v16.0.0](https://github.com/nasa/Cumulus/releases/tag/v16.0.0)

diff --git a/cumulus/provider.tf b/cumulus/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.75.2"
+      version = "~> 5.0"
     }
     null = {
       source  = "hashicorp/null"

diff --git a/daac/main.tf b/daac/main.tf
@@ -31,7 +31,6 @@ resource "aws_s3_bucket" "internal-bucket" {
   lifecycle {
     prevent_destroy = true
   }
-  acl = "log-delivery-write"
   tags = local.default_tags
 }
 
@@ -45,6 +44,19 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "internal_bucket_e
   }
 }
 
+resource "aws_s3_bucket_ownership_controls" "internal-bucket" {
+  bucket = aws_s3_bucket.internal-bucket.id
+  rule {
+    object_ownership = "ObjectWriter"
+  }
+}
+
+resource "aws_s3_bucket_acl" "internal-bucket" {
+  depends_on = [aws_s3_bucket_ownership_controls.internal-bucket]
+  bucket     = aws_s3_bucket.internal-bucket.id
+  acl        = "log-delivery-write"
+}
+
 # protected buckets log to "internal"
 resource "aws_s3_bucket" "protected-bucket" {
   # protected buckets defined in variables.tf

diff --git a/daac/provider.tf b/daac/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.75.2"
+      version = "~> 5.0"
     }
     null = {
       source  = "hashicorp/null"

diff --git a/daac/s3-replicator.tf b/daac/s3-replicator.tf
@@ -27,11 +27,11 @@ locals {
 
 module "s3-replicator" {
 
-  source = "https://github.com/nasa/cumulus/releases/download/v16.0.0/terraform-aws-cumulus-s3-replicator.zip"
+  source = "https://github.com/nasa/cumulus/releases/download/v17.0.0/terraform-aws-cumulus-s3-replicator.zip"
 
   prefix               = local.prefix
   vpc_id               = data.aws_vpc.application_vpcs.id
-  subnet_ids           = data.aws_subnet_ids.subnet_ids.ids
+  subnet_ids           = data.aws_subnets.subnet_ids.ids
   permissions_boundary = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:policy/NGAPShRoleBoundary"
   tags                 = { Deployment = local.prefix }
   source_bucket        = "${local.prefix}-internal"
@@ -49,8 +49,12 @@ data "aws_vpc" "application_vpcs" {
   }
 }
 
-data "aws_subnet_ids" "subnet_ids" {
-  vpc_id = data.aws_vpc.application_vpcs.id
+
+data "aws_subnets" "subnet_ids" {
+  filter {
+    name   = "vpc-id"
+    values = [data.aws_vpc.application_vpcs.id]
+  }
 
   tags = {
     Name = "Private application ${data.aws_region.current.name}a subnet"

diff --git a/dashboard/provider.tf b/dashboard/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.75.2"
+      version = "~> 5.0"
     }
     null = {
       source  = "hashicorp/null"

diff --git a/data-migration1/variables/example.tfvars b/data-migration1/variables/example.tfvars
diff --git a/rds/data.tf b/rds/data.tf
@@ -7,9 +7,7 @@ data "aws_vpc" "application_vpcs" {
   }
 }
 
-data "aws_subnet_ids" "subnet_ids" {
-  vpc_id = data.aws_vpc.application_vpcs.id
-
+data "aws_subnets" "subnet_ids" {
   filter {
     name = "tag:Name"
     values = ["Private application ${data.aws_region.current.name}a subnet",

diff --git a/rds/main.tf b/rds/main.tf
@@ -11,12 +11,12 @@ resource "random_string" "user_db_pass" {
 }
 
 module "rds_cluster" {
-  source                   = "https://github.com/nasa/cumulus/releases/download/v16.0.0/terraform-aws-cumulus-rds.zip"
+  source                   = "https://github.com/nasa/cumulus/releases/download/v17.0.0/terraform-aws-cumulus-rds.zip"
   db_admin_username        = var.db_admin_username
   db_admin_password        = var.db_admin_password == "" ? random_string.admin_db_pass.result : var.db_admin_password
   region                   = data.aws_region.current.name
   vpc_id                   = data.aws_vpc.application_vpcs.id
-  subnets                  = data.aws_subnet_ids.subnet_ids.ids
+  subnets                  = data.aws_subnets.subnet_ids.ids
   engine_version           = var.engine_version
   parameter_group_family   = var.parameter_group_family
   deletion_protection      = var.deletion_protection

diff --git a/rds/provider.tf b/rds/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.75.2"
+      version = "~> 5.0"
     }
     random = {
       source = "hashicorp/random"

diff --git a/workflows/main.tf b/workflows/main.tf
@@ -1,6 +1,6 @@
 module "acme_workflow" {
 
-  source = "https://github.com/nasa/cumulus/releases/download/v16.0.0/terraform-aws-cumulus-workflow.zip"
+  source = "https://github.com/nasa/cumulus/releases/download/v17.0.0/terraform-aws-cumulus-workflow.zip"
 
   prefix          = local.prefix
   name            = "ACMEWorkflow"

diff --git a/workflows/provider.tf b/workflows/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.75.2"
+      version = "~> 5.0"
     }
     null = {
       source  = "hashicorp/null"