From c9b625ab2578ec19df292f0929299f4ed01662e1 Mon Sep 17 00:00:00 2001
From: Don Badrak <dbadrak@gmail.com>
Date: Mon, 13 Jul 2020 13:39:19 -0400
Subject: [PATCH 1/2] add version.tf, change way to extract key

---
 main.tf    | 14 +++++++-------
 version.tf |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 version.tf

diff --git a/main.tf b/main.tf
index 75de574..52e5fdb 100644
--- a/main.tf
+++ b/main.tf
@@ -1,14 +1,10 @@
 /**
 * # Usage
 * 
-* for terraform 0.11 v1.x use tf-0.11
-* for terraform 0.12 v2.x use tf-0.12 (until rolled into head) or specific version v2.x.y
-*   master
-*
 * ```code
 * module "scanner" {
 *   source = "../module/aws-security-audit"
-*   source = "git::https://vc1.csvd.census.gov/terraform-modules/aws-security-audit.git?ref=tf-0.12
+*   source = "git::https://vc1.csvd.census.gov/terraform-modules/aws-security-audit.git
 * 
 *   group = "g-audit-group"
 *   users = [ "s-ois-scan" ]
@@ -44,6 +40,8 @@ locals {
     local.tags_email,
     local.tags_reference[var.reference != "" ? "exists" : "not_exists"]
   )
+  aws_access_key_id = concat(aws_iam_access_key.audit[*].id,list(""))
+  aws_secret_access_key = concat(aws_iam_access_key.audit[*].encrypted_secret,list(""))
 }
 
 #---
@@ -139,7 +137,9 @@ resource "null_resource" "audit_output" {
   count = length(var.users)
   triggers = {
     user = element(aws_iam_user.audit[*].name,count.index)
-    aws_access_key_id = element(aws_iam_access_key.audit[*].id,count.index)
-    aws_secret_access_key = element(aws_iam_access_key.audit[*].encrypted_secret,count.index)
+#    aws_access_key_id = element(aws_iam_access_key.audit[*].id,count.index)
+#    aws_secret_access_key = element(aws_iam_access_key.audit[*].encrypted_secret,count.index)
+    aws_access_key_id = element(local.aws_aws_access_key_id,count.index)
+    aws_secret_access_key = element(local.aws_secret_access_key,count.index)
   }
 }
diff --git a/version.tf b/version.tf
new file mode 100644
index 0000000..1c2fce3
--- /dev/null
+++ b/version.tf
@@ -0,0 +1,5 @@
+variable "_module_version" {
+  description = "Module version number"
+  type        = string
+  default     = "1.21"
+}

From 0614a45e2101167749428513464b3cb69ff6eed6 Mon Sep 17 00:00:00 2001
From: Don Badrak <dbadrak@gmail.com>
Date: Mon, 13 Jul 2020 13:41:38 -0400
Subject: [PATCH 2/2] fix

---
 main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.tf b/main.tf
index 52e5fdb..ebcf2c6 100644
--- a/main.tf
+++ b/main.tf
@@ -139,7 +139,7 @@ resource "null_resource" "audit_output" {
     user = element(aws_iam_user.audit[*].name,count.index)
 #    aws_access_key_id = element(aws_iam_access_key.audit[*].id,count.index)
 #    aws_secret_access_key = element(aws_iam_access_key.audit[*].encrypted_secret,count.index)
-    aws_access_key_id = element(local.aws_aws_access_key_id,count.index)
+    aws_access_key_id = element(local.aws_access_key_id,count.index)
     aws_secret_access_key = element(local.aws_secret_access_key,count.index)
   }
 }