Add manual and IPinfo node location detection

Author: goktugcy

CHANGELOG.md

@@ -15,6 +15,12 @@ Formatting rules:
 
 ## [Unreleased]
 
+## [2026.5.3] - 2026-05-14
+
+### Added
+
+- Added manual node location overrides and optional IPinfo public-IP geolocation fallback for non-cloud hosts, with public-IP lookup disabled unless explicitly configured.
+
 ## [2026.5.2] - 2026-05-14
 
 ### Fixed

internal/agent/enrollment.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/noderax/noderax-agent/internal/api"
-	"github.com/noderax/noderax-agent/internal/cloudmetadata"
 	"github.com/noderax/noderax-agent/internal/config"
+	"github.com/noderax/noderax-agent/internal/nodelocation"
 	"github.com/noderax/noderax-agent/internal/system"
 )
 
@@ -74,7 +74,7 @@ func RunInteractiveEnrollment(
 	if strings.TrimSpace(operatingSystem) == "" {
 		operatingSystem = hostInfo.OS
 	}
-	location := detectCloudLocation(ctx, logger)
+	location := detectNodeLocation(ctx, cfg, logger)
 
 	requestCtx, cancel := context.WithTimeout(ctx, cfg.RequestTimeout)
 	defer cancel()
@@ -153,7 +153,7 @@ func RunBootstrapEnrollment(
 	if strings.TrimSpace(operatingSystem) == "" {
 		operatingSystem = hostInfo.OS
 	}
-	location := detectCloudLocation(ctx, logger)
+	location := detectNodeLocation(ctx, cfg, logger)
 
 	requestCtx, cancel := context.WithTimeout(ctx, cfg.RequestTimeout)
 	defer cancel()
@@ -330,18 +330,19 @@ func persistIdentity(
 	return nil
 }
 
-var detectCloudLocation = func(ctx context.Context, logger *slog.Logger) *api.NodeLocation {
-	location, err := cloudmetadata.Detect(ctx)
+var detectNodeLocation = func(ctx context.Context, cfg config.Config, logger *slog.Logger) *api.NodeLocation {
+	location, err := nodelocation.Detect(ctx, cfg)
 	if err != nil {
 		if logger != nil {
-			logger.Debug("cloud metadata location detection skipped", "error", err)
+			logger.Debug("node location detection skipped", "error", err)
 		}
 		return nil
 	}
 	if location != nil && logger != nil {
 		logger.Info(
-			"cloud metadata location detected",
+			"node location detected",
 			"provider", location.Provider,
+			"source", location.Source,
 			"region", location.Region,
 			"zone", location.Zone,
 		)

internal/agent/enrollment_test.go

@@ -18,8 +18,8 @@ import (
 
 func TestRunInteractiveEnrollmentUsesExpectedInitiatePayload(t *testing.T) {
 	tmpDir := t.TempDir()
-	originalDetectCloudLocation := detectCloudLocation
-	detectCloudLocation = func(context.Context, *slog.Logger) *api.NodeLocation {
+	originalDetectNodeLocation := detectNodeLocation
+	detectNodeLocation = func(context.Context, config.Config, *slog.Logger) *api.NodeLocation {
 		return &api.NodeLocation{
 			Provider: "aws",
 			Source:   "cloud_metadata",
@@ -28,7 +28,7 @@ func TestRunInteractiveEnrollmentUsesExpectedInitiatePayload(t *testing.T) {
 		}
 	}
 	t.Cleanup(func() {
-		detectCloudLocation = originalDetectCloudLocation
+		detectNodeLocation = originalDetectNodeLocation
 	})
 
 	cfg := config.Config{
@@ -84,7 +84,7 @@ func TestRunInteractiveEnrollmentUsesExpectedInitiatePayload(t *testing.T) {
 		t.Fatalf("agent version mismatch: got %q want %q", client.initiateRequest.AdditionalInfo.AgentVersion, "dev")
 	}
 	if client.initiateRequest.AdditionalInfo.Location == nil {
-		t.Fatal("expected cloud metadata location to be included")
+		t.Fatal("expected node location to be included")
 	}
 	if client.initiateRequest.AdditionalInfo.Location.Region != "eu-central-1" {
 		t.Fatalf("location region mismatch: got %q want %q", client.initiateRequest.AdditionalInfo.Location.Region, "eu-central-1")

internal/agent/service.go

@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/noderax/noderax-agent/internal/api"
-	"github.com/noderax/noderax-agent/internal/cloudmetadata"
 	"github.com/noderax/noderax-agent/internal/config"
 	"github.com/noderax/noderax-agent/internal/metrics"
+	"github.com/noderax/noderax-agent/internal/nodelocation"
 	"github.com/noderax/noderax-agent/internal/realtime"
 	"github.com/noderax/noderax-agent/internal/rootaccess"
 	"github.com/noderax/noderax-agent/internal/system"
@@ -159,7 +159,7 @@ func NewService(cfg config.Config, client *api.Client, logger *slog.Logger, vers
 	}
 	if realtimeService != nil {
 		realtimeService.SetRuntimeAgentVersion(version)
-		setRealtimeCloudLocation(context.Background(), logger, realtimeService, false)
+		setRealtimeNodeLocation(context.Background(), cfg, logger, realtimeService, false)
 		hostInfo, hostInfoErr := system.HostInfo(context.Background())
 		if hostInfoErr != nil {
 			logger.Warn("failed to read host metadata for realtime auth", "error", hostInfoErr)
@@ -210,7 +210,7 @@ func (s *Service) Run(ctx context.Context) error {
 		name string
 		run  func(context.Context) error
 	}{
-		{name: "cloud-metadata", run: s.runCloudMetadataSync},
+		{name: "node-location", run: s.runNodeLocationSync},
 		{name: "realtime", run: s.realtime.Run},
 		{name: "metrics", run: s.metrics.Run},
 		{name: "tasks", run: s.tasks.Run},
@@ -246,7 +246,7 @@ func (s *Service) Run(ctx context.Context) error {
 	}
 }
 
-func (s *Service) runCloudMetadataSync(ctx context.Context) error {
+func (s *Service) runNodeLocationSync(ctx context.Context) error {
 	if s.realtime == nil || s.realtime.RuntimeLocation() != nil {
 		return nil
 	}
@@ -267,24 +267,25 @@ func (s *Service) runCloudMetadataSync(ctx context.Context) error {
 		case <-timer.C:
 		}
 
-		if setRealtimeCloudLocation(ctx, s.logger, s.realtime, true) {
+		if setRealtimeNodeLocation(ctx, s.cfg, s.logger, s.realtime, true) {
 			return nil
 		}
 	}
 
 	return nil
 }
 
-func setRealtimeCloudLocation(
+func setRealtimeNodeLocation(
 	ctx context.Context,
+	cfg config.Config,
 	logger *slog.Logger,
 	realtimeService *realtime.Service,
 	refreshAuth bool,
 ) bool {
-	location, err := cloudmetadata.Detect(ctx)
+	location, err := nodelocation.Detect(ctx, cfg)
 	if err != nil {
 		if logger != nil {
-			logger.Debug("cloud metadata location detection skipped", "error", err)
+			logger.Debug("node location detection skipped", "error", err)
 		}
 		return false
 	}
@@ -295,8 +296,9 @@ func setRealtimeCloudLocation(
 	realtimeService.SetRuntimeLocation(location)
 	if logger != nil {
 		logger.Info(
-			"cloud metadata location detected",
+			"node location detected",
 			"provider", location.Provider,
+			"source", location.Source,
 			"region", location.Region,
 			"zone", location.Zone,
 		)
@@ -305,7 +307,7 @@ func setRealtimeCloudLocation(
 		refreshCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
 		defer cancel()
 		if err := realtimeService.RefreshAuth(refreshCtx); err != nil && !errors.Is(err, realtime.ErrSessionNotActive) && logger != nil {
-			logger.Debug("cloud metadata realtime auth refresh skipped", "error", err)
+			logger.Debug("node location realtime auth refresh skipped", "error", err)
 		}
 	}
 	return true