From b8e823ba598f92a45b19cc84b2b33891155da7c8 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Thu, 23 Jun 2022 14:19:59 -0400
Subject: [PATCH] fix access key indexing

---
 CHANGELOG.md           |  3 +++
 access_keys.tf         | 10 +++++-----
 outputs.access_keys.tf |  4 ++--
 version.tf             |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0abe244..81e59bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,3 +45,6 @@
   - add inline_policies
   - add path
   - enable code for creating access keys
+
+* 2.7.1 -- 2022-06-23
+  - fix access key indexing
diff --git a/access_keys.tf b/access_keys.tf
index 6471343..24f3516 100644
--- a/access_keys.tf
+++ b/access_keys.tf
@@ -27,9 +27,9 @@ locals {
       username         = aws_iam_user.user.name
       profile          = var.profile == null ? "" : var.profile
       account_id       = local.account_id
-      create_date      = var.create_access_keys ? aws_iam_access_key.iam_access_key_v1[0].create_date : ""
-      access_key_id    = var.create_access_keys ? aws_iam_access_key.iam_access_key_v1[0].id : ""
-      encrypted_secret = var.create_access_keys ? aws_iam_access_key.iam_access_key_v1[0].encrypted_secret : ""
+      create_date      = join("", aws_iam_access_key.iam_access_key_v1.*.create_date)
+      access_key_id    = join("", aws_iam_access_key.iam_access_key_v1.*.id)
+      encrypted_secret = join("", aws_iam_access_key.iam_access_key_v1.*.encrypted_secret)
   })
 }
 
@@ -61,7 +61,7 @@ resource "null_resource" "rotate_keys_tfvars" {
 resource "local_file" "rotate_keys_tfvars" {
   count    = var.create_access_keys ? 1 : 0
   content  = local.rotate_keys_tfvars
-  filename = var.create_access_keys ? format("%v/%v/variables.auto.tfvars", path.root, null_resource.rotate_keys_tfvars[0].triggers.access_keys_directory) : "empty.txt"
+  filename = var.create_access_keys ? format("%v/%v/variables.auto.tfvars", path.root, join("", null_resource.rotate_keys_tfvars.*.triggers.access_keys_directory)) : "empty.txt"
 
   depends_on = [null_resource.rotate_keys_tfvars]
 }
@@ -69,7 +69,7 @@ resource "local_file" "rotate_keys_tfvars" {
 resource "local_file" "access_key_file" {
   count    = var.create_access_keys ? 1 : 0
   content  = local.access_key_file
-  filename = var.create_access_keys ? format("%v/%v/access_key.yml", path.root, null_resource.rotate_keys_tfvars[0].triggers.access_keys_directory) : "empty.txt"
+  filename = var.create_access_keys ? format("%v/%v/access_key.yml", path.root, join("", null_resource.rotate_keys_tfvars.*.triggers.access_keys_directory)) : "empty.txt"
 
   depends_on = [null_resource.rotate_keys_tfvars]
 }
diff --git a/outputs.access_keys.tf b/outputs.access_keys.tf
index 33073de..32dad34 100644
--- a/outputs.access_keys.tf
+++ b/outputs.access_keys.tf
@@ -10,11 +10,11 @@
 
 output "aws_access_key_id" {
   description = "AWS Access Key (current)"
-  value       = var.create_access_keys ? aws_iam_access_key.iam_access_key_v1[0].id : ""
+  value       = join("", aws_iam_access_key.iam_access_key_v1.*.id)
 }
 
 output "aws_secret_access_key" {
   description = "AWS Secret Access Key [encrypted] (current)"
-  value       = var.create_access_keys ? aws_iam_access_key.iam_access_key_v1[0].encrypted_secret : ""
+  value       = join("", aws_iam_access_key.iam_access_key_v1.*.encrypted_secret)
 }
 
diff --git a/version.tf b/version.tf
index 997b4d4..534c665 100644
--- a/version.tf
+++ b/version.tf
@@ -1,4 +1,4 @@
 locals {
   _module_name    = "aws-iam-user"
-  _module_version = "2.7.0"
+  _module_version = "2.7.1"
 }