Merge pull request #12 from podaac/release/0.1.3

Release/0.1.3
podaac · Jun 17, 2024 · 4b00116 · 4b00116
2 parents 89a946c + 09a1328
commit 4b00116
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 22 deletions.
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git 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
 }
diff --git 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"
   } 

diff --git 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"
     }
   }
 }

diff --git 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" {