use try() in kms

terraform-modules · Mar 24, 2022 · 982cc41 · 982cc41
1 parent 1bfde83
commit 982cc41
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,3 +1,3 @@
 locals {
-  _module_version = "2.4.4"
+  _module_version = "2.4.5"
 }