From 38b2007ac1d8c7acaee2ae3c3cfc6db76be5ea3c Mon Sep 17 00:00:00 2001
From: jbeemster <joshua.a.beemster@gmail.com>
Date: Fri, 2 Feb 2024 15:54:48 +0100
Subject: [PATCH] Update Collector to v3.0.1 (closes #48)

---
 README.md                   |  2 +-
 templates/config.hocon.tmpl | 47 +++++++++++++++++--------------------
 variables.tf                |  2 +-
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index a8d9949..137bd12 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ module "collector_kinesis" {
 | <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The VPC to deploy the collector within | `string` | n/a | yes |
 | <a name="input_accept_limited_use_license"></a> [accept\_limited\_use\_license](#input\_accept\_limited\_use\_license) | Acceptance of the SLULA terms (https://docs.snowplow.io/limited-use-license-1.0/) | `bool` | `false` | no |
 | <a name="input_amazon_linux_2_ami_id"></a> [amazon\_linux\_2\_ami\_id](#input\_amazon\_linux\_2\_ami\_id) | The AMI ID to use which must be based of of Amazon Linux 2; by default the latest community version is used | `string` | `""` | no |
-| <a name="input_app_version"></a> [app\_version](#input\_app\_version) | App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value. | `string` | `"2.9.2"` | no |
+| <a name="input_app_version"></a> [app\_version](#input\_app\_version) | App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value. | `string` | `"3.0.1"` | no |
 | <a name="input_associate_public_ip_address"></a> [associate\_public\_ip\_address](#input\_associate\_public\_ip\_address) | Whether to assign a public ip address to this instance | `bool` | `true` | no |
 | <a name="input_bad_sqs_buffer_name"></a> [bad\_sqs\_buffer\_name](#input\_bad\_sqs\_buffer\_name) | The name of the bad sqs queue to use as an overflow buffer for kinesis | `string` | `""` | no |
 | <a name="input_byte_limit"></a> [byte\_limit](#input\_byte\_limit) | The amount of bytes to buffer events before pushing them downstream | `number` | `1000000` | no |
diff --git a/templates/config.hocon.tmpl b/templates/config.hocon.tmpl
index 029afc9..0af0461 100644
--- a/templates/config.hocon.tmpl
+++ b/templates/config.hocon.tmpl
@@ -59,30 +59,38 @@ collector {
     enabled = false
   }
   streams {
-    good = ${good_stream_name}
-    bad = ${bad_stream_name}
     useIpAddressAsPartitionKey = false
-    sink {
-      enabled = ${sink_type}
+    good {
+      name = ${good_stream_name}
       region = ${region}
 %{ if sink_type == "kinesis" && enable_sqs_buffer ~}
       sqsGoodBuffer = "${good_sqs_buffer_name}"
-      sqsBadBuffer = "${bad_sqs_buffer_name}"
 %{ endif ~}
-      threadPoolSize = 10
       aws {
         accessKey = iam
         secretKey = iam
       }
-      backoffPolicy {
-        minBackoff = 3000
-        maxBackoff = 10000
+      buffer {
+        byteLimit = ${byte_limit}
+        recordLimit = ${record_limit}
+        timeLimit = ${time_limit_ms}
       }
     }
-    buffer {
-      byteLimit = ${byte_limit}
-      recordLimit = ${record_limit}
-      timeLimit = ${time_limit_ms}
+    bad {
+      name = ${bad_stream_name}
+      region = ${region}
+%{ if sink_type == "kinesis" && enable_sqs_buffer ~}
+      sqsBadBuffer = "${bad_sqs_buffer_name}"
+%{ endif ~}
+      aws {
+        accessKey = iam
+        secretKey = iam
+      }
+      buffer {
+        byteLimit = ${byte_limit}
+        recordLimit = ${record_limit}
+        timeLimit = ${time_limit_ms}
+      }
     }
   }
   telemetry {
@@ -99,16 +107,3 @@ collector {
     instanceId = $${INSTANCE_ID}
   }
 }
-akka {
-  loglevel = WARNING
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
-  http.server {
-    remote-address-header = on
-    raw-request-uri-header = on
-    parsing {
-      max-uri-length = 32768
-      uri-parsing-mode = relaxed
-    }
-    max-connections = 2048
-  }
-}
diff --git a/variables.tf b/variables.tf
index 4320914..7fb0d75 100644
--- a/variables.tf
+++ b/variables.tf
@@ -17,7 +17,7 @@ variable "name" {
 variable "app_version" {
   description = "App version to use. This variable facilitates dev flow, the modules may not work with anything other than the default value."
   type        = string
-  default     = "2.9.2"
+  default     = "3.0.1"
 }
 
 variable "config_override_b64" {