Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: use one instead of join to pick the first element #194

Merged
merged 1 commit into from
Jun 20, 2021
Merged

refactor: use one instead of join to pick the first element #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ This module is composed of several submodules and each of which can be used inde

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

## Providers
Expand Down
38 changes: 19 additions & 19 deletions config_baselines.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ data "aws_iam_policy_document" "recorder_publish_policy" {
resource "aws_iam_role_policy" "recorder_publish_policy" {
count = var.config_baseline_enabled ? 1 : 0
name = var.config_iam_role_policy_name
role = join("", aws_iam_role.recorder.*.id)
role = one(aws_iam_role.recorder[*].id)
policy = data.aws_iam_policy_document.recorder_publish_policy[0].json
}

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

Expand All @@ -94,7 +94,7 @@ module "config_baseline_ap-northeast-1" {
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

enabled = var.config_baseline_enabled && contains(var.target_regions, "us-west-2")
iam_role_arn = join("", aws_iam_role.recorder.*.arn)
iam_role_arn = one(aws_iam_role.recorder[*].arn)
s3_bucket_name = local.audit_log_bucket_id
s3_key_prefix = var.config_s3_bucket_key_prefix
delivery_frequency = var.config_delivery_frequency
Expand Down
2 changes: 1 addition & 1 deletion examples/external-bucket/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
}
2 changes: 1 addition & 1 deletion examples/organization/master/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
}
2 changes: 1 addition & 1 deletion examples/organization/member/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
}
2 changes: 1 addition & 1 deletion examples/select-region/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
}
2 changes: 1 addition & 1 deletion examples/simple/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"
}
2 changes: 1 addition & 1 deletion modules/alarm-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Set up CloudWatch alarms to notify you when critical changes happen in your AWS

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/alarm-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/analyzer-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/analyzer-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/cloudtrail-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Enable CloudTrail in all regions and deliver events to CloudWatch Logs. CloudTra

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/cloudtrail-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/config-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Enable AWS Config in all regions to automatically take configuration snapshots.

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/config-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/ebs-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/ebs-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/guardduty-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Enable GuardDuty in all regions.

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/guardduty-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/iam-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/iam-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/s3-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/s3-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/secure-bucket/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Creates a S3 bucket with access logging enabled.

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/secure-bucket/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/securityhub-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/securityhub-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion modules/vpc-baseline/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

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

## Providers
Expand Down
2 changes: 1 addition & 1 deletion modules/vpc-baseline/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.13"

required_providers {
aws = {
Expand Down