From 7beb7908c527ba0418374c948b81073df73b9ba5 Mon Sep 17 00:00:00 2001 From: badra001 Date: Wed, 24 Feb 2021 11:51:23 -0500 Subject: [PATCH] fix file detection --- iam-saml/main.tf | 11 +++++++---- iam-saml/outputs.tf | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/iam-saml/main.tf b/iam-saml/main.tf index 52d205b..7f5bf73 100644 --- a/iam-saml/main.tf +++ b/iam-saml/main.tf @@ -36,9 +36,11 @@ locals { account_id = var.account_id != "" ? var.account_id : data.aws_caller_identity.current.account_id account_environment = data.aws_arn.current.partition == "aws-us-gov" ? "gov" : "ew" - saml_ew_url = "https://signin.aws.amazon.com/saml" - saml_gov_url = "https://signin.amazonaws-us-gov.com/saml" - saml_url = local.account_environment == "gov" ? local.saml_gov_url : local.saml_ew_url + saml_ew_url = "https://signin.aws.amazon.com/saml" + saml_gov_url = "https://signin.amazonaws-us-gov.com/saml" + saml_url = local.account_environment == "gov" ? local.saml_gov_url : local.saml_ew_url + saml_metadata_file = file("${path.root}/setup/metadata.xml") + saml_metadata_file_exists = fileexists(local.saml_metadata_file) base_tags = { "boc:tf_module_version" = local._module_version @@ -61,8 +63,9 @@ resource "null_resource" "saml_metadata" { } resource "aws_iam_saml_provider" "saml" { + count = local.saml_metadata_file_exists ? 1 : 0 name = var.saml_provider_name - saml_metadata_document = file("${path.root}/setup/metadata.xml") + saml_metadata_document = local.saml_metadata_file_exists ? local.saml_metadata_file : "" depends_on = [null_resource.saml_metadata] # when the provider supports tags, enable this section diff --git a/iam-saml/outputs.tf b/iam-saml/outputs.tf index 9a9ec26..0f42cda 100644 --- a/iam-saml/outputs.tf +++ b/iam-saml/outputs.tf @@ -1,7 +1,7 @@ output "saml_provider" { description = "SAML Provider ARN" - value = aws_iam_saml_provider.saml.arn + value = aws_iam_saml_provider.saml[0].arn } output "saml_assume_policy" {