Migrate off of the outputs-based approach to finding zones

3 files changed, 7 insertions, 14 deletions

diff --git a/.terraform-version b/.terraform-version
new file mode 100644
index 0000000..f98d9c0
--- /dev/null
+++ b/.terraform-version
@@ -0,0 +1 @@
+0.12.31
diff --git a/bliki.tf b/bliki.tf
index de77f91..401fe4f 100644
--- a/bliki.tf
+++ b/bliki.tf
@@ -20,16 +20,6 @@ provider "aws" {
   region = "us-east-1"
 }
 
-data "terraform_remote_state" "dns" {
-  backend = "s3"
-
-  config = {
-    bucket = "terraform.grimoire"
-    key    = "dns.tfstate"
-    region = "ca-central-1"
-  }
-}
-
 resource "aws_s3_bucket" "bliki" {
   bucket = "grimoire.ca"
 
@@ -76,7 +66,7 @@ resource "aws_acm_certificate" "bliki" {
 }
 
 resource "aws_route53_record" "bliki_validation" {
-  zone_id = data.terraform_remote_state.dns.outputs.grimoire_ca_zone_id
+  zone_id = data.aws_route53_zone.grimoire_ca.zone_id
   ttl = 60
   name = aws_acm_certificate.bliki.domain_validation_options[0].resource_record_name
   type = aws_acm_certificate.bliki.domain_validation_options[0].resource_record_type
@@ -155,7 +145,7 @@ resource "aws_cloudfront_distribution" "bliki" {
 }
 
 resource "aws_route53_record" "bliki_ip4" {
-  zone_id = data.terraform_remote_state.dns.outputs.grimoire_ca_zone_id
+  zone_id = data.aws_route53_zone.grimoire_ca.zone_id
   name = ""
   type = "A"
 
@@ -168,7 +158,7 @@ resource "aws_route53_record" "bliki_ip4" {
 }
 
 resource "aws_route53_record" "bliki_ip6" {
-  zone_id = data.terraform_remote_state.dns.outputs.grimoire_ca_zone_id
+  zone_id = data.aws_route53_zone.grimoire_ca.zone_id
   name = ""
   type = "AAAA"
 
@@ -180,3 +170,6 @@ resource "aws_route53_record" "bliki_ip6" {
   }
 }
 
+data "aws_route53_zone" "grimoire_ca" {
+  name = "grimoire.ca"
+}
diff --git a/versions.tf b/versions.tf
index ac97c6a..d9b6f79 100644
--- a/versions.tf
+++ b/versions.tf
@@ -1,4 +1,3 @@
-
 terraform {
   required_version = ">= 0.12"
 }