From d076391c8388f914613ea16317d1a9e2463b0443 Mon Sep 17 00:00:00 2001 From: badra001 Date: Wed, 22 Nov 2023 20:18:07 -0500 Subject: [PATCH] * 2.8.3 -- 2023-11-22 - if pgp_key_file is not provided (empty), it will use the secret vs encrypted secret, so that the secret can be used as input into other resources --- CHANGELOG.md | 2 ++ access_keys.tf | 8 ++++---- outputs.access_keys.tf | 7 ++++--- templates/access_key.tpl | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5ff92a..9f9733a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,8 @@ * 2.8.2 -- 2022-09-13 - fix lowercase() -> lower() + - add secret * 2.8.3 -- 2022-09-14 - fix access key variables and usage + - add secret diff --git a/access_keys.tf b/access_keys.tf index 3107191..e9467fa 100644 --- a/access_keys.tf +++ b/access_keys.tf @@ -31,10 +31,10 @@ locals { username = aws_iam_user.user.name profile = local.profile account_id = local.account_id - create_date = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "create_date", "") : "" - access_key_id = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "id", "") : "" - encrypted_secret = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "encrypted_secret", "") : "" - secret = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "secret", "") : "" + create_date = var.create_access_key ? join("", aws_iam_access_key.iam_access_key_v1.*.create_date) : "" + access_key_id = var.create_access_key ? join("", aws_iam_access_key.iam_access_key_v1.*.id) : "" + encrypted_secret = var.create_access_key ? join("", aws_iam_access_key.iam_access_key_v1.*.encrypted_secret) : "" + secret = var.create_access_key ? join("", aws_iam_access_key.iam_access_key_v1.*.secret) : "" }) } diff --git a/outputs.access_keys.tf b/outputs.access_keys.tf index 602648b..fa78f62 100644 --- a/outputs.access_keys.tf +++ b/outputs.access_keys.tf @@ -10,11 +10,12 @@ output "aws_access_key_id" { description = "AWS Access Key (current)" - value = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "id", "") : "" + # value = join("", aws_iam_access_key.iam_access_key_v1.*.id) + value = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "id", "") : "" } output "aws_secret_access_key" { description = "AWS Secret Access Key [encrypted] (current)" - value = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "encrypted_secret", "") : "" + # value = join("", aws_iam_access_key.iam_access_key_v1.*.encrypted_secret) + value = var.create_access_keys ? lookup(aws_iam_access_key.iam_access_key_v1[0], "encrypted_secret", "") : "" } - diff --git a/templates/access_key.tpl b/templates/access_key.tpl index c5484a0..b4432d6 100644 --- a/templates/access_key.tpl +++ b/templates/access_key.tpl @@ -4,3 +4,4 @@ create_date: ${create_date} username: ${username} access_key_id: ${access_key_id} access_secret_key_encrypted: ${encrypted_secret} +access_secret_key: ${secret}