pipe tenant id to restful search interface

Author: msukkari

internal/tenant/grpc.go

@@ -19,7 +19,7 @@ import (
 
 const (
 	// headerKeyTenantID is the header key for the tenant ID.
-	headerKeyTenantID = "X-Sourcegraph-Tenant-ID"
+	headerKeyTenantID = "X-Tenant-ID"
 
 	// headerValueNoTenant indicates the request has no tenant.
 	headerValueNoTenant = "none"

internal/tenant/rest_helper.go

@@ -0,0 +1,27 @@
+package tenant
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"net/http"
+
+	"github.com/sourcegraph/zoekt/internal/tenant/internal/tenanttype"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+func InjectTenantFromHeader(ctx context.Context, header http.Header) (context.Context, error) {
+	log.Printf("header: %v", header)
+	tenantID := header.Get(headerKeyTenantID)
+	log.Printf("tenantID: %s", tenantID)
+	if tenantID != "" {
+		tenant, err := tenanttype.Unmarshal(tenantID)
+		if err != nil {
+			return ctx, status.New(codes.InvalidArgument, fmt.Errorf("bad tenant value in header: %w", err).Error()).Err()
+		}
+
+		return tenanttype.WithTenant(ctx, tenant), nil
+	}
+	return ctx, nil
+}

json/json.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/sourcegraph/zoekt"
+	"github.com/sourcegraph/zoekt/internal/tenant"
 	"github.com/sourcegraph/zoekt/query"
 )
 
@@ -85,6 +86,12 @@ func (s *jsonSearcher) jsonSearch(w http.ResponseWriter, req *http.Request) {
 		defer cancel()
 	}
 
+	ctx, err = tenant.InjectTenantFromHeader(ctx, req.Header)
+	if err != nil {
+		jsonError(w, http.StatusBadRequest, err.Error())
+		return
+	}
+
 	if err := CalculateDefaultSearchLimits(ctx, q, s.Searcher, searchArgs.Opts); err != nil {
 		jsonError(w, http.StatusInternalServerError, err.Error())
 		return