Commit e4184f85 authored by Yuji Kinjo's avatar Yuji Kinjo Committed by GitHub

fix: automatically determine the number of role policy arns (#119)

parent 355669cf
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
terraform.tfstate terraform.tfstate
*.tfstate* *.tfstate*
terraform.tfvars terraform.tfvars
.terraform.lock.hcl
...@@ -22,7 +22,6 @@ module "iam_assumable_role_admin" { ...@@ -22,7 +22,6 @@ module "iam_assumable_role_admin" {
role_policy_arns = [ role_policy_arns = [
"arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy", "arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy",
] ]
number_of_role_policy_arns = 1
oidc_fully_qualified_subjects = ["system:serviceaccount:default:sa1", "system:serviceaccount:default:sa2"] oidc_fully_qualified_subjects = ["system:serviceaccount:default:sa1", "system:serviceaccount:default:sa2"]
} }
...@@ -28,7 +28,7 @@ This module supports IAM Roles for kubernetes service accounts as described in t ...@@ -28,7 +28,7 @@ This module supports IAM Roles for kubernetes service accounts as described in t
| create\_role | Whether to create a role | `bool` | `false` | no | | create\_role | Whether to create a role | `bool` | `false` | no |
| force\_detach\_policies | Whether policies should be detached from this role when destroying | `bool` | `false` | no | | force\_detach\_policies | Whether policies should be detached from this role when destroying | `bool` | `false` | no |
| max\_session\_duration | Maximum CLI/API session duration in seconds between 3600 and 43200 | `number` | `3600` | no | | max\_session\_duration | Maximum CLI/API session duration in seconds between 3600 and 43200 | `number` | `3600` | no |
| number\_of\_role\_policy\_arns | Number of IAM policies to attach to IAM role | `number` | `0` | no | | number\_of\_role\_policy\_arns | Number of IAM policies to attach to IAM role | `number` | `null` | no |
| oidc\_fully\_qualified\_subjects | The fully qualified OIDC subjects to be added to the role policy | `set(string)` | `[]` | no | | oidc\_fully\_qualified\_subjects | The fully qualified OIDC subjects to be added to the role policy | `set(string)` | `[]` | no |
| oidc\_subjects\_with\_wildcards | The OIDC subject using wildcards to be added to the role policy | `set(string)` | `[]` | no | | oidc\_subjects\_with\_wildcards | The OIDC subject using wildcards to be added to the role policy | `set(string)` | `[]` | no |
| provider\_url | URL of the OIDC Provider. Use provider\_urls to specify several URLs. | `string` | `""` | no | | provider\_url | URL of the OIDC Provider. Use provider\_urls to specify several URLs. | `string` | `""` | no |
......
...@@ -9,6 +9,7 @@ locals { ...@@ -9,6 +9,7 @@ locals {
for url in local.urls : for url in local.urls :
"arn:${data.aws_partition.current.partition}:iam::${local.aws_account_id}:oidc-provider/${url}" "arn:${data.aws_partition.current.partition}:iam::${local.aws_account_id}:oidc-provider/${url}"
] ]
number_of_role_policy_arns = coalesce(var.number_of_role_policy_arns, length(var.role_policy_arns))
} }
data "aws_caller_identity" "current" {} data "aws_caller_identity" "current" {}
...@@ -68,7 +69,7 @@ resource "aws_iam_role" "this" { ...@@ -68,7 +69,7 @@ resource "aws_iam_role" "this" {
} }
resource "aws_iam_role_policy_attachment" "custom" { resource "aws_iam_role_policy_attachment" "custom" {
count = var.create_role ? var.number_of_role_policy_arns : 0 count = var.create_role ? local.number_of_role_policy_arns : 0
role = join("", aws_iam_role.this.*.name) role = join("", aws_iam_role.this.*.name)
policy_arn = var.role_policy_arns[count.index] policy_arn = var.role_policy_arns[count.index]
......
...@@ -73,7 +73,7 @@ variable "role_policy_arns" { ...@@ -73,7 +73,7 @@ variable "role_policy_arns" {
variable "number_of_role_policy_arns" { variable "number_of_role_policy_arns" {
description = "Number of IAM policies to attach to IAM role" description = "Number of IAM policies to attach to IAM role"
type = number type = number
default = 0 default = null
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment