From 73d4c2ada26b40c8ba4888aa4b3581b5c487fdb2 Mon Sep 17 00:00:00 2001
From: Dan Giles <dangiles@Dans-MacBook-Pro.local>
Date: Tue, 29 Aug 2023 14:17:34 +0100
Subject: [PATCH 1/4] feat: Update to the container image

---
 modules/batch/main.tf | 35 -----------------------------------
 variables.tf          |  2 +-
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/modules/batch/main.tf b/modules/batch/main.tf
index d57a768..4aebba4 100644
--- a/modules/batch/main.tf
+++ b/modules/batch/main.tf
@@ -44,41 +44,6 @@ module "batch" {
     }
   }
 
-  # # Job queues and scheduling policies
-  # job_queues = {
-  #   low_priority = {
-  #     name     = "LowPriority"
-  #     state    = "ENABLED"
-  #     priority = 1
-
-  #     tags = {
-  #       JobQueue = "Low priority job queue"
-  #     }
-  #   }
-
-  #   high_priority = {
-  #     name     = "HighPriority"
-  #     state    = "ENABLED"
-  #     priority = 99
-
-  #     fair_share_policy = {
-  #       compute_reservation = 1
-  #       share_decay_seconds = 3600
-
-  #       share_distribution = [{
-  #         share_identifier = "A1*"
-  #         weight_factor    = 0.1
-  #         }, {
-  #         share_identifier = "A2"
-  #         weight_factor    = 0.2
-  #       }]
-  #     }
-
-  #     tags = {
-  #       JobQueue = "High priority job queue"
-  #     }
-  #   }
-  # }
 }
 
 resource "aws_batch_job_definition" "simple_batch_job" {
diff --git a/variables.tf b/variables.tf
index e163e85..5d2dd21 100644
--- a/variables.tf
+++ b/variables.tf
@@ -42,7 +42,7 @@ variable "compute_resources_max_vcpus" {
 variable "container_image_url" {
   type        = string
   description = "Container image URL"
-  default     = "public.ecr.aws/docker/library/busybox:latest"
+  default     = "public.ecr.aws/docker/library/pandoc:core"
 }
 variable "container_vcpu" {
   type        = number

From 1834174052addd5c48e292c0f9538a9a5b3d24a9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:18:26 +0000
Subject: [PATCH 2/4] terraform-docs: automated action

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 929cd56..208afff 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ No resources.
 | <a name="input_as2_stack_name"></a> [as2\_stack\_name](#input\_as2\_stack\_name) | Stack name | `string` | `"ARC-batch-stack"` | no |
 | <a name="input_compute_environments"></a> [compute\_environments](#input\_compute\_environments) | Compute environments | `string` | `"fargate"` | no |
 | <a name="input_compute_resources_max_vcpus"></a> [compute\_resources\_max\_vcpus](#input\_compute\_resources\_max\_vcpus) | Max VCPUs resources | `number` | `1` | no |
-| <a name="input_container_image_url"></a> [container\_image\_url](#input\_container\_image\_url) | Container image URL | `string` | `"public.ecr.aws/docker/library/busybox:latest"` | no |
+| <a name="input_container_image_url"></a> [container\_image\_url](#input\_container\_image\_url) | Container image URL | `string` | `"public.ecr.aws/docker/library/pandoc:core"` | no |
 | <a name="input_container_memory"></a> [container\_memory](#input\_container\_memory) | Containter Memory resources | `number` | `2048` | no |
 | <a name="input_container_vcpu"></a> [container\_vcpu](#input\_container\_vcpu) | Containter VCPUs resources | `number` | `1` | no |
 | <a name="input_efs_throughput_in_mibps"></a> [efs\_throughput\_in\_mibps](#input\_efs\_throughput\_in\_mibps) | EFS provisioned throughput in mibps | `number` | `1` | no |

From aca77833a3b1aafe8d9dcad76032c98a30fef8d0 Mon Sep 17 00:00:00 2001
From: Dan Giles <dangiles@Dans-MacBook-Pro.local>
Date: Fri, 1 Sep 2023 11:06:30 +0100
Subject: [PATCH 3/4] feat: Updating container to pandoc

---
 modules/batch/main.tf    | 2 +-
 modules/datasync/main.tf | 2 +-
 variables.tf             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/batch/main.tf b/modules/batch/main.tf
index 4aebba4..7662943 100644
--- a/modules/batch/main.tf
+++ b/modules/batch/main.tf
@@ -55,7 +55,7 @@ resource "aws_batch_job_definition" "simple_batch_job" {
   container_properties = <<CONTAINER_PROPERTIES
   {
     "image": "${var.container_image_url}",
-    "command": ["df", "-h"],
+    "command": ["/mnt/example.txt", "-o", "example.pdf"],
     "executionRoleArn": "${aws_iam_role.ecs_task_execution_role.arn}",
     "volumes": [
       {
diff --git a/modules/datasync/main.tf b/modules/datasync/main.tf
index eaf5e38..0381dc6 100644
--- a/modules/datasync/main.tf
+++ b/modules/datasync/main.tf
@@ -22,7 +22,7 @@ resource "aws_datasync_task" "datasync_task_efs_s3" {
 
 resource "aws_datasync_location_s3" "s3_upload" {
   s3_bucket_arn = var.upload_s3_arn
-  subdirectory  = "/chronostics/"
+  subdirectory  = "/"
 
   s3_config {
     bucket_access_role_arn = aws_iam_role.role_for_datasync_s3_uploads.arn
diff --git a/variables.tf b/variables.tf
index 5d2dd21..37f82ec 100644
--- a/variables.tf
+++ b/variables.tf
@@ -37,12 +37,12 @@ variable "compute_environments" {
 variable "compute_resources_max_vcpus" {
   type        = number
   description = "Max VCPUs resources"
-  default     = 1
+  default     = 1.0
 }
 variable "container_image_url" {
   type        = string
   description = "Container image URL"
-  default     = "public.ecr.aws/docker/library/pandoc:core"
+  default     = "pandoc/minimal"
 }
 variable "container_vcpu" {
   type        = number

From 811fd129463593e1ead10041cb866f29cd13a99e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 1 Sep 2023 10:07:30 +0000
Subject: [PATCH 4/4] terraform-docs: automated action

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 208afff..ddd5a0c 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ No resources.
 | <a name="input_as2_stack_name"></a> [as2\_stack\_name](#input\_as2\_stack\_name) | Stack name | `string` | `"ARC-batch-stack"` | no |
 | <a name="input_compute_environments"></a> [compute\_environments](#input\_compute\_environments) | Compute environments | `string` | `"fargate"` | no |
 | <a name="input_compute_resources_max_vcpus"></a> [compute\_resources\_max\_vcpus](#input\_compute\_resources\_max\_vcpus) | Max VCPUs resources | `number` | `1` | no |
-| <a name="input_container_image_url"></a> [container\_image\_url](#input\_container\_image\_url) | Container image URL | `string` | `"public.ecr.aws/docker/library/pandoc:core"` | no |
+| <a name="input_container_image_url"></a> [container\_image\_url](#input\_container\_image\_url) | Container image URL | `string` | `"pandoc/minimal"` | no |
 | <a name="input_container_memory"></a> [container\_memory](#input\_container\_memory) | Containter Memory resources | `number` | `2048` | no |
 | <a name="input_container_vcpu"></a> [container\_vcpu](#input\_container\_vcpu) | Containter VCPUs resources | `number` | `1` | no |
 | <a name="input_efs_throughput_in_mibps"></a> [efs\_throughput\_in\_mibps](#input\_efs\_throughput\_in\_mibps) | EFS provisioned throughput in mibps | `number` | `1` | no |