Skip to content

Commit b40ade4

Browse files
authored
fix: Correct tflint errors for latest version of tflint (#296)
1 parent 2f53f61 commit b40ade4

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

modules/iam-assumable-role-with-oidc/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ resource "aws_iam_role" "this" {
9595
force_detach_policies = var.force_detach_policies
9696
permissions_boundary = var.role_permissions_boundary_arn
9797

98-
assume_role_policy = join("", data.aws_iam_policy_document.assume_role_with_oidc.*.json)
98+
assume_role_policy = data.aws_iam_policy_document.assume_role_with_oidc[0].json
9999

100100
tags = var.tags
101101
}
102102

103103
resource "aws_iam_role_policy_attachment" "custom" {
104104
count = var.create_role ? local.number_of_role_policy_arns : 0
105105

106-
role = join("", aws_iam_role.this.*.name)
106+
role = aws_iam_role.this[0].name
107107
policy_arn = var.role_policy_arns[count.index]
108108
}

modules/iam-assumable-role-with-saml/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ resource "aws_iam_role" "this" {
6565
resource "aws_iam_role_policy_attachment" "custom" {
6666
count = var.create_role ? local.number_of_role_policy_arns : 0
6767

68-
role = join("", aws_iam_role.this.*.name)
68+
role = aws_iam_role.this[0].name
6969
policy_arn = var.role_policy_arns[count.index]
7070
}

modules/iam-group-with-policies/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
locals {
2-
group_name = element(concat(aws_iam_group.this.*.id, [var.name]), 0)
2+
group_name = var.create_group ? aws_iam_group.this[0].id : var.name
33
}
44

55
resource "aws_iam_group" "this" {
@@ -37,7 +37,7 @@ resource "aws_iam_group_policy_attachment" "custom" {
3737
count = length(var.custom_group_policies)
3838

3939
group = local.group_name
40-
policy_arn = element(aws_iam_policy.custom.*.arn, count.index)
40+
policy_arn = element(aws_iam_policy.custom[*].arn, count.index)
4141
}
4242

4343
###############

modules/iam-group-with-policies/policies.tf

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ data "aws_caller_identity" "current" {
55
data "aws_partition" "current" {}
66

77
locals {
8-
aws_account_id = element(
9-
concat(
10-
data.aws_caller_identity.current.*.account_id,
11-
[var.aws_account_id],
12-
),
13-
0,
14-
)
8+
aws_account_id = try(data.aws_caller_identity.current[0].account_id, var.aws_account_id)
159
}
1610

1711
data "aws_iam_policy_document" "iam_self_management" {

modules/iam-read-only-policy/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ data "aws_iam_policy_document" "logs_query" {
8282
data "aws_iam_policy_document" "combined" {
8383
source_policy_documents = concat(
8484
[data.aws_iam_policy_document.allowed_services.json],
85-
data.aws_iam_policy_document.console_services.*.json,
86-
data.aws_iam_policy_document.sts.*.json,
87-
data.aws_iam_policy_document.logs_query.*.json,
85+
data.aws_iam_policy_document.console_services[*].json,
86+
data.aws_iam_policy_document.sts[*].json,
87+
data.aws_iam_policy_document.logs_query[*].json,
8888
[var.additional_policy_json]
8989
)
9090
}

0 commit comments

Comments
 (0)