more fixes before final part

Makefile

@@ -18,7 +18,7 @@ clean:
 # Run all tests
 test: generate
 	@echo "Running all tests..."
-	@go test -v -count=1 ./... --coverprofile=coverage.out
+	@go test -v -count=1 ./... --coverprofile=coverage.out --short
 
 # Run unit tests only (faster, no integration tests)
 test-unit:

cmd/kat-agent/main.go

@@ -11,6 +11,7 @@ import (
 	"syscall"
 	"time"
 
+	"git.dws.rip/dubey/kat/internal/agent"
 	"git.dws.rip/dubey/kat/internal/api"
 	"git.dws.rip/dubey/kat/internal/cli"
 	"git.dws.rip/dubey/kat/internal/config"

internal/agent/agent.go

@@ -125,13 +125,13 @@ func (a *Agent) SetupMTLSClient() error {
 			// Override the dial function to map any hostname to the leader's IP
 			DialTLS: func(network, addr string) (net.Conn, error) {
 				// Extract host and port from addr
-				host, port, err := net.SplitHostPort(addr)
+				_, port, err := net.SplitHostPort(addr)
 				if err != nil {
 					return nil, err
 				}
 
 				// Extract host and port from LeaderAPI
-				leaderHost, leaderPort, err := net.SplitHostPort(a.LeaderAPI)
+				leaderHost, _, err := net.SplitHostPort(a.LeaderAPI)
 				if err != nil {
 					return nil, err
 				}
@@ -211,8 +211,13 @@ func (a *Agent) sendHeartbeat() error {
 		return fmt.Errorf("failed to marshal node status: %w", err)
 	}
 
+	leaderHost, leaderPort, err := net.SplitHostPort(a.LeaderAPI)
+	if err != nil {
+		return err
+	}
+
 	// Construct URL - use leader.kat.cluster.local as hostname to match certificate
-	url := fmt.Sprintf("https://leader.kat.cluster.local/v1alpha1/nodes/%s/status", a.NodeName)
+	url := fmt.Sprintf("https://%s:%s/v1alpha1/nodes/%s/status", leaderHost, leaderPort, a.NodeName)
 
 	// Create request
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(statusJSON))

internal/agent/agent_test.go

@@ -13,6 +13,8 @@ import (
 	"testing"
 	"time"
 
+	"crypto/x509/pkix"
+
 	"git.dws.rip/dubey/kat/internal/pki"
 )
 

internal/api/node_status_handler_test.go

@@ -2,14 +2,12 @@ package api
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 	"time"
 
-	"git.dws.rip/dubey/kat/internal/store"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )