Address Joao's feedback

README.md

@@ -246,9 +246,9 @@ module "enrich_kinesis" {
 | <a name="input_name"></a> [name](#input\_name) | A name which will be pre-pended to the resources created | `string` | n/a | yes |
 | <a name="input_ssh_key_name"></a> [ssh\_key\_name](#input\_ssh\_key\_name) | The name of the SSH key-pair to attach to all EC2 nodes deployed | `string` | n/a | yes |
 | <a name="input_subnet_ids"></a> [subnet\_ids](#input\_subnet\_ids) | The list of subnets to deploy Enrich across | `list(string)` | n/a | yes |
-| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The VPC to deploy Enrich within | `string` | n/a | yes |
-| <a name="input_assets_update_period"></a> [assets\_update\_period](#input\_assets\_update\_period) | Period after which enrich assets should be checked for updates (e.g. MaxMind DB) | `string` | `"7 days"` | yes |
+| <a name="input_vpc_id"></a> [vpc\_id](#input\_vpc\_id) | The VPC to deploy Enrich within (must have DNS hostnames enabled) | `string` | n/a | yes |
 | <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_assets_update_period"></a> [assets\_update\_period](#input\_assets\_update\_period) | Period after which enrich assets should be checked for updates (e.g. MaxMind DB) | `string` | `"7 days"` | 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_byte_limit"></a> [byte\_limit](#input\_byte\_limit) | The amount of bytes to buffer events before pushing them to Kinesis | `number` | `1000000` | no |
 | <a name="input_cloudwatch_logs_enabled"></a> [cloudwatch\_logs\_enabled](#input\_cloudwatch\_logs\_enabled) | Whether application logs should be reported to CloudWatch | `bool` | `true` | no |

main.tf

@@ -285,13 +285,6 @@ resource "aws_iam_policy" "iam_policy" {
         "arn:aws:s3:::snowplow-hosted-assets-ap-northeast-2",
         "arn:aws:s3:::snowplow-hosted-assets-ap-northeast-2/*"
       ]
-    },
-    {
-      "Action": [
-        "cloudwatch:PutMetricData"
-      ],
-      "Effect":"Allow",
-      "Resource": ["*"]
     }${local.custom_s3_hosted_assets_bucket_policy_final}
   ]
 }

templates/config.hocon.tmpl

@@ -39,8 +39,8 @@
       "stdout": {
         "period": "60 seconds"
       }
+      "cloudwatch": false
     }
-    "cloudwatch": false
   }
 
   "telemetry": {

variables.tf

@@ -147,6 +147,11 @@ variable "assets_update_period" {
   description = "Period after which enrich assets should be checked for updates (e.g. MaxMind DB)"
   default     = "7 days"
   type        = string
+
+  validation {
+    condition     = can(regex("\\d+ (ns|nano|nanos|nanosecond|nanoseconds|us|micro|micros|microsecond|microseconds|ms|milli|millis|millisecond|milliseconds|s|second|seconds|m|minute|minutes|h|hour|hours|d|day|days)", var.assets_update_period))
+    error_message = "Invalid period formant."
+  }
 }
 
 # --- Enrichment options