Skip to content

Commit 44606fc

Browse files
nozaqnozaq
authored
refactor: use one instead of join to pick the first element (nozaq#194)
1 parent 30edea2 commit 44606fc

File tree

30 files changed

+48
-48
lines changed

30 files changed

+48
-48
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ This module is composed of several submodules and each of which can be used inde
110110

111111
| Name | Version |
112112
|------|---------|
113-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
113+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
114114
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.39.0 |
115115

116116
## Providers

‎config_baselines.tf

+19-19
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ data "aws_iam_policy_document" "recorder_publish_policy" {
7171
resource "aws_iam_role_policy" "recorder_publish_policy" {
7272
count = var.config_baseline_enabled ? 1 : 0
7373
name = var.config_iam_role_policy_name
74-
role = join("", aws_iam_role.recorder.*.id)
74+
role = one(aws_iam_role.recorder[*].id)
7575
policy = data.aws_iam_policy_document.recorder_publish_policy[0].json
7676
}
7777

7878
resource "aws_iam_role_policy_attachment" "recorder_read_policy" {
7979
count = var.config_baseline_enabled ? 1 : 0
80-
role = join("", aws_iam_role.recorder.*.id)
80+
role = one(aws_iam_role.recorder[*].id)
8181
policy_arn = "arn:aws:iam::aws:policy/service-role/AWS_ConfigRole"
8282
}
8383

@@ -94,7 +94,7 @@ module "config_baseline_ap-northeast-1" {
9494
}
9595

9696
enabled = var.config_baseline_enabled && contains(var.target_regions, "ap-northeast-1")
97-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
97+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
9898
s3_bucket_name = local.audit_log_bucket_id
9999
s3_key_prefix = var.config_s3_bucket_key_prefix
100100
delivery_frequency = var.config_delivery_frequency
@@ -111,7 +111,7 @@ module "config_baseline_ap-northeast-2" {
111111
}
112112

113113
enabled = var.config_baseline_enabled && contains(var.target_regions, "ap-northeast-2")
114-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
114+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
115115
s3_bucket_name = local.audit_log_bucket_id
116116
s3_key_prefix = var.config_s3_bucket_key_prefix
117117
delivery_frequency = var.config_delivery_frequency
@@ -128,7 +128,7 @@ module "config_baseline_ap-northeast-3" {
128128
}
129129

130130
enabled = var.config_baseline_enabled && contains(var.target_regions, "ap-northeast-3")
131-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
131+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
132132
s3_bucket_name = local.audit_log_bucket_id
133133
s3_key_prefix = var.config_s3_bucket_key_prefix
134134
delivery_frequency = var.config_delivery_frequency
@@ -145,7 +145,7 @@ module "config_baseline_ap-south-1" {
145145
}
146146

147147
enabled = var.config_baseline_enabled && contains(var.target_regions, "ap-south-1")
148-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
148+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
149149
s3_bucket_name = local.audit_log_bucket_id
150150
s3_key_prefix = var.config_s3_bucket_key_prefix
151151
delivery_frequency = var.config_delivery_frequency
@@ -162,7 +162,7 @@ module "config_baseline_ap-southeast-1" {
162162
}
163163

164164
enabled = var.config_baseline_enabled && contains(var.target_regions, "ap-southeast-1")
165-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
165+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
166166
s3_bucket_name = local.audit_log_bucket_id
167167
s3_key_prefix = var.config_s3_bucket_key_prefix
168168
delivery_frequency = var.config_delivery_frequency
@@ -179,7 +179,7 @@ module "config_baseline_ap-southeast-2" {
179179
}
180180

181181
enabled = var.config_baseline_enabled && contains(var.target_regions, "ap-southeast-2")
182-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
182+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
183183
s3_bucket_name = local.audit_log_bucket_id
184184
s3_key_prefix = var.config_s3_bucket_key_prefix
185185
delivery_frequency = var.config_delivery_frequency
@@ -196,7 +196,7 @@ module "config_baseline_ca-central-1" {
196196
}
197197

198198
enabled = var.config_baseline_enabled && contains(var.target_regions, "ca-central-1")
199-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
199+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
200200
s3_bucket_name = local.audit_log_bucket_id
201201
s3_key_prefix = var.config_s3_bucket_key_prefix
202202
delivery_frequency = var.config_delivery_frequency
@@ -213,7 +213,7 @@ module "config_baseline_eu-central-1" {
213213
}
214214

215215
enabled = var.config_baseline_enabled && contains(var.target_regions, "eu-central-1")
216-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
216+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
217217
s3_bucket_name = local.audit_log_bucket_id
218218
s3_key_prefix = var.config_s3_bucket_key_prefix
219219
delivery_frequency = var.config_delivery_frequency
@@ -230,7 +230,7 @@ module "config_baseline_eu-north-1" {
230230
}
231231

232232
enabled = var.config_baseline_enabled && contains(var.target_regions, "eu-north-1")
233-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
233+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
234234
s3_bucket_name = local.audit_log_bucket_id
235235
s3_key_prefix = var.config_s3_bucket_key_prefix
236236
delivery_frequency = var.config_delivery_frequency
@@ -247,7 +247,7 @@ module "config_baseline_eu-west-1" {
247247
}
248248

249249
enabled = var.config_baseline_enabled && contains(var.target_regions, "eu-west-1")
250-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
250+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
251251
s3_bucket_name = local.audit_log_bucket_id
252252
s3_key_prefix = var.config_s3_bucket_key_prefix
253253
delivery_frequency = var.config_delivery_frequency
@@ -264,7 +264,7 @@ module "config_baseline_eu-west-2" {
264264
}
265265

266266
enabled = var.config_baseline_enabled && contains(var.target_regions, "eu-west-2")
267-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
267+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
268268
s3_bucket_name = local.audit_log_bucket_id
269269
s3_key_prefix = var.config_s3_bucket_key_prefix
270270
delivery_frequency = var.config_delivery_frequency
@@ -281,7 +281,7 @@ module "config_baseline_eu-west-3" {
281281
}
282282

283283
enabled = var.config_baseline_enabled && contains(var.target_regions, "eu-west-3")
284-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
284+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
285285
s3_bucket_name = local.audit_log_bucket_id
286286
s3_key_prefix = var.config_s3_bucket_key_prefix
287287
delivery_frequency = var.config_delivery_frequency
@@ -298,7 +298,7 @@ module "config_baseline_sa-east-1" {
298298
}
299299

300300
enabled = var.config_baseline_enabled && contains(var.target_regions, "sa-east-1")
301-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
301+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
302302
s3_bucket_name = local.audit_log_bucket_id
303303
s3_key_prefix = var.config_s3_bucket_key_prefix
304304
delivery_frequency = var.config_delivery_frequency
@@ -315,7 +315,7 @@ module "config_baseline_us-east-1" {
315315
}
316316

317317
enabled = var.config_baseline_enabled && contains(var.target_regions, "us-east-1")
318-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
318+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
319319
s3_bucket_name = local.audit_log_bucket_id
320320
s3_key_prefix = var.config_s3_bucket_key_prefix
321321
delivery_frequency = var.config_delivery_frequency
@@ -332,7 +332,7 @@ module "config_baseline_us-east-2" {
332332
}
333333

334334
enabled = var.config_baseline_enabled && contains(var.target_regions, "us-east-2")
335-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
335+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
336336
s3_bucket_name = local.audit_log_bucket_id
337337
s3_key_prefix = var.config_s3_bucket_key_prefix
338338
delivery_frequency = var.config_delivery_frequency
@@ -349,7 +349,7 @@ module "config_baseline_us-west-1" {
349349
}
350350

351351
enabled = var.config_baseline_enabled && contains(var.target_regions, "us-west-1")
352-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
352+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
353353
s3_bucket_name = local.audit_log_bucket_id
354354
s3_key_prefix = var.config_s3_bucket_key_prefix
355355
delivery_frequency = var.config_delivery_frequency
@@ -366,7 +366,7 @@ module "config_baseline_us-west-2" {
366366
}
367367

368368
enabled = var.config_baseline_enabled && contains(var.target_regions, "us-west-2")
369-
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
369+
iam_role_arn = one(aws_iam_role.recorder[*].arn)
370370
s3_bucket_name = local.audit_log_bucket_id
371371
s3_key_prefix = var.config_s3_bucket_key_prefix
372372
delivery_frequency = var.config_delivery_frequency

‎examples/external-bucket/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
terraform {
3-
required_version = ">= 0.12"
3+
required_version = ">= 0.13"
44
}

‎examples/organization/master/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
terraform {
3-
required_version = ">= 0.12"
3+
required_version = ">= 0.13"
44
}

‎examples/organization/member/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
terraform {
3-
required_version = ">= 0.12"
3+
required_version = ">= 0.13"
44
}

‎examples/select-region/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
terraform {
3-
required_version = ">= 0.12"
3+
required_version = ">= 0.13"
44
}

‎examples/simple/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
terraform {
3-
required_version = ">= 0.12"
3+
required_version = ">= 0.13"
44
}

‎modules/alarm-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Set up CloudWatch alarms to notify you when critical changes happen in your AWS
77

88
| Name | Version |
99
|------|---------|
10-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
10+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1111
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1212

1313
## Providers

‎modules/alarm-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/analyzer-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
| Name | Version |
1111
|------|---------|
12-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
12+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1313
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1414

1515
## Providers

‎modules/analyzer-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/cloudtrail-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Enable CloudTrail in all regions and deliver events to CloudWatch Logs. CloudTra
77

88
| Name | Version |
99
|------|---------|
10-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
10+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1111
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1212

1313
## Providers

‎modules/cloudtrail-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/config-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Enable AWS Config in all regions to automatically take configuration snapshots.
77

88
| Name | Version |
99
|------|---------|
10-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
10+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1111
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1212

1313
## Providers

‎modules/config-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/ebs-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
| Name | Version |
1111
|------|---------|
12-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
12+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1313
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1414

1515
## Providers

‎modules/ebs-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/guardduty-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Enable GuardDuty in all regions.
77

88
| Name | Version |
99
|------|---------|
10-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
10+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1111
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1212

1313
## Providers

‎modules/guardduty-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/iam-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
| Name | Version |
1212
|------|---------|
13-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
13+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1414
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1515

1616
## Providers

‎modules/iam-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/s3-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
| Name | Version |
1111
|------|---------|
12-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
12+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1313
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1414

1515
## Providers

‎modules/s3-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/secure-bucket/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Creates a S3 bucket with access logging enabled.
77

88
| Name | Version |
99
|------|---------|
10-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
10+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1111
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1212

1313
## Providers

‎modules/secure-bucket/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/securityhub-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
| Name | Version |
1414
|------|---------|
15-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
15+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1616
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1717

1818
## Providers

‎modules/securityhub-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎modules/vpc-baseline/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
| Name | Version |
1313
|------|---------|
14-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.12 |
14+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
1515
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0.0 |
1616

1717
## Providers

‎modules/vpc-baseline/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

‎versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.12"
2+
required_version = ">= 0.13"
33

44
required_providers {
55
aws = {

0 commit comments

Comments
 (0)