From 0cab5111f551aebf68b4c3991956755c5462d7c6 Mon Sep 17 00:00:00 2001
From: Matthew Creal Morgan <matthew.c.morgan@census.gov>
Date: Thu, 12 Sep 2024 08:31:50 -0700
Subject: [PATCH] Access entries2 (#21)

---
 README.md         | 12 ++++++------
 access_entries.tf |  2 +-
 main.tf           |  2 --
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index a27a618..33aa2f4 100644
--- a/README.md
+++ b/README.md
@@ -85,11 +85,11 @@ Change logs are auto-generated with commitizen.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.66.0 |
-| <a name="provider_aws.route53_main_east"></a> [aws.route53\_main\_east](#provider\_aws.route53\_main\_east) | 5.66.0 |
-| <a name="provider_aws.route53_main_west"></a> [aws.route53\_main\_west](#provider\_aws.route53\_main\_west) | 5.66.0 |
-| <a name="provider_aws.self"></a> [aws.self](#provider\_aws.self) | 5.66.0 |
-| <a name="provider_null"></a> [null](#provider\_null) | 3.2.2 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.14.0 |
+| <a name="provider_aws.route53_main_east"></a> [aws.route53\_main\_east](#provider\_aws.route53\_main\_east) | >= 5.14.0 |
+| <a name="provider_aws.route53_main_west"></a> [aws.route53\_main\_west](#provider\_aws.route53\_main\_west) | >= 5.14.0 |
+| <a name="provider_aws.self"></a> [aws.self](#provider\_aws.self) | >= 5.14.0 |
+| <a name="provider_null"></a> [null](#provider\_null) | >= 3.2.1 |
 
 ## Modules
 
@@ -163,7 +163,7 @@ Change logs are auto-generated with commitizen.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_access_entries"></a> [access\_entries](#output\_access\_entries) | the access entries created in the cluster |
+| <a name="output_access_entries"></a> [access\_entries](#output\_access\_entries) | The access\_entries object added to cluster |
 | <a name="output_cloudwatch_log_group_arn"></a> [cloudwatch\_log\_group\_arn](#output\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
 | <a name="output_cloudwatch_log_group_name"></a> [cloudwatch\_log\_group\_name](#output\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
 | <a name="output_cluster_addons"></a> [cluster\_addons](#output\_cluster\_addons) | Map of attribute maps for all EKS cluster addons enabled |
diff --git a/access_entries.tf b/access_entries.tf
index 477eca7..d54c149 100644
--- a/access_entries.tf
+++ b/access_entries.tf
@@ -21,7 +21,7 @@ data "aws_iam_roles" "sso_read" {
 
 locals {
   access_entries = merge(local.admins, local.viewers)
-  arns           = [for arn in merge(data.aws_iam_roles.roles.arns, data.aws_iam_roles.sso_admins.arns) : arn if arn != data.aws_iam_session_context.current.issuer_arn]
+  arns           = [for arn in concat(tolist(data.aws_iam_roles.roles.arns), tolist(data.aws_iam_roles.sso_admins.arns)) : arn if arn != data.aws_iam_session_context.current.issuer_arn]
   admins = {
     for arn in local.arns :
     arn => {
diff --git a/main.tf b/main.tf
index 1ca8953..6f929ed 100644
--- a/main.tf
+++ b/main.tf
@@ -41,8 +41,6 @@ locals {
   tags           = merge(local.base_tags, var.tags)
   vpc_cidr_block = data.aws_vpc.eks_vpc.cidr_block
   vpc_id         = data.aws_vpc.eks_vpc.id
-
-
 }
 
 module "cluster" {