DeBros/orama
4
0
Fork 0
mirror of https://github.com/DeBrosOfficial/orama.git synced 2026-03-17 06:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove UUID generation from DNS record creation for cleaner inserts

Browse Source
This commit is contained in:
anonpenguin23 2026-02-24 08:00:15 +02:00
parent 72fb5f1a5a
commit 7f1c592235
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/namespace/dns_manager.go
View File

@ -7,7 +7,6 @@ import (
"github.com/DeBrosOfficial/network/pkg/client" "github.com/DeBrosOfficial/network/pkg/client"
"github.com/DeBrosOfficial/network/pkg/rqlite" "github.com/DeBrosOfficial/network/pkg/rqlite"
"github.com/google/uuid"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -57,23 +56,16 @@ func (drm *DNSRecordManager) CreateNamespaceRecords(ctx context.Context, namespa
// Create A records for each node IP // Create A records for each node IP
for _, ip := range nodeIPs { for _, ip := range nodeIPs {
recordID := uuid.New().String()
insertQuery := ` insertQuery := `
INSERT INTO dns_records ( INSERT INTO dns_records (
id, fqdn, record_type, value, ttl, namespace, created_by, is_active, created_at, updated_at fqdn, record_type, value, ttl, namespace, created_by, created_at, updated_at
) VALUES (?, ?, ?, ?, ?, ?, ?, TRUE, ?, ?) ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
` `
now := time.Now() now := time.Now()
_, err := drm.db.Exec(internalCtx, insertQuery, _, err := drm.db.Exec(internalCtx, insertQuery,
recordID, fqdn, "A", ip, 60,
fqdn, "namespace:"+namespaceName, "cluster-manager",
"A", now, now,
ip,
60, // 60 second TTL for quick failover
"namespace:"+namespaceName, // Track ownership with namespace prefix
"cluster-manager", // Created by the cluster manager
now,
now,
) )
if err != nil { if err != nil {
return &ClusterError{ return &ClusterError{
@ -91,23 +83,16 @@ func (drm *DNSRecordManager) CreateNamespaceRecords(ctx context.Context, namespa
_, _ = drm.db.Exec(internalCtx, deleteQuery, wildcardFqdn, "namespace:"+namespaceName) _, _ = drm.db.Exec(internalCtx, deleteQuery, wildcardFqdn, "namespace:"+namespaceName)
for _, ip := range nodeIPs { for _, ip := range nodeIPs {
recordID := uuid.New().String()
insertQuery := ` insertQuery := `
INSERT INTO dns_records ( INSERT INTO dns_records (
id, fqdn, record_type, value, ttl, namespace, created_by, is_active, created_at, updated_at fqdn, record_type, value, ttl, namespace, created_by, created_at, updated_at
) VALUES (?, ?, ?, ?, ?, ?, ?, TRUE, ?, ?) ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
` `
now := time.Now() now := time.Now()
_, err := drm.db.Exec(internalCtx, insertQuery, _, err := drm.db.Exec(internalCtx, insertQuery,
recordID, wildcardFqdn, "A", ip, 60,
wildcardFqdn, "namespace:"+namespaceName, "cluster-manager",
"A", now, now,
ip,
60,
"namespace:"+namespaceName,
"cluster-manager",
now,
now,
) )
if err != nil { if err != nil {
drm.logger.Warn("Failed to create wildcard DNS record", drm.logger.Warn("Failed to create wildcard DNS record",
@ -224,14 +209,13 @@ func (drm *DNSRecordManager) AddNamespaceRecord(ctx context.Context, namespaceNa
now := time.Now() now := time.Now()
for _, f := range []string{fqdn, wildcardFqdn} { for _, f := range []string{fqdn, wildcardFqdn} {
recordID := uuid.New().String()
insertQuery := ` insertQuery := `
INSERT INTO dns_records ( INSERT INTO dns_records (
id, fqdn, record_type, value, ttl, namespace, created_by, is_active, created_at, updated_at fqdn, record_type, value, ttl, namespace, created_by, created_at, updated_at
) VALUES (?, ?, ?, ?, ?, ?, ?, TRUE, ?, ?) ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
` `
_, err := drm.db.Exec(internalCtx, insertQuery, _, err := drm.db.Exec(internalCtx, insertQuery,
recordID, f, "A", ip, 60, f, "A", ip, 60,
"namespace:"+namespaceName, "cluster-manager", now, now, "namespace:"+namespaceName, "cluster-manager", now, now,
) )
if err != nil { if err != nil {
@ -265,7 +249,7 @@ func (drm *DNSRecordManager) UpdateNamespaceRecord(ctx context.Context, namespac
// Update both the main record and wildcard record // Update both the main record and wildcard record
for _, f := range []string{fqdn, wildcardFqdn} { for _, f := range []string{fqdn, wildcardFqdn} {
updateQuery := `UPDATE dns_records SET value = ?, is_active = TRUE, updated_at = ? WHERE fqdn = ? AND value = ?` updateQuery := `UPDATE dns_records SET value = ?, is_active = 1, updated_at = ? WHERE fqdn = ? AND value = ?`
_, err := drm.db.Exec(internalCtx, updateQuery, newIP, time.Now(), f, oldIP) _, err := drm.db.Exec(internalCtx, updateQuery, newIP, time.Now(), f, oldIP)
if err != nil { if err != nil {
drm.logger.Warn("Failed to update DNS record", drm.logger.Warn("Failed to update DNS record",
@ -322,14 +306,13 @@ func (drm *DNSRecordManager) CreateTURNRecords(ctx context.Context, namespaceNam
// Create A records for each TURN node IP // Create A records for each TURN node IP
now := time.Now() now := time.Now()
for _, ip := range turnIPs { for _, ip := range turnIPs {
recordID := uuid.New().String()
insertQuery := ` insertQuery := `
INSERT INTO dns_records ( INSERT INTO dns_records (
id, fqdn, record_type, value, ttl, namespace, created_by, is_active, created_at, updated_at fqdn, record_type, value, ttl, namespace, created_by, created_at, updated_at
) VALUES (?, ?, ?, ?, ?, ?, ?, TRUE, ?, ?) ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
` `
_, err := drm.db.Exec(internalCtx, insertQuery, _, err := drm.db.Exec(internalCtx, insertQuery,
recordID, fqdn, "A", ip, 60, fqdn, "A", ip, 60,
"namespace-turn:"+namespaceName, "namespace-turn:"+namespaceName,
"cluster-manager", "cluster-manager",
now, now, now, now,
@ -383,7 +366,7 @@ func (drm *DNSRecordManager) EnableNamespaceRecord(ctx context.Context, namespac
) )
for _, f := range []string{fqdn, wildcardFqdn} { for _, f := range []string{fqdn, wildcardFqdn} {
updateQuery := `UPDATE dns_records SET is_active = TRUE, updated_at = ? WHERE fqdn = ? AND value = ?` updateQuery := `UPDATE dns_records SET is_active = 1, updated_at = ? WHERE fqdn = ? AND value = ?`
_, _ = drm.db.Exec(internalCtx, updateQuery, time.Now(), f, ip) _, _ = drm.db.Exec(internalCtx, updateQuery, time.Now(), f, ip)
} }