Skip to content

Commit a822da4

Browse files
frenchfrywpepperfrenchfrywpepper
committed
BYOVPC/aws: Remove trailing dash in common-prefix
I confirmed that this change results in a no-op if the provided variable is updated to remove the trailing dash and this code is used. Addresses feedback in this pr: #10 (comment)
1 parent eb37ae9 commit a822da4

11 files changed

Lines changed: 32 additions & 32 deletions

‎customer-managed/aws/terraform/iam_connectors_node_group.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ data "aws_iam_policy_document" "connectors_node_group_trust" {
1010
}
1111

1212
resource "aws_iam_role" "connectors_node_group" {
13-
name_prefix = "${var.common_prefix}connect-"
13+
name_prefix = "${var.common_prefix}-connect-"
1414
path = "/"
1515
force_detach_policies = true
1616
tags = merge(
@@ -23,7 +23,7 @@ resource "aws_iam_role" "connectors_node_group" {
2323
}
2424

2525
resource "aws_iam_instance_profile" "connectors_node_group" {
26-
name_prefix = "${var.common_prefix}connect-"
26+
name_prefix = "${var.common_prefix}-connect-"
2727
path = "/"
2828
role = aws_iam_role.connectors_node_group.name
2929
tags = merge(

‎customer-managed/aws/terraform/iam_connectors_secrets.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ data "aws_iam_policy_document" "connectors_secrets_manager_trust" {
3232
}
3333

3434
resource "aws_iam_role" "connectors_secrets_manager" {
35-
name_prefix = "${var.common_prefix}connectors-scrts-mgr-"
35+
name_prefix = "${var.common_prefix}-connectors-scrts-mgr-"
3636
assume_role_policy = data.aws_iam_policy_document.connectors_secrets_manager_trust.json
3737
}
3838

3939
resource "aws_iam_policy" "connectors_secrets_manager" {
40-
name_prefix = "${var.common_prefix}connectors-scrts-mgr-"
40+
name_prefix = "${var.common_prefix}-connectors-scrts-mgr-"
4141
path = "/"
4242
description = "Redpanda connectors - grant read-only access to connectors/* secrets manager"
4343
policy = data.aws_iam_policy_document.connectors_secrets_manager.json

‎customer-managed/aws/terraform/iam_redpanda_agent.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ data "aws_iam_policy_document" "redpanda_agent2" {
337337
aws_iam_policy.load_balancer_controller_policy["1"].arn,
338338
aws_iam_policy.load_balancer_controller_policy["2"].arn,
339339
# redpanda_agent1 and redpanda_agent2, cannot be referenced by object due to cycle
340-
"arn:aws:iam::${local.aws_account_id}:policy/${var.common_prefix}agent-*-*",
340+
"arn:aws:iam::${local.aws_account_id}:policy/${var.common_prefix}-agent-*-*",
341341
aws_iam_policy.cluster_autoscaler_policy.arn,
342342
aws_iam_policy.redpanda_cloud_storage_manager.arn,
343343
aws_iam_policy.connectors_secrets_manager.arn,
@@ -658,13 +658,13 @@ data "aws_iam_policy_document" "redpanda_agent_trust_ec2" {
658658
}
659659

660660
resource "aws_iam_role" "redpanda_agent" {
661-
name_prefix = "${var.common_prefix}agent-"
661+
name_prefix = "${var.common_prefix}-agent-"
662662
path = "/"
663663
assume_role_policy = data.aws_iam_policy_document.redpanda_agent_trust_ec2.json
664664
}
665665

666666
resource "aws_iam_instance_profile" "redpanda_agent" {
667-
name_prefix = "${var.common_prefix}agent-"
667+
name_prefix = "${var.common_prefix}-agent-"
668668
role = aws_iam_role.redpanda_agent.name
669669
}
670670

@@ -673,7 +673,7 @@ resource "aws_iam_policy" "redpanda_agent" {
673673
"1" = data.aws_iam_policy_document.redpanda_agent1
674674
"2" = data.aws_iam_policy_document.redpanda_agent2
675675
}
676-
name_prefix = "${var.common_prefix}agent-${each.key}-"
676+
name_prefix = "${var.common_prefix}-agent-${each.key}-"
677677
policy = each.value.json
678678
}
679679

@@ -688,7 +688,7 @@ resource "aws_iam_role_policy_attachment" "redpanda_agent" {
688688

689689
resource "aws_iam_policy" "redpanda_agent_private_link" {
690690
count = var.enable_private_link ? 1 : 0
691-
name_prefix = "${var.common_prefix}agent-pl-"
691+
name_prefix = "${var.common_prefix}-agent-pl-"
692692
policy = data.aws_iam_policy_document.redpanda_agent_private_link[0].json
693693
}
694694

‎customer-managed/aws/terraform/iam_redpanda_cloud_storage_manager.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ data "aws_iam_policy_document" "redpanda_cloud_storage_manager_trust" {
3333
}
3434

3535
resource "aws_iam_policy" "redpanda_cloud_storage_manager" {
36-
name_prefix = "${var.common_prefix}cloud-storage-manager-"
36+
name_prefix = "${var.common_prefix}-cloud-storage-manager-"
3737
policy = data.aws_iam_policy_document.redpanda_cloud_storage_manager.json
3838
}
3939

4040
resource "aws_iam_role" "redpanda_cloud_storage_manager" {
41-
name_prefix = "${var.common_prefix}cloud-storage-manager-"
41+
name_prefix = "${var.common_prefix}-cloud-storage-manager-"
4242
assume_role_policy = data.aws_iam_policy_document.redpanda_cloud_storage_manager_trust.json
4343
}
4444

‎customer-managed/aws/terraform/iam_redpanda_cluster.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resource "aws_iam_role" "k8s_cluster" {
1515
assume_role_policy = data.aws_iam_policy_document.k8s_cluster_trust.json
1616
force_detach_policies = true
1717
max_session_duration = 3600
18-
name_prefix = "${var.common_prefix}cluster-"
18+
name_prefix = "${var.common_prefix}-cluster-"
1919
path = "/"
2020
}
2121

‎customer-managed/aws/terraform/iam_redpanda_console.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ data "aws_iam_policy_document" "console_secrets_manager" {
2929
}
3030

3131
resource "aws_iam_policy" "console_secrets_manager" {
32-
name_prefix = "${var.common_prefix}console-scrts-mgr-"
32+
name_prefix = "${var.common_prefix}-console-scrts-mgr-"
3333
path = "/"
3434
description = "Redpanda console - grant create/update/delete access to secrets manager"
3535
policy = data.aws_iam_policy_document.console_secrets_manager.json
@@ -57,7 +57,7 @@ data "aws_iam_policy_document" "console_secrets_manager_trust" {
5757
}
5858

5959
resource "aws_iam_role" "console_secrets_manager_redpanda" {
60-
name_prefix = "${var.common_prefix}console-scrts-mgr-"
60+
name_prefix = "${var.common_prefix}-console-scrts-mgr-"
6161
assume_role_policy = data.aws_iam_policy_document.console_secrets_manager_trust.json
6262
}
6363

‎customer-managed/aws/terraform/iam_redpanda_node_group.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ data "aws_iam_policy_document" "redpanda_node_group_trust" {
1414
resource "aws_iam_role" "redpanda_node_group" {
1515
assume_role_policy = data.aws_iam_policy_document.redpanda_node_group_trust.json
1616
force_detach_policies = true
17-
name_prefix = "${var.common_prefix}rp-"
17+
name_prefix = "${var.common_prefix}-rp-"
1818
path = "/"
1919
}
2020

2121
resource "aws_iam_instance_profile" "redpanda_node_group" {
22-
name_prefix = "${var.common_prefix}rp-"
22+
name_prefix = "${var.common_prefix}-rp-"
2323
path = "/"
2424
role = aws_iam_role.redpanda_node_group.name
2525
}

‎customer-managed/aws/terraform/iam_rpk_user.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ data "aws_iam_policy_document" "byovpc_rpk_user_1" {
150150
aws_iam_role.k8s_cluster.arn,
151151
aws_iam_role.redpanda_utility_node_group.arn,
152152
aws_iam_role.connectors_node_group.arn,
153-
"arn:aws:iam::${local.aws_account_id}:role/${var.common_prefix}rpk-user-role-*",
153+
"arn:aws:iam::${local.aws_account_id}:role/${var.common_prefix}-rpk-user-role-*",
154154
]
155155
}
156156

@@ -363,7 +363,7 @@ resource "aws_iam_policy" "byovpc_rpk_user" {
363363
"1" = data.aws_iam_policy_document.byovpc_rpk_user_1,
364364
"2" = data.aws_iam_policy_document.byovpc_rpk_user_2,
365365
}
366-
name_prefix = "${var.common_prefix}rpk-user-${each.key}_"
366+
name_prefix = "${var.common_prefix}-rpk-user-${each.key}_"
367367
path = "/"
368368
description = "Minimum permissions required for RPK user for BYO VPC"
369369
policy = each.value.json

‎customer-managed/aws/terraform/iam_utility_node_group.tf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data "aws_iam_policy_document" "cluster_autoscaler_policy" {
4040
}
4141

4242
resource "aws_iam_policy" "cluster_autoscaler_policy" {
43-
name_prefix = "${var.common_prefix}rp-autoscaler-"
43+
name_prefix = "${var.common_prefix}-rp-autoscaler-"
4444
policy = data.aws_iam_policy_document.cluster_autoscaler_policy.json
4545
}
4646

@@ -70,7 +70,7 @@ data "aws_iam_policy_document" "external_dns" {
7070
}
7171

7272
resource "aws_iam_policy" "external_dns_policy" {
73-
name_prefix = "${var.common_prefix}external_dns_policy-"
73+
name_prefix = "${var.common_prefix}-external_dns_policy-"
7474
path = "/"
7575
description = "Policy to enable external-dns to manage hosted zones"
7676
policy = data.aws_iam_policy_document.external_dns.json
@@ -189,7 +189,7 @@ data "aws_iam_policy_document" "aws_ebs_csi_driver" {
189189
}
190190

191191
resource "aws_iam_policy" "aws_ebs_csi_driver_policy" {
192-
name_prefix = "${var.common_prefix}aws_ebs_csi_driver-"
192+
name_prefix = "${var.common_prefix}-aws_ebs_csi_driver-"
193193
path = "/"
194194
description = "Policy to enable EKS nodes to manage and create EBS volumes using the AWS EBS CSI driver"
195195

@@ -596,7 +596,7 @@ resource "aws_iam_policy" "load_balancer_controller_policy" {
596596
"1" : data.aws_iam_policy_document.load_balancer_controller_1
597597
"2" : data.aws_iam_policy_document.load_balancer_controller_2
598598
}
599-
name_prefix = "${var.common_prefix}load_balancer_controller_${each.key}-"
599+
name_prefix = "${var.common_prefix}-load_balancer_controller_${each.key}-"
600600
path = "/"
601601
description = "Policy to enable the load balancer controller to expose load balancers"
602602
policy = each.value.json
@@ -638,7 +638,7 @@ data "aws_iam_policy_document" "cert_manager" {
638638
}
639639

640640
resource "aws_iam_policy" "cert_manager" {
641-
name_prefix = "${var.common_prefix}cert_manager_policy-"
641+
name_prefix = "${var.common_prefix}-cert_manager_policy-"
642642
path = "/"
643643
description = "Policy to enable cert-manager to manage challenges"
644644
policy = data.aws_iam_policy_document.cert_manager.json
@@ -662,7 +662,7 @@ data "aws_iam_policy_document" "utility_node_group_trust" {
662662
resource "aws_iam_role" "redpanda_utility_node_group" {
663663
assume_role_policy = data.aws_iam_policy_document.utility_node_group_trust.json
664664
force_detach_policies = true
665-
name_prefix = "${var.common_prefix}util-"
665+
name_prefix = "${var.common_prefix}-util-"
666666
path = "/"
667667
}
668668

@@ -684,7 +684,7 @@ resource "aws_iam_role_policy_attachment" "external_dns_utility_nodes" {
684684
}
685685

686686
resource "aws_iam_instance_profile" "utility" {
687-
name_prefix = "${var.common_prefix}util-"
687+
name_prefix = "${var.common_prefix}-util-"
688688
path = "/"
689689
role = aws_iam_role.redpanda_utility_node_group.name
690690
}

‎customer-managed/aws/terraform/security_groups.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Redpanda Agent security group
33
// -----------------------------
44
resource "aws_security_group" "redpanda_agent" {
5-
name_prefix = "${var.common_prefix}agent-"
5+
name_prefix = "${var.common_prefix}-agent-"
66
description = "Redpanda agent VM"
77
vpc_id = aws_vpc.redpanda.id
88
ingress = []
@@ -22,7 +22,7 @@ resource "aws_security_group" "redpanda_agent" {
2222
// Connectors security group
2323
// -----------------------------
2424
resource "aws_security_group" "connectors" {
25-
name_prefix = "${var.common_prefix}connect-"
25+
name_prefix = "${var.common_prefix}-connect-"
2626
description = "Redpanda connectors nodes"
2727
vpc_id = aws_vpc.redpanda.id
2828
lifecycle {
@@ -44,7 +44,7 @@ resource "aws_security_group_rule" "connectors" {
4444
// Utility security group
4545
// -----------------------------
4646
resource "aws_security_group" "utility" {
47-
name_prefix = "${var.common_prefix}util-"
47+
name_prefix = "${var.common_prefix}-util-"
4848
description = "Redpanda utility nodes"
4949
vpc_id = aws_vpc.redpanda.id
5050
lifecycle {
@@ -66,7 +66,7 @@ resource "aws_security_group_rule" "utility" {
6666
// Redpanda Node Group security group
6767
// ----------------------------------
6868
resource "aws_security_group" "redpanda_node_group" {
69-
name_prefix = "${var.common_prefix}rp-"
69+
name_prefix = "${var.common_prefix}-rp-"
7070
description = "Redpanda cluster nodes"
7171
vpc_id = aws_vpc.redpanda.id
7272
lifecycle {
@@ -108,7 +108,7 @@ resource "aws_security_group_rule" "redpanda_node_group" {
108108
// Cluster security group
109109
// -----------------------------
110110
resource "aws_security_group" "cluster" {
111-
name_prefix = "${var.common_prefix}cluster-"
111+
name_prefix = "${var.common_prefix}-cluster-"
112112
description = "EKS cluster security group"
113113
vpc_id = aws_vpc.redpanda.id
114114
lifecycle {
@@ -160,7 +160,7 @@ resource "aws_security_group_rule" "cluster_egress_nodes_kubelet" {
160160
// Node security group
161161
// -----------------------------
162162
resource "aws_security_group" "node" {
163-
name_prefix = "${var.common_prefix}node-"
163+
name_prefix = "${var.common_prefix}-node-"
164164
description = "EKS node shared security group"
165165
vpc_id = aws_vpc.redpanda.id
166166
lifecycle {

0 commit comments

Comments
 (0)