chore: remove dead code — ErrTenantIDNotFound, SetTenantIDMiddleware, mustTenantIDFromContext

- Remove 3 dead symbols from auth_middleware.go
- Remove TestSetTenantIDMiddleware from auth_middleware_test.go
- RequireTenantMiddleware reads c.Param("tenantID") instead of c.Get
- Remove SetTenantIDMiddleware() from router global middleware
- Upsert handler uses c.Param("tenantID") directly

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: alexluong

internal/apirouter/auth_middleware.go

@@ -11,7 +11,6 @@ import (
 var (
 	ErrMissingAuthHeader  = errors.New("missing authorization header")
 	ErrInvalidBearerToken = errors.New("invalid bearer token format")
-	ErrTenantIDNotFound   = errors.New("tenantID not found in context")
 )
 
 const (
@@ -23,16 +22,6 @@ const (
 	RoleTenant = "tenant"
 )
 
-func SetTenantIDMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		tenantID := c.Param("tenantID")
-		if tenantID != "" {
-			c.Set("tenantID", tenantID)
-		}
-		c.Next()
-	}
-}
-
 // validateAuthHeader checks the Authorization header and returns the token if valid
 func validateAuthHeader(c *gin.Context) (string, error) {
 	header := c.GetHeader("Authorization")
@@ -149,15 +138,3 @@ func TenantJWTAuthMiddleware(apiKey string, jwtKey string) gin.HandlerFunc {
 	}
 }
 
-func mustTenantIDFromContext(c *gin.Context) string {
-	tenantID, exists := c.Get("tenantID")
-	if !exists {
-		c.AbortWithStatus(http.StatusInternalServerError)
-		return ""
-	}
-	if tenantID == nil {
-		c.AbortWithStatus(http.StatusInternalServerError)
-		return ""
-	}
-	return tenantID.(string)
-}

internal/apirouter/auth_middleware_test.go

@@ -88,79 +88,6 @@ func TestPrivateAPIKeyRouter(t *testing.T) {
 	})
 }
 
-func TestSetTenantIDMiddleware(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	t.Parallel()
-
-	t.Run("should set tenantID from param", func(t *testing.T) {
-		t.Parallel()
-
-		// Setup
-		w := httptest.NewRecorder()
-		c, _ := gin.CreateTestContext(w)
-		c.Params = []gin.Param{{Key: "tenantID", Value: "test_tenant"}}
-
-		// Create a middleware chain
-		var tenantID string
-		handler := apirouter.SetTenantIDMiddleware()
-		nextHandler := func(c *gin.Context) {
-			val, exists := c.Get("tenantID")
-			if exists {
-				tenantID = val.(string)
-			}
-		}
-
-		// Test
-		handler(c)
-		nextHandler(c)
-
-		assert.Equal(t, "test_tenant", tenantID)
-	})
-
-	t.Run("should not set tenantID when param is empty", func(t *testing.T) {
-		t.Parallel()
-
-		// Setup
-		w := httptest.NewRecorder()
-		c, _ := gin.CreateTestContext(w)
-		c.Params = []gin.Param{{Key: "tenantID", Value: ""}}
-
-		// Create a middleware chain
-		var tenantIDExists bool
-		handler := apirouter.SetTenantIDMiddleware()
-		nextHandler := func(c *gin.Context) {
-			_, tenantIDExists = c.Get("tenantID")
-		}
-
-		// Test
-		handler(c)
-		nextHandler(c)
-
-		assert.False(t, tenantIDExists)
-	})
-
-	t.Run("should not set tenantID when param is missing", func(t *testing.T) {
-		t.Parallel()
-
-		// Setup
-		w := httptest.NewRecorder()
-		c, _ := gin.CreateTestContext(w)
-
-		// Create a middleware chain
-		var tenantIDExists bool
-		handler := apirouter.SetTenantIDMiddleware()
-		nextHandler := func(c *gin.Context) {
-			_, tenantIDExists = c.Get("tenantID")
-		}
-
-		// Test
-		handler(c)
-		nextHandler(c)
-
-		assert.False(t, tenantIDExists)
-	})
-}
-
 func TestAPIKeyOrTenantJWTAuthMiddleware(t *testing.T) {
 	gin.SetMode(gin.TestMode)
 	t.Parallel()

internal/apirouter/requiretenant_middleware.go

@@ -17,13 +17,13 @@ type TenantRetriever interface {
 
 func RequireTenantMiddleware(tenantRetriever TenantRetriever) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		tenantID, exists := c.Get("tenantID")
-		if !exists {
+		tenantID := c.Param("tenantID")
+		if tenantID == "" {
 			c.AbortWithStatus(http.StatusNotFound)
 			return
 		}
 
-		tenant, err := tenantRetriever.RetrieveTenant(c.Request.Context(), tenantID.(string))
+		tenant, err := tenantRetriever.RetrieveTenant(c.Request.Context(), tenantID)
 		if err != nil {
 			if err == tenantstore.ErrTenantDeleted {
 				c.AbortWithStatus(http.StatusNotFound)

internal/apirouter/router.go

@@ -132,7 +132,6 @@ func NewRouter(
 	portal.AddRoutes(r, cfg.PortalConfig)
 
 	apiRouter := r.Group("/api/v1")
-	apiRouter.Use(SetTenantIDMiddleware())
 
 	tenantHandlers := NewTenantHandlers(logger, telemetry, cfg.JWTSecret, cfg.DeploymentID, tenantStore)
 	destinationHandlers := NewDestinationHandlers(logger, telemetry, tenantStore, cfg.Topics, cfg.Registry)

internal/apirouter/tenant_handlers.go

@@ -38,10 +38,7 @@ func NewTenantHandlers(
 }
 
 func (h *TenantHandlers) Upsert(c *gin.Context) {
-	tenantID := mustTenantIDFromContext(c)
-	if tenantID == "" {
-		return
-	}
+	tenantID := c.Param("tenantID")
 
 	// Parse request body for metadata
 	var input struct {