fix applied zones

management/internals/network_map_db/pgsql/dns.go

@@ -13,8 +13,8 @@ const (
 	select zones.id as id, domain, not enable_search_domain as search_domain_disabled, distribution_groups,
 	r.name as record_name, r.type as record_type, 'IN' record_class, r.ttl as record_ttl, r.content as record_rdata
 	from zones
-	left join records as r on r.zone_id = zones.id 
-	where zones.account_id=$1
+	left join records as r on r.zone_id = zones.id
+	where zones.account_id=$1 and zones.enabled
 	`
 )
 

management/internals/network_map_db/shared_types.go

@@ -248,6 +248,12 @@ func ZonesToAppliedZoneCandidates(zones []Zone) ([]networkmap.AppliedZoneCandida
 		}
 
 		if z.Id != currentZoneId {
+			// The account-side builder (types.buildAppliedZoneCandidates) states
+			// the shape of an applied zone: names fully qualified, served
+			// non-authoritatively. Both builders feed the same client-facing map,
+			// so this one has to produce the same value.
+			zone.Domain = dns.Fqdn(zone.Domain)
+			zone.NonAuthoritative = true
 			zone.Records = []nmdata.SimpleRecord{}
 			toret = append(toret, AppliedZoneCandidateFromZone(zone, distributionGroups))
 			currentZoneId = z.Id
@@ -263,7 +269,7 @@ func ZonesToAppliedZoneCandidates(zones []Zone) ([]networkmap.AppliedZoneCandida
 
 		lastZone := &toret[len(toret)-1]
 		lastZone.Zone.Records = append(lastZone.Zone.Records, nmdata.SimpleRecord{
-			Name:  z.RecordName.String,
+			Name:  dns.Fqdn(z.RecordName.String),
 			Class: z.RecordClass.String,
 			TTL:   int(z.RecordTTL.Int64),
 			RData: rdata,

management/internals/network_map_db/sqlite/dns.go

@@ -12,8 +12,8 @@ const (
 	select zones.id as id, domain, not enable_search_domain as search_domain_disabled, distribution_groups,
 	r.name as record_name, r.type as record_type, 'IN' record_class, r.ttl as record_ttl, r.content as record_rdata
 	from zones
-	left join records as r on r.zone_id = zones.id 
-	where zones.account_id=?
+	left join records as r on r.zone_id = zones.id
+	where zones.account_id=? and zones.enabled
 	`
 )