Add comprehensive unit tests for Akamai metrics functionality

REUSE.toml

@@ -17,6 +17,7 @@ path = [
     "models/**",
     "etc/**",
     "web/**",
+    "internal/rpc/**.pb.go",
 ]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2022-2025 SAP SE or an SAP affiliate company and andromeda contributors"

go.mod

@@ -19,7 +19,6 @@ require (
 	github.com/cockroachdb/cockroach-go/v2 v2.4.1
 	github.com/didip/tollbooth v4.0.2+incompatible
 	github.com/dlmiddlecote/sqlstats v1.0.2
-	github.com/dre1080/recovr v1.0.3
 	github.com/getsentry/sentry-go v0.20.0
 	github.com/go-openapi/errors v0.22.1
 	github.com/go-openapi/loads v0.22.0
@@ -72,9 +71,6 @@ require (
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
-	github.com/gobuffalo/logger v1.0.3 // indirect
-	github.com/gobuffalo/packd v1.0.0 // indirect
-	github.com/gobuffalo/packr/v2 v2.8.0 // indirect
 	github.com/gofrs/uuid/v5 v5.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
@@ -84,15 +80,10 @@ require (
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/karrick/godirwalk v1.15.3 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
-	github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
-	github.com/markbates/errx v1.1.0 // indirect
-	github.com/markbates/oncer v1.0.0 // indirect
-	github.com/markbates/safe v1.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -110,12 +101,10 @@ require (
 	github.com/rabbitmq/amqp091-go v1.10.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sergi/go-diff v1.4.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	github.com/ztrue/tracerr v0.3.0 // indirect
 	go.mongodb.org/mongo-driver v1.14.0 // indirect
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
@@ -124,7 +113,6 @@ require (
 	golang.org/x/crypto v0.39.0 // indirect
 	golang.org/x/sync v0.15.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
 	golang.org/x/text v0.26.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

internal/client/table_writer.go

@@ -22,6 +22,27 @@ func formatValue(v reflect.Value) string {
 			return "Null"
 		}
 		return formatValue(v.Elem())
+	case reflect.Slice, reflect.Array:
+		if v.Len() == 0 {
+			return "[]"
+		}
+		// For datacenters slice, show a summary
+		if v.Len() > 0 {
+			firstElem := v.Index(0)
+			if firstElem.Kind() == reflect.Ptr && !firstElem.IsNil() {
+				firstElem = firstElem.Elem()
+			}
+			// Check if this looks like a datacenter slice
+			if firstElem.Kind() == reflect.Struct {
+				typeName := firstElem.Type().Name()
+				if typeName == "AkamaiTotalDNSRequestsDatacentersItems0" {
+					// Show a summary for datacenters
+					return fmt.Sprintf("%d datacenter(s)", v.Len())
+				}
+			}
+		}
+		// For other slices, show count
+		return fmt.Sprintf("[%d items]", v.Len())
 	default:
 		return fmt.Sprintf("%v", v)
 	}

internal/controller/cidr_blocks.go

@@ -5,22 +5,23 @@
 package controller
 
 import (
-	"encoding/json"
-	"fmt"
+	"context"
+	"time"
 
-	"github.com/actatum/stormrpc"
+	"github.com/apex/log"
 	"github.com/go-openapi/runtime/middleware"
 
 	"github.com/sapcc/andromeda/internal/auth"
+	"github.com/sapcc/andromeda/internal/rpc/agent/akamai"
+	"github.com/sapcc/andromeda/internal/rpcmodels"
 	"github.com/sapcc/andromeda/internal/utils"
 	"github.com/sapcc/andromeda/restapi/operations/administrative"
 )
 
-type cidrBlocks []map[string]any
-
 type CidrBlocksController struct {
 	CommonController
-	cache map[string]cidrBlocks
+	cache map[string]*rpcmodels.GetCidrsResponse
+	agent akamai.RPCAgentAkamaiClient
 }
 
 // GetCidrBlocks GET /cidr-blocks
@@ -35,23 +36,18 @@ func (c CidrBlocksController) GetCidrBlocks(params administrative.GetCidrBlocksP
 	}
 
 	// Check if the CIDR blocks are already cached
-	var res cidrBlocks
+	var res *rpcmodels.GetCidrsResponse
 	var ok bool
 	if res, ok = c.cache[provider]; !ok {
-		subject := fmt.Sprintf("andromeda.get_cidrs.%s", provider)
-		r, err := stormrpc.NewRequest(subject, nil)
-		if err != nil {
-			panic(err)
-		}
+		ctx, cancel := context.WithTimeout(params.HTTPRequest.Context(), 5*time.Second)
+		defer cancel()
 
-		resp := c.rpc.Do(params.HTTPRequest.Context(), r)
-		if resp.Err != nil {
-			panic(resp.Err)
+		var err error
+		if res, err = c.agent.GetCidrs(ctx, &rpcmodels.GetCidrsRequest{}); err != nil {
+			log.WithError(err).Error("failed to get cidr blocks")
+			return administrative.NewGetCidrBlocksDefault(408).WithPayload(utils.TryAgainLater)
 		}
 
-		if err = json.Unmarshal(resp.Data, &res); err != nil {
-			panic(err)
-		}
 		c.cache[provider] = res
 	}
 	return administrative.NewGetCidrBlocksOK().WithPayload(res)

internal/controller/controller.go

@@ -14,6 +14,9 @@ import (
 	"github.com/nats-io/nats.go"
 
 	"github.com/sapcc/andromeda/internal/config"
+	"github.com/sapcc/andromeda/internal/rpc/agent"
+	"github.com/sapcc/andromeda/internal/rpc/agent/akamai"
+	"github.com/sapcc/andromeda/internal/rpcmodels"
 )
 
 type Controller struct {
@@ -30,9 +33,10 @@ type Controller struct {
 }
 
 type CommonController struct {
-	db  *sqlx.DB
-	nc  *nats.Conn
-	rpc *stormrpc.Client
+	db    *sqlx.DB
+	nc    *nats.Conn
+	rpc   *stormrpc.Client
+	agent agent.RPCAgentClient
 }
 
 func New(db *sqlx.DB) *Controller {
@@ -47,9 +51,10 @@ func New(db *sqlx.DB) *Controller {
 	}
 
 	cc := CommonController{
-		db:  db,
-		nc:  nc,
-		rpc: rpcClient,
+		db:    db,
+		nc:    nc,
+		rpc:   rpcClient,
+		agent: agent.NewRPCAgentClient(rpcClient),
 	}
 	c := Controller{
 		DomainController{cc},
@@ -61,24 +66,22 @@ func New(db *sqlx.DB) *Controller {
 		QuotaController{cc},
 		SyncController{cc},
 		GeoMapController{cc},
-		CidrBlocksController{cc, make(map[string]cidrBlocks)},
+		CidrBlocksController{
+			CommonController: cc,
+			cache:           make(map[string]*rpcmodels.GetCidrsResponse),
+			agent:           akamai.NewRPCAgentAkamaiClient(rpcClient),
+		},
 	}
 	return &c
 }
 
-func PendingSync(client *stormrpc.Client) error {
-	if client == nil {
+func (cc CommonController) PendingSync() error {
+	// Skip sync if agent is not initialized (e.g., in tests)
+	if cc.agent == nil {
 		return nil
 	}
-
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
-
-	r, err := stormrpc.NewRequest("andromeda.sync", []string{})
-	if err != nil {
-		return err
-	}
-
-	resp := client.Do(ctx, r)
-	return resp.Err
+	_, err := cc.agent.Sync(ctx, &rpcmodels.SyncRequest{})
+	return err
 }

internal/controller/datacenter.go

@@ -95,7 +95,7 @@ func (c DatacenterController) PostDatacenters(params datacenters.PostDatacenters
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return datacenters.NewPostDatacentersCreated().WithPayload(&datacenters.PostDatacentersCreatedBody{Datacenter: datacenter})
 }
 
@@ -151,7 +151,7 @@ func (c DatacenterController) PutDatacentersDatacenterID(params datacenters.PutD
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return datacenters.NewPutDatacentersDatacenterIDAccepted().WithPayload(
 		&datacenters.PutDatacentersDatacenterIDAcceptedBody{Datacenter: &datacenter})
 }
@@ -191,7 +191,7 @@ func (c DatacenterController) DeleteDatacentersDatacenterID(params datacenters.D
 		return datacenters.NewDeleteDatacentersDatacenterIDNotFound().WithPayload(utils.NotFound)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return datacenters.NewDeleteDatacentersDatacenterIDNoContent()
 }
 

internal/controller/domain.go

@@ -144,7 +144,7 @@ func (c DomainController) PostDomains(params domains.PostDomainsParams) middlewa
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	populateCNAME(domain)
 	return domains.NewPostDomainsCreated().WithPayload(&domains.PostDomainsCreatedBody{Domain: domain})
 }
@@ -254,7 +254,7 @@ func (c DomainController) PutDomainsDomainID(params domains.PutDomainsDomainIDPa
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	populateCNAME(&domain)
 	return domains.NewPutDomainsDomainIDAccepted().WithPayload(&domains.PutDomainsDomainIDAcceptedBody{Domain: &domain})
 }
@@ -276,7 +276,7 @@ func (c DomainController) DeleteDomainsDomainID(params domains.DeleteDomainsDoma
 		return domains.NewDeleteDomainsDomainIDNotFound().WithPayload(utils.NotFound)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return domains.NewDeleteDomainsDomainIDNoContent()
 }
 

internal/controller/geomap.go

@@ -148,7 +148,7 @@ func (c GeoMapController) PostGeomaps(params geographic_maps.PostGeomapsParams)
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return geographic_maps.NewPostGeomapsCreated().WithPayload(&geographic_maps.PostGeomapsCreatedBody{Geomap: geomap})
 }
 
@@ -227,7 +227,7 @@ func (c GeoMapController) DeleteGeomapsGeoMapID(params geographic_maps.DeleteGeo
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return geographic_maps.NewDeleteGeomapsGeomapIDNoContent()
 }
 

internal/controller/member.go

@@ -125,7 +125,7 @@ func (c MemberController) PostMembers(params members.PostMembersParams) middlewa
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return members.NewPostMembersCreated().
 		WithPayload(&members.PostMembersCreatedBody{Member: member})
 }
@@ -186,7 +186,7 @@ func (c MemberController) PutMembersMemberID(params members.PutMembersMemberIDPa
 		panic(err)
 	}
 
-	if err := PendingSync(c.rpc); err != nil {
+	if err := c.PendingSync(); err != nil {
 		log.WithError(err).Error("Failed to sync provisioning status")
 	}
 	return members.NewPutMembersMemberIDAccepted().
@@ -218,7 +218,7 @@ func (c MemberController) DeleteMembersMemberID(params members.DeleteMembersMemb
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return members.NewDeleteMembersMemberIDNoContent()
 }
 

internal/controller/monitor.go

@@ -123,7 +123,7 @@ func (c MonitorController) PostMonitors(params monitors.PostMonitorsParams) midd
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return monitors.NewPostMonitorsCreated().WithPayload(&monitors.PostMonitorsCreatedBody{Monitor: monitor})
 }
 
@@ -189,7 +189,7 @@ func (c MonitorController) PutMonitorsMonitorID(params monitors.PutMonitorsMonit
 	if err := PopulateMonitor(c.db, &monitor, []string{"*"}); err != nil {
 		panic(err)
 	}
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return monitors.NewPutMonitorsMonitorIDAccepted().WithPayload(
 		&monitors.PutMonitorsMonitorIDAcceptedBody{Monitor: &monitor})
 }
@@ -218,7 +218,7 @@ func (c MonitorController) DeleteMonitorsMonitorID(params monitors.DeleteMonitor
 		}
 		panic(err)
 	}
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return monitors.NewDeleteMonitorsMonitorIDNoContent()
 }
 

internal/controller/pool.go

@@ -134,7 +134,7 @@ func (c PoolController) PostPools(params pools.PostPoolsParams) middleware.Respo
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return pools.NewPostPoolsCreated().WithPayload(&pools.PostPoolsCreatedBody{Pool: pool})
 }
 
@@ -220,7 +220,7 @@ func (c PoolController) PutPoolsPoolID(params pools.PutPoolsPoolIDParams) middle
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return pools.NewPutPoolsPoolIDAccepted().WithPayload(&pools.PutPoolsPoolIDAcceptedBody{Pool: &pool})
 }
 
@@ -255,7 +255,7 @@ func (c PoolController) DeletePoolsPoolID(params pools.DeletePoolsPoolIDParams)
 		panic(err)
 	}
 
-	_ = PendingSync(c.rpc)
+	_ = c.PendingSync()
 	return pools.NewDeletePoolsPoolIDNoContent()
 }