Pull subdomain info from Nullstone instead of calculating.

CHANGELOG.md

@@ -1,2 +1,6 @@
+# 0.1.1 (Dec 14, 2024)
+* Pull subdomain info from Nullstone instead of calculating.
+* Upgrade `ns` terraform provider.
+
 # 0.1.0 (Dec 13, 2024)
 * Initial draft

cert.tf

@@ -8,7 +8,7 @@ module "cert" {
   scope   = ""
 
   subdomains = {
-    (local.dns_name) = local.zone_id
+    (local.subdomain_name) = local.subdomain_zone_id
   }
 }
 

dns.tf

@@ -15,7 +15,7 @@ resource "google_dns_managed_zone" "this" {
 resource "aws_route53_record" "this-delegation" {
   provider = aws.domain
 
-  name    = local.subdomain
+  name    = local.subdomain_part
   zone_id = local.domain_zone_id
   type    = "NS"
   ttl     = 300

outputs.tf

@@ -1,5 +1,5 @@
 output "name" {
-  value       = local.dns_name
+  value       = local.subdomain_name
   description = "string ||| The name of the created subdomain. (Format: '{{dns_name}}[.{{env}}].{{domain}}')"
 }
 
@@ -9,12 +9,12 @@ output "fqdn" {
 }
 
 output "zone_id" {
-  value       = local.zone_id
+  value       = local.subdomain_zone_id
   description = "string |||  Google DNS Managed Zone ID (Format: projects/{{project}}/managedZones/{{name}})."
 }
 
 output "nameservers" {
-  value       = local.nameservers
+  value       = local.subdomain_nameservers
   description = "list(string) ||| List of Nameservers for Google DNS Managed Zone."
 }
 

subdomain.tf

@@ -1,8 +1,18 @@
 data "ns_subdomain" "this" {
   stack_id = data.ns_workspace.this.stack_id
   block_id = data.ns_workspace.this.block_id
+  env_id   = data.ns_workspace.this.env_id
 }
 
 locals {
-  subdomain_dns_name = data.ns_subdomain.this.dns_name
+  subdomain_part = data.ns_subdomain.this.subdomain_name
+  fqdn           = data.ns_subdomain.this.fqdn
+
+  // zone_id refers to google_dns_managed_zone.this.name; however, we need this variable to wait on the resource to be created
+  // We're going to take google_dns_managed_zone.this.id and parse out the name (since id is computed during creation)
+  // Format: projects/{{project}}/managedZones/{{name}}
+  subdomain_zone_id = regex("^projects/[^/]+/managedZones/([^/]+)$", google_dns_managed_zone.this.id)[0]
+
+  subdomain_name        = trimsuffix(google_dns_managed_zone.this.dns_name, ".")
+  subdomain_nameservers = [for ns in google_dns_managed_zone.this.name_servers : trimsuffix(ns, ".")]
 }