From 982cc41e08d865e5ea63be09c80c1b3ef6f2c5ab Mon Sep 17 00:00:00 2001 From: badra001 Date: Thu, 24 Mar 2022 13:00:37 -0400 Subject: [PATCH] use try() in kms --- CHANGELOG.md | 7 +++++++ common/kms.tf | 2 +- common/version.tf | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13e2b80..16e810f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ Provides standard and t26 S3 bucket construction. ## Version 2.x +This works with the Terraform AWS provider 3.x. + * 2.0 -- 20201104 - change to aws-s3 - create submodules `standard` and `title26` @@ -73,3 +75,8 @@ Provides standard and t26 S3 bucket construction. - add outputs - s3_requested_bucket_name - s3_module_settings + +* 2.4.5 -- 2022-03-24 + - kms_key + - wrap aws_kms_key resouce in try() + diff --git a/common/kms.tf b/common/kms.tf index e8df353..3834650 100644 --- a/common/kms.tf +++ b/common/kms.tf @@ -4,7 +4,7 @@ # } # locals { - kms_key_arn = var.kms_key_arn == null ? aws_kms_key.key[0].arn : var.kms_key_arn + kms_key_arn = var.kms_key_arn == null ? try(aws_kms_key.key[0].arn, "") : var.kms_key_arn kms_key_name = format("%s%s", local._prefixes["kms"], local.name) kms_admin_root = [format("arn:%v:iam::%v:root", local.partition, local.account_id)] diff --git a/common/version.tf b/common/version.tf index 59b218e..ec8dee5 100644 --- a/common/version.tf +++ b/common/version.tf @@ -1,3 +1,3 @@ locals { - _module_version = "2.4.4" + _module_version = "2.4.5" }