From 897f0e2d6ad5aa1530473a784dd47c211fc4a776 Mon Sep 17 00:00:00 2001
From: xpk <xpk@headdesk.me>
Date: Thu, 13 Jul 2023 07:48:49 +0800
Subject: [PATCH] FIX: flowlog role and policy name change

---
 .../vpc-subnet-manual/vpc-flowlog.tf          | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/networking/vpc-subnet-manual/vpc-flowlog.tf b/modules/networking/vpc-subnet-manual/vpc-flowlog.tf
index 630c0e9..fe46210 100644
--- a/modules/networking/vpc-subnet-manual/vpc-flowlog.tf
+++ b/modules/networking/vpc-subnet-manual/vpc-flowlog.tf
@@ -1,9 +1,9 @@
 resource "aws_flow_log" "vpc-flowlog" {
-  count = var.enable-flow-log ? 1 : 0
-  iam_role_arn = aws_iam_role.vpcflowlog-role.arn
-  log_destination      = aws_cloudwatch_log_group.vpcflowlog-loggroup[0].arn
-  traffic_type         = "ALL"
-  vpc_id               = aws_vpc.vpc.id
+  count           = var.enable-flow-log ? 1 : 0
+  iam_role_arn    = aws_iam_role.vpcflowlog-role.arn
+  log_destination = aws_cloudwatch_log_group.vpcflowlog-loggroup[0].arn
+  traffic_type    = "ALL"
+  vpc_id          = aws_vpc.vpc.id
   tags = {
     Name = "${var.resource-prefix}-vpcflowlog"
   }
@@ -13,14 +13,18 @@ resource "aws_cloudwatch_log_group" "vpcflowlog-loggroup" {
   count = var.enable-flow-log ? 1 : 0
 
   name_prefix = "vpcflowlog/${aws_vpc.vpc.id}/"
-  kms_key_id = var.vpcflowlog-cwl-loggroup-key-arn
+  kms_key_id  = var.vpcflowlog-cwl-loggroup-key-arn
 
   retention_in_days = var.vpcflowlog-retain-days
 }
 
+resource "random_id" "rid" {
+  byte_length = 2
+}
+
 resource "aws_iam_role" "vpcflowlog-role" {
-  name = "${var.resource-prefix}-vpcflowlog"
-  path = "/service/"
+  name               = "VpcFlowlogRole-${random_id.rid.dec}"
+  path               = "/service/"
   assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
@@ -39,7 +43,7 @@ EOF
 }
 
 resource "aws_iam_role_policy" "vpcflowlog-role-policy" {
-  name = "${var.resource-prefix}-vpcflowlog"
+  name = "VpcFlowlogRole-${random_id.rid.dec}"
   role = aws_iam_role.vpcflowlog-role.id
 
   policy = <<EOF