From 262ac95c33ecc16f39e127fc792b1bbd73530909 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Wed, 17 Nov 2021 13:39:36 -0500
Subject: [PATCH] fix

---
 common/kms.tf         | 5 +++++
 common/outputs.kms.tf | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/kms.tf b/common/kms.tf
index cdbb0da..18c4b35 100644
--- a/common/kms.tf
+++ b/common/kms.tf
@@ -57,3 +57,8 @@ data "aws_iam_policy_document" "key_policy_combined" {
 }
 
 data "aws_iam_policy_document" "empty" {}
+
+data "aws_kms_key" "incoming_key" {
+  count  = var.kms_key_arn == null ? 0 : 1
+  key_id = var.kms_key_arn
+}
diff --git a/common/outputs.kms.tf b/common/outputs.kms.tf
index 4ad613a..9333784 100644
--- a/common/outputs.kms.tf
+++ b/common/outputs.kms.tf
@@ -3,16 +3,16 @@
 #---
 output "kms_key_id" {
   description = "Created KMS Key ID"
-  value       = aws_kms_key.key.id
+  value       = var.kms_key_arn == null ? aws_kms_key.key[0].id : data.aws_kms_key.incoming_key[0].id
 }
 
 output "kms_key_arn" {
   description = "Created KMS Key ARN"
-  value       = aws_kms_key.key.arn
+  value       = var.kms_key_arn == null ? aws_kms_key.key[0].arn : data.aws_kms_key.incoming_key[0].arn
 }
 
 output "kms_key_alias" {
   description = "Created KMS Key Alias name"
-  value       = aws_kms_alias.key.name
+  value       = var.kms_key_arn == null ? aws_kms_key.key[0].name : data.aws_kms_key.incoming_key[0].name
 }