Merge branch 'main' into upgrade-go-1.22

gateway/config.go

@@ -40,6 +40,7 @@ type Tenant struct {
 	Username       string `yaml:"username"`
 	Password       string `yaml:"password"`
 	ID             string `yaml:"id"`
+	Passthrough    bool   `yaml:"passthrough"`
 }
 
 func Init(filePath string) (Config, error) {

gateway/gateway_test.go

@@ -69,6 +69,7 @@ func TestStartGateway(t *testing.T) {
 	testCases := []struct {
 		name           string
 		authHeader     string
+		orgID          string
 		config         *Config
 		paths          []string
 		expectedStatus int
@@ -220,6 +221,31 @@ func TestStartGateway(t *testing.T) {
 			authHeader:     "Basic " + base64.StdEncoding.EncodeToString([]byte("username:password")),
 			expectedStatus: http.StatusOK,
 		},
+		{
+			name: "passthrough config",
+			config: &Config{
+				Tenants: []Tenant{
+					{
+						Authentication: "basic",
+						Username:       "username",
+						Password:       "password",
+						Passthrough:    true,
+					},
+				},
+				Distributor: Upstream{
+					URL: distributorServer.URL,
+					Paths: []string{
+						"/test/distributor",
+					},
+				},
+			},
+			paths: []string{
+				"/test/distributor",
+			},
+			authHeader:     "Basic " + base64.StdEncoding.EncodeToString([]byte("username:password")),
+			orgID:          "orgID",
+			expectedStatus: http.StatusOK,
+		},
 		{
 			name: "not found route",
 			config: &Config{
@@ -348,6 +374,11 @@ func TestStartGateway(t *testing.T) {
 			for _, path := range tc.paths {
 				req, _ := http.NewRequest("GET", mockServer.URL+path, nil)
 				req.Header.Set("Authorization", tc.authHeader)
+
+				if tc.orgID != "" {
+					req.Header.Set("X-Scope-OrgID", tc.orgID)
+				}
+
 				resp, err := client.Do(req)
 				if err != nil {
 					t.Fatal(err)

gateway/middleware.go

@@ -58,7 +58,9 @@ func (tenant *Tenant) basicAuth(w http.ResponseWriter, r *http.Request) bool {
 		return false
 	}
 
-	r.Header.Set("X-Scope-OrgID", tenant.ID)
+	if !tenant.Passthrough {
+		r.Header.Set("X-Scope-OrgID", tenant.ID)
+	}
 	return true
 }