jcoffey-dev
1de77b969f
ingest tags every record with a tenant_id Kafka header (built previously), but nothing consumed it to actually route the write. This closes that for ClickHouse: enterprise/cmd/enterprise-ingest (a second binary, mirroring enterprise-api) reuses ingest/consumer's own flush loop unchanged, with enterprise/internal/chwriter.Registry -- a per-tenant clickhousewriter.Writer registry -- swapped in as the writer. A batch pulled from the single shared Redpanda topic can mix records from many tenants, so WriteBatch groups by TenantID and dispatches each group to its own tenant's connection, fail- closed on an empty or unrecognized tenant_id. ingest/consumer and ingest/clickhousewriter move out of internal/ (same reason api/internal/* moved earlier this phase: enterprise/ can't import anything under another module's internal/). Their New() constructors now take small local Config structs instead of ingest/internal/config types, so enterprise/ doesn't need that import either. Building this surfaced a real bug: tenantprovision.ProvisionClickHouse only granted SELECT on a tenant's ClickHouse user, correct for chrunner's read-only use but not enough for chwriter reusing the same credential to write -- every real per-tenant write would have failed closed with a permission error. Fixed by widening the grant to SELECT, INSERT; no cross-tenant boundary is crossed by also allowing INSERT within a tenant's own database. Helm gates enterprise-ingest's Deployment on the same ingest.requireTenantCredential flag that already gates tag validation -- write-routing is meaningless without tagging already being required, so they're one decision, not two. docker-compose.yml's version is a disclosed, weaker approximation: it can't achieve Helm's genuine -mode=server/-mode=consumer split, so with the enterprise profile active both ingest and enterprise-ingest independently consume every message via different consumer groups -- harmless duplication for local verification only. Not built: Tantivy's independent Redpanda consumer (search/src/consumer.rs) still doesn't read the tenant_id header at all -- every record still lands in the one shared index regardless of tenant. Not run: the live-ClickHouse- gated tests (chwriter's cross-tenant routing test, tenantprovision's INSERT regression test) -- no Docker/database access in this environment; they're correct Go that has never executed, disclosed as such in docs/security/ threat-model.md and docs/phase-4-runbook.md §14.
22 lines
814 B
Go
22 lines
814 B
Go
package main
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/sentry/sentry/ingest/consumer"
|
|
"github.com/sentry/sentry/ingest/internal/grpcserver"
|
|
)
|
|
|
|
// TestTenantIDHeaderKeyConstantsMatch guards against the literal drift
|
|
// grpcserver.TenantIDHeaderKey's doc comment warns about: the producer
|
|
// side (grpcserver) and the consumer side (consumer) each define their
|
|
// own copy of this Kafka header key name rather than importing across
|
|
// that producer/consumer boundary, so nothing else catches a typo in
|
|
// either one at compile time.
|
|
func TestTenantIDHeaderKeyConstantsMatch(t *testing.T) {
|
|
if grpcserver.TenantIDHeaderKey != consumer.TenantIDHeaderKey {
|
|
t.Fatalf("grpcserver.TenantIDHeaderKey = %q, consumer.TenantIDHeaderKey = %q -- these must match",
|
|
grpcserver.TenantIDHeaderKey, consumer.TenantIDHeaderKey)
|
|
}
|
|
}
|