Skip to content

Commit

Permalink
Better fixes for Terraform v1+
Browse files Browse the repository at this point in the history
  • Loading branch information
keirbadger committed Aug 19, 2022
1 parent 73ff4a6 commit 81efca9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion modules/route53-dns/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ data "aws_route53_zone" "dns_domain" {
}

locals {
zone_id = var.zone_id == "" ? element(concat(data.aws_route53_zone.dns_domain.*.zone_id, list("")), 0) : var.zone_id
zone_id = var.zone_id == "" ? element(concat(data.aws_route53_zone.dns_domain.*.zone_id, [""]), 0) : var.zone_id
zone_prefix = "${var.dev_subdomain && var.env != "live" ? "dev." : ""}"
zone = "${local.zone_prefix}${var.domain}"
name = var.env == "live" ? var.name : "${var.env}-${var.name}"
Expand Down
2 changes: 1 addition & 1 deletion modules/secretsmanager/output.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
output "datadog_api_key" {
value = "${element(concat(data.aws_secretsmanager_secret_version.secret.*.secret_string, list("")), 0)}"
value = "${element(concat(data.aws_secretsmanager_secret_version.secret.*.secret_string, [""]), 0)}"
}
2 changes: 1 addition & 1 deletion test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3-alpine3.8
COPY requirements.txt .

ENV TERRAFORM_VERSION=0.13.7
ENV TERRAFORM_VERSION=1.2.2

RUN apk -U add gcc musl-dev libffi-dev openssl-dev docker curl git zip unzip wget

Expand Down

0 comments on commit 81efca9

Please sign in to comment.