From f924e45875ebf10440d652592b8fcecd692a8cff Mon Sep 17 00:00:00 2001 From: Nikki Tebaldi <17799906+nikki-t@users.noreply.github.com> Date: Thu, 16 May 2024 14:42:14 +0000 Subject: [PATCH 1/4] Set throughput mode to 'elastic' --- terraform/generate-efs.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/terraform/generate-efs.tf b/terraform/generate-efs.tf index 5aa5321..4723924 100644 --- a/terraform/generate-efs.tf +++ b/terraform/generate-efs.tf @@ -4,6 +4,7 @@ resource "aws_efs_file_system" "generate_efs_fs" { creation_token = var.prefix encrypted = true performance_mode = "generalPurpose" + throughput_mode = "elastic" lifecycle_policy { transition_to_ia = "AFTER_1_DAY" } From 558d5c348cbfc8c26304f9f405a303b80a03b252 Mon Sep 17 00:00:00 2001 From: Nikki Tebaldi <17799906+nikki-t@users.noreply.github.com> Date: Thu, 16 May 2024 14:42:24 +0000 Subject: [PATCH 2/4] Update AWS provider --- terraform/.terraform.lock.hcl | 34 +++++++++++++++++----------------- terraform/main.tf | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index 8ad7287..6335511 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -2,24 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "4.58.0" - constraints = "~> 4.0" + version = "5.49.0" + constraints = "~> 5.0" hashes = [ - "h1:xXjZy36R+YOFyLjuF+rgi0NDLwnkFwrJ2t9NfsjRM/E=", - "zh:14b2b2dfbc7ee705c412d762b1485ee08958c816a64ac74f5769e946e4a1d265", - "zh:17a37e6825e2023b18987d31c0cbb9336654ea146b68e6c90710ea4636af71ae", - "zh:273127c69fb244577e5c136c46164d34f77b0c956c18d27f63d1072dd558f924", - "zh:4b2b6416d34fb3e1051c99d2a84045b136976140e34381d5fbf90e32db15272e", - "zh:7e6a8571ff15d51f892776265642ee01004b8553fd4f6f2014b6f3f2834670c7", - "zh:847c76ab2381b66666d0f79cf1ac697b5bfd0d9c3009fd11bc6ad6545d1eb427", - "zh:9a52cae08ba8d27d0639a8d2b8c61591027883058bf0cc5a639cffe1e299f019", + "h1:Y3xvYjzBIwYSbcnZDcs6moiy30uxRoY5oT2ExQHKG5A=", + "zh:0979b07cdeffb868ea605e4bbc008adc7cccb5f3ba1d3a0b794ea3e8fff20932", + "zh:2121a0a048a1d9419df69f3561e524b7e8a6b74ba0f57bd8948799f12b6ad3a1", + "zh:573362042ba0bd18e98567a4f45d91b09eb0d223513518ba04f16a646a906403", + "zh:57be7a4d6c362be2fa586d270203f4eac1ee239816239a9503b86ebc8fa1fef0", + "zh:5c72ed211d9234edd70eac9d77c3cafc7bbf819d1c28332a6d77acf227c9a23c", + "zh:7786d1a9781f8e8c0079bf58f4ed4aeddec0caf54ad7ddcf43c47936d545a04f", + "zh:82133e7d39787ee91ed41988da71beecc2ecb900b5da94b3f3d77fbc4d4dc722", + "zh:8cdb1c154dead85be8352afd30eaf41c59249de9e7e0a8eb4ab8e625b90a4922", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:9df647e8322d6f94f1843366ba39d21c4b36c8e7dcdc03711d52e27f73b0e974", - "zh:9e52037e68409802ff913b166c30e3f2035af03865cbef0c1b03762bce853941", - "zh:a30288e7c3c904d6998d1709835d7c5800a739f8608f0837f960286a2b8b6e59", - "zh:a7f24e3bda3be566468e4ad62cef1016f68c6f5a94d2e3e979485bc05626281b", - "zh:ba326ba80f5e39829b67a6d1ce54ba52b171e5e13a0a91ef5f9170a9b0cc9ce4", - "zh:c4e3fe9f2be6e244a3dfce599f4b0be9e8fffaece64cbc65f3195f825f65489b", - "zh:f20a251af37039bb2c7612dbd2c5df3a25886b4cc78f902385a2850ea6e30d08", + "zh:ac215fd1c3bd647ae38868940651b97a53197688daefcd70b3595c84560e5267", + "zh:c45db22356d20e431639061a72e07da5201f4937c1df6b9f03f32019facf3905", + "zh:c9ba90e62db9a4708ed1a4e094849f88ce9d44c52b49f613b30bb3f7523b8d97", + "zh:d2be3607be2209995c80dc1d66086d527de5d470f73509e813254067e8287106", + "zh:e3fa20090f3cebf3911fc7ef122bd8c0505e3330ab7d541fa945fea861205007", + "zh:ef1b9d5c0b6279323f2ecfc322db8083e141984cfe1bb2f33c0f4934fccb69e3", ] } diff --git a/terraform/main.tf b/terraform/main.tf index d7dc2d9..7d1003c 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -5,7 +5,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = "~> 4.0" + version = "~> 5.0" } } } From b6bf7beb4b9da2e8ee41e408aabcf8e9da596d39 Mon Sep 17 00:00:00 2001 From: Nikki Tebaldi <17799906+nikki-t@users.noreply.github.com> Date: Thu, 16 May 2024 20:24:11 +0000 Subject: [PATCH 3/4] Update version --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 1ac873d..fa1e11b 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -7,7 +7,7 @@ variable "app_name" { variable "app_version" { type = string description = "The application version number" - default = "0.1.1" + default = "0.1.3" } variable "aws_region" { From 09a13287c8a88c7e8bfa9ac26e61a8554dfd0894 Mon Sep 17 00:00:00 2001 From: Nikki Tebaldi <17799906+nikki-t@users.noreply.github.com> Date: Thu, 16 May 2024 20:30:45 +0000 Subject: [PATCH 4/4] Update to compute_environment_order --- terraform/generate-batch.tf | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/terraform/generate-batch.tf b/terraform/generate-batch.tf index 81fdb03..a6aac57 100644 --- a/terraform/generate-batch.tf +++ b/terraform/generate-batch.tf @@ -66,7 +66,10 @@ resource "aws_batch_job_queue" "aqua" { name = "${var.prefix}-aqua" state = "ENABLED" priority = 10 - compute_environments = [aws_batch_compute_environment.generate_aqua.arn] + compute_environment_order { + order = 1 + compute_environment = aws_batch_compute_environment.generate_aqua.arn + } scheduling_policy_arn = aws_batch_scheduling_policy.generate_aqua.arn } @@ -122,7 +125,10 @@ resource "aws_batch_job_queue" "terra" { name = "${var.prefix}-terra" state = "ENABLED" priority = 10 - compute_environments = [aws_batch_compute_environment.generate_terra.arn] + compute_environment_order { + order = 1 + compute_environment = aws_batch_compute_environment.generate_terra.arn + } scheduling_policy_arn = aws_batch_scheduling_policy.generate_terra.arn } @@ -178,6 +184,9 @@ resource "aws_batch_job_queue" "viirs" { name = "${var.prefix}-viirs" state = "ENABLED" priority = 10 - compute_environments = [aws_batch_compute_environment.generate_viirs.arn] + compute_environment_order { + order = 1 + compute_environment = aws_batch_compute_environment.generate_viirs.arn + } scheduling_policy_arn = aws_batch_scheduling_policy.generate_viirs.arn } \ No newline at end of file