Merge pull request #21 from draios/fix-naming

feat(AWS Onboarding): keeping naming of resources deterministic
draios · May 3, 2023 · c9c9aa0 · c9c9aa0
2 parents ba4c212 + e51b5ed
commit c9c9aa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/services/event-bridge/main.tf b/modules/services/event-bridge/main.tf
@@ -66,7 +66,7 @@ resource "aws_cloudwatch_event_target" "sysdig" {
 resource "aws_iam_role" "event_bus_invoke_remote_event_bus" {
   count = (var.is_organizational || var.deploy_global_resources) ? 1 : 0
 
-  name = join("-", [var.name, "MgmtEBRole"])
+  name = var.name
   tags = var.tags
 
   assume_role_policy = <<EOF

diff --git a/modules/services/event-bridge/organizational.tf b/modules/services/event-bridge/organizational.tf
@@ -19,7 +19,7 @@ locals {
 resource "aws_cloudformation_stack_set" "eb-rule-stackset" {
   count = var.is_organizational ? 1 : 0
 
-  name             = join("-", [var.name, "EBRuleOrg"])
+  name             = var.name
   tags             = var.tags
   permission_model = "SERVICE_MANAGED"
   capabilities     = ["CAPABILITY_NAMED_IAM"]
@@ -52,7 +52,7 @@ TEMPLATE
 resource "aws_cloudformation_stack_set" "mgmt-stackset" {
   count = var.is_organizational ? 1 : 0
 
-  name                    = join("-", [var.name, "EBRuleMgmtAcc"])
+  name                    = var.name
   tags                    = var.tags
   permission_model        = "SELF_MANAGED"
   capabilities            = ["CAPABILITY_NAMED_IAM"]
@@ -81,7 +81,7 @@ TEMPLATE
 resource "aws_cloudformation_stack_set" "eb-role-stackset" {
   count = var.is_organizational ? 1 : 0
 
-  name             = join("-", [var.name, "EBRoleOrg"])
+  name             = var.name
   tags             = var.tags
   permission_model = "SERVICE_MANAGED"
   capabilities     = ["CAPABILITY_NAMED_IAM"]