tests

Author: kafka1991

http_integration_test.go

@@ -87,7 +87,7 @@ func (suite *integrationTestSuite) TestE2ESuccessfulHttpBasicAuthWithTlsProxy()
 
 	expected := tableData{
 		Columns: []column{
-			{"str_col", "STRING"},
+			{"str_col", "VARCHAR"},
 			{"timestamp", "TIMESTAMP"},
 		},
 		Dataset: [][]interface{}{

http_sender.go

@@ -450,6 +450,11 @@ func (s *httpLineSender) detectProtocolVersion(ctx context.Context, conf *lineSe
 	if err != nil {
 		return protocolVersionUnset, err
 	}
+	if s.user != "" && s.pass != "" {
+		req.SetBasicAuth(s.user, s.pass)
+	} else if s.token != "" {
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", s.token))
+	}
 
 	reqCtx, cancel := context.WithTimeout(ctx, s.requestTimeout)
 	defer cancel()

integration_test.go

@@ -200,7 +200,7 @@ func setupQuestDB0(ctx context.Context, auth ilpAuthType, setupProxy bool) (*que
 		req = testcontainers.ContainerRequest{
 			Image:        "haproxy:2.6.4",
 			ExposedPorts: []string{"8443/tcp", "8444/tcp", "8445/tcp", "8888/tcp"},
-			WaitingFor:   wait.ForHTTP("/").WithPort("8888"),
+			WaitingFor:   wait.ForHTTP("/settings").WithPort("8888"),
 			Networks:     []string{uniqueNetworkName},
 			Mounts: testcontainers.Mounts(testcontainers.ContainerMount{
 				Source: testcontainers.GenericBindMountSource{

sender_pool_test.go

@@ -37,7 +37,7 @@ import (
 )
 
 func TestBasicBehavior(t *testing.T) {
-	p, err := qdb.PoolFromConf("http::addr=localhost:1234")
+	p, err := qdb.PoolFromConf("http::addr=localhost:1234;protocol_version=2;")
 	require.NoError(t, err)
 	ctx := context.Background()