diff --git a/infrastructure/stacks/account_wide/variables.tf b/infrastructure/stacks/account_wide/variables.tf index 79864000..5cd0fb9e 100644 --- a/infrastructure/stacks/account_wide/variables.tf +++ b/infrastructure/stacks/account_wide/variables.tf @@ -86,3 +86,9 @@ variable "enable_s3_kms_encryption" { type = bool default = false } + +variable "cert_validation_record_ttl" { + description = "The TTL of the DNS validation records for ACM certificates" + type = number + default = 60 +} diff --git a/scripts/workflow/action-infra-stack.sh b/scripts/workflow/action-infra-stack.sh index 88d2104b..8dcb7b80 100644 --- a/scripts/workflow/action-infra-stack.sh +++ b/scripts/workflow/action-infra-stack.sh @@ -163,9 +163,9 @@ if [[ -n "$ACTION" ]] && [[ "$ACTION" = 'plan' ]] ; then INFRA_CHANGES="false" else INFRA_CHANGES="true" - echo "plan_result=${INFRA_CHANGES}" >> "$GITHUB_OUTPUT" - echo "Infra changes detected: ${INFRA_CHANGES}" fi + echo "plan_result=${INFRA_CHANGES}" >> "$GITHUB_OUTPUT" + echo "Infra changes detected: ${INFRA_CHANGES}" fi fi @@ -175,14 +175,15 @@ if [[ -n "$ACTION" ]] && [[ "$ACTION" = 'apply' ]] ; then else terraform apply -auto-approve "$STACK.tfplan" fi -fi -TRIAGE_INVOKE_URL=$(terraform output -raw triage_invoke_url 2>/dev/null || true) + TRIAGE_INVOKE_URL=$(terraform output -raw triage_invoke_url 2>/dev/null || true) -if [[ -n "$TRIAGE_INVOKE_URL" ]]; then - echo "triage_invoke_url=$TRIAGE_INVOKE_URL" >> "$GITHUB_OUTPUT" + if [[ -n "$TRIAGE_INVOKE_URL" ]]; then + echo "triage_invoke_url=$TRIAGE_INVOKE_URL" >> "$GITHUB_OUTPUT" + fi fi + if [[ -n "$ACTION" ]] && [[ "$ACTION" = 'destroy' ]] ; then terraform destroy -auto-approve \ -var-file "$ROOT_DIR/$INFRASTRUCTURE_DIR/$COMMON_TF_VARS_FILE" \