mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
zeekayandHanzo Dev
3011b92ea4
gorilla/mux, otelmux, gorilla/handlers and rs/cors leave go.mod. Every route the runtime serves is a zip route on a zip group: 233 from the apiserver tree, 134 from query-service, 367 total — the same 367 the mount publishes. pkg/http/routing is the one registration surface. It exists because a registration carries three facts zip has no slot for, and the tree this replaces recovered all three PER REQUEST by asking the router what it had just matched: the bound segments, the path template, and the route's declared resources. mux.CurrentRoute(req).GetHandler() was type-asserted back to handler.Handler in two separate packages to re-derive at request time what was already known once at boot. Stating them at registration deletes both lookups. The middleware chain is composed at the LEAF rather than registered ambient, because Audit keys on the route template and Resource resolves the route's declared resources — ambient middleware runs before the router has matched, so both would read an empty route. Per-leaf composition reproduces the order the old tree ran in exactly: match, then middleware, then handler. Duplicate registration now panics at boot; gorilla let the first one win. The Sentry ingest constraint becomes fiber's own guid — a UUID parse instead of a hand-written character class. Paths keep their public brace spelling in the source and in the table; the respelling happens in one function. The standalone server hands its listener to the app, so streams and the websocket upgrade run native fasthttp. Counted, not asserted: routes_test.go in the apiserver pins 233 against the real AddToRouter, routing_test.go pins the table against the router itself. This repo has already shipped 83 typed ops that reached no router while the suite stayed green — an uncalled func is legal Go, so arithmetic is the test. Co-authored-by: Hanzo Dev <[email protected]>
90 lines
3.7 KiB
Go
90 lines
3.7 KiB
Go
package implcloudintegration
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"github.com/hanzoai/o11y/pkg/http/routing"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/hanzoai/o11y/pkg/modules/cloudintegration"
|
|
"github.com/hanzoai/o11y/pkg/types/authtypes"
|
|
citypes "github.com/hanzoai/o11y/pkg/types/cloudintegrationtypes"
|
|
"github.com/hanzoai/o11y/pkg/valuer"
|
|
)
|
|
|
|
// The per-account service route carries THREE path segments, and each one names
|
|
// a different thing the module is asked for: which cloud, which integration,
|
|
// which service. What has to hold is that the values reaching the module are the
|
|
// segments the ROUTER matched — so the request is driven through a real router
|
|
// registered at the real template rather than by injecting vars. A handler that
|
|
// read a name the route does not declare would still pass against an injector
|
|
// and would answer 400 in production.
|
|
const accountServiceRoute = "/v1/o11y/cloud_integrations/{cloud_provider}/accounts/{id}/services/{service_id}"
|
|
|
|
// recordingModule answers the two calls GetAccountService makes and records what
|
|
// it was asked for. Every other method is left to the nil embedded interface, so
|
|
// a call this test does not expect panics instead of passing quietly.
|
|
type recordingModule struct {
|
|
cloudintegration.Module
|
|
provider citypes.CloudProviderType
|
|
accountID valuer.UUID
|
|
serviceID citypes.ServiceID
|
|
}
|
|
|
|
func (m *recordingModule) GetConnectedAccount(_ context.Context, _, accountID valuer.UUID, provider citypes.CloudProviderType) (*citypes.Account, error) {
|
|
m.accountID, m.provider = accountID, provider
|
|
return &citypes.Account{}, nil
|
|
}
|
|
|
|
func (m *recordingModule) GetService(_ context.Context, _ valuer.UUID, serviceID citypes.ServiceID, _ citypes.CloudProviderType, _ valuer.UUID) (*citypes.Service, error) {
|
|
m.serviceID = serviceID
|
|
return &citypes.Service{}, nil
|
|
}
|
|
|
|
func serveAccountService(t *testing.T, module cloudintegration.Module, target string) *httptest.ResponseRecorder {
|
|
t.Helper()
|
|
|
|
router := routing.Serve(http.MethodGet, accountServiceRoute, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
NewHandler(module).GetAccountService(w, r.WithContext(authtypes.NewContextWithClaims(r.Context(), authtypes.Claims{
|
|
OrgID: valuer.GenerateUUID().String(),
|
|
UserID: valuer.GenerateUUID().String(),
|
|
Email: "u@acme",
|
|
Principal: authtypes.PrincipalUser,
|
|
})))
|
|
}))
|
|
|
|
req := httptest.NewRequest(http.MethodGet, target, http.NoBody)
|
|
|
|
rec := httptest.NewRecorder()
|
|
router.ServeHTTP(rec, req)
|
|
return rec
|
|
}
|
|
|
|
func TestGetAccountServiceActsOnTheSegmentsTheRouterMatched(t *testing.T) {
|
|
accountID := valuer.GenerateUUID()
|
|
module := new(recordingModule)
|
|
|
|
rec := serveAccountService(t, module, "/v1/o11y/cloud_integrations/aws/accounts/"+accountID.String()+"/services/ec2")
|
|
|
|
require.Equal(t, http.StatusOK, rec.Code, "body: %s", rec.Body.String())
|
|
assert.Equal(t, citypes.CloudProviderTypeAWS, module.provider, "the {cloud_provider} segment")
|
|
assert.Equal(t, accountID, module.accountID, "the {id} segment")
|
|
assert.Equal(t, citypes.AWSServiceEC2, module.serviceID, "the {service_id} segment")
|
|
}
|
|
|
|
// A provider the platform does not support is refused before anything is looked
|
|
// up — an unread or unrecognised segment must never reach the module as a query
|
|
// for whatever the zero value matches.
|
|
func TestGetAccountServiceRefusesAnUnknownProviderSegment(t *testing.T) {
|
|
module := new(recordingModule)
|
|
|
|
rec := serveAccountService(t, module, "/v1/o11y/cloud_integrations/notacloud/accounts/"+valuer.GenerateUUID().String()+"/services/ec2")
|
|
|
|
require.Equal(t, http.StatusBadRequest, rec.Code, "body: %s", rec.Body.String())
|
|
assert.Equal(t, valuer.UUID{}, module.accountID, "the module must not be reached")
|
|
}
|