Remove quesma/network (#1024)

Related: #1017 Signed-off-by: Przemysław Hejman <[email protected]>
QuesmaOrg · Nov 21, 2024 · 14c9d62 · 14c9d62
1 parent 1424c9d
commit 14c9d62
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git a/quesma/proxy/l4_proxy.go b/quesma/proxy/l4_proxy.go
@@ -12,7 +12,6 @@ import (
 	"quesma/clickhouse"
 	"quesma/elasticsearch"
 	"quesma/logger"
-	"quesma/network"
 	"quesma/quesma/config"
 	"quesma/quesma/types"
 	"quesma/stats"
@@ -27,15 +26,15 @@ const (
 )
 
 type TcpProxy struct {
-	From                 network.Port
+	From                 util.Port
 	To                   string
 	inspect              bool
 	inspectHttpServer    *http.Server
 	ready                chan struct{}
 	acceptingConnections atomic.Bool
 }
 
-func NewTcpProxy(From network.Port, To string, inspect bool) *TcpProxy {
+func NewTcpProxy(From util.Port, To string, inspect bool) *TcpProxy {
 	return &TcpProxy{
 		From:              From,
 		To:                To,

diff --git a/quesma/proxy/l4_proxy_test.go b/quesma/proxy/l4_proxy_test.go
@@ -10,8 +10,8 @@ import (
 	"log"
 	"net"
 	"net/http"
-	"quesma/network"
 	"quesma/stats"
+	"quesma/util"
 	"slices"
 	"strconv"
 	"testing"
@@ -53,7 +53,7 @@ func TestTcpProxy_IngestAndProcess(t *testing.T) {
 	verifyStatistics(t, fromPort)
 }
 
-func verifyStatistics(t *testing.T, port network.Port) {
+func verifyStatistics(t *testing.T, port util.Port) {
 	go func() {
 		_, err := http.Post(fmt.Sprintf("http://localhost:%d/logs/_doc", int(port)), "application/json", bytes.NewBuffer([]byte(exampleLog())))
 		if err != nil {
@@ -73,7 +73,7 @@ func verifyStatistics(t *testing.T, port network.Port) {
 	t.Fatal("Statistics not updated")
 }
 
-func verifyTCPProxy(t1 *testing.T, data string, fromPort network.Port, toPort network.Port) {
+func verifyTCPProxy(t1 *testing.T, data string, fromPort util.Port, toPort util.Port) {
 	conn, err := net.Dial("tcp", ":"+strconv.Itoa(int(fromPort)))
 	if err != nil {
 		t1.Fatal("Error dialing to port:", err)
@@ -106,22 +106,22 @@ func verifyTCPProxy(t1 *testing.T, data string, fromPort network.Port, toPort ne
 	}
 }
 
-var allocatedPorts = make([]network.Port, 0)
+var allocatedPorts = make([]util.Port, 0)
 
-func findFreePort() network.Port {
+func findFreePort() util.Port {
 	port := 11000
 
 	for {
-		if slices.Contains(allocatedPorts, network.Port(port)) {
+		if slices.Contains(allocatedPorts, util.Port(port)) {
 			port++
 			continue
 		}
 		listener, err := net.Listen("tcp", ":"+strconv.Itoa(port))
 		if err == nil {
 			_ = listener.Close()
-			allocatedPorts = append(allocatedPorts, network.Port(port))
+			allocatedPorts = append(allocatedPorts, util.Port(port))
 			log.Println("Allocated port:", port)
-			return network.Port(port)
+			return util.Port(port)
 		}
 		port++
 	}

diff --git a/quesma/quesma/config/config.go b/quesma/quesma/config/config.go
@@ -11,7 +11,6 @@ import (
 	"log"
 	"os"
 	"quesma/elasticsearch/elasticsearch_field_types"
-	"quesma/network"
 	"quesma/util"
 	"strings"
 )
@@ -38,7 +37,7 @@ type QuesmaConfiguration struct {
 	Elasticsearch              ElasticsearchConfiguration
 	IndexConfig                map[string]IndexConfiguration
 	Logging                    LoggingConfiguration
-	PublicTcpPort              network.Port
+	PublicTcpPort              util.Port
 	IngestStatistics           bool
 	QuesmaInternalTelemetryUrl *Url
 	DisableAuth                bool

diff --git a/quesma/quesma/config/config_v2.go b/quesma/quesma/config/config_v2.go
@@ -10,7 +10,7 @@ import (
 	"github.com/knadh/koanf/v2"
 	"github.com/rs/zerolog"
 	"log"
-	"quesma/network"
+	"quesma/util"
 	"reflect"
 	"slices"
 	"strings"
@@ -72,8 +72,8 @@ type FrontendConnector struct {
 }
 
 type FrontendConnectorConfiguration struct {
-	ListenPort  network.Port `koanf:"listenPort"`
-	DisableAuth bool         `koanf:"disableAuth"`
+	ListenPort  util.Port `koanf:"listenPort"`
+	DisableAuth bool      `koanf:"disableAuth"`
 }
 
 type BackendConnector struct {
@@ -849,7 +849,7 @@ END:
 	return conf
 }
 
-func (c *QuesmaNewConfiguration) getPublicTcpPort() (network.Port, error) {
+func (c *QuesmaNewConfiguration) getPublicTcpPort() (util.Port, error) {
 	// per validation, there's always at least one frontend connector,
 	// even if there's a second one, it has to listen on the same port
 	return c.FrontendConnectors[0].Config.ListenPort, nil

diff --git a/quesma/quesma/dual_write_proxy.go b/quesma/quesma/dual_write_proxy.go
@@ -10,14 +10,14 @@ import (
 	"quesma/clickhouse"
 	"quesma/elasticsearch"
 	"quesma/logger"
-	"quesma/network"
 	"quesma/quesma/async_search_storage"
 	"quesma/quesma/config"
 	"quesma/quesma/mux"
 	"quesma/quesma/recovery"
 	"quesma/quesma/ui"
 	"quesma/schema"
 	"quesma/telemetry"
+	"quesma/util"
 	"strconv"
 	"sync/atomic"
 	"time"
@@ -58,7 +58,7 @@ type dualWriteHttpProxy struct {
 	elasticRouter       *mux.PathRouter
 	indexManagement     elasticsearch.IndexManagement
 	logManager          *clickhouse.LogManager
-	publicPort          network.Port
+	publicPort          util.Port
 	asyncQueriesEvictor *async_search_storage.AsyncQueriesEvictor
 	queryRunner         *QueryRunner
 	schemaRegistry      schema.Registry

diff --git a/quesma/quesma/quesma.go b/quesma/quesma/quesma.go
@@ -16,7 +16,6 @@ import (
 	"quesma/feature"
 	"quesma/ingest"
 	"quesma/logger"
-	"quesma/network"
 	"quesma/proxy"
 	"quesma/queryparser"
 	"quesma/quesma/config"
@@ -39,7 +38,7 @@ import (
 type (
 	Quesma struct {
 		processor               engine
-		publicTcpPort           network.Port
+		publicTcpPort           util.Port
 		quesmaManagementConsole *ui.QuesmaManagementConsole
 		config                  *config.QuesmaConfiguration
 		telemetryAgent          telemetry.PhoneHomeAgent

diff --git a/quesma/network/types.go → quesma/util/port.go b/quesma/network/types.go → quesma/util/port.go
@@ -1,6 +1,7 @@
 // Copyright Quesma, licensed under the Elastic License 2.0.
 // SPDX-License-Identifier: Elastic-2.0
-package network
+
+package util
 
 import (
 	"fmt"