Merged in feature/import (pull request #157)

Feature/import

* importstart

* pp

* tests

* importtests

* 100GB

* lint

* passtests

* utc

* awsprofile

* doublequotes

* host

cmd/queryAPI/main.go

@@ -19,23 +19,28 @@ import (
 	"log/slog"
 	"os"
 
-	queryapi "queryorchestration/api/queryAPI"
-	"queryorchestration/internal/serviceconfig"
-
 	"queryorchestration/internal/client"
-	clientupdate "queryorchestration/internal/client/update"
 	"queryorchestration/internal/collector"
-	collectorset "queryorchestration/internal/collector/set"
 	"queryorchestration/internal/document"
 	"queryorchestration/internal/export"
 	"queryorchestration/internal/query"
 	"queryorchestration/internal/query/result"
-	querytest "queryorchestration/internal/query/test"
-	queryupdate "queryorchestration/internal/query/update"
 	"queryorchestration/internal/server/api"
+	"queryorchestration/internal/serviceconfig"
+	"queryorchestration/internal/serviceconfig/objectstore"
 	"queryorchestration/internal/serviceconfig/queue/clientsync"
 	"queryorchestration/internal/serviceconfig/queue/queryversionsync"
 
+	queryapi "queryorchestration/api/queryAPI"
+	documentupload "queryorchestration/internal/document/upload"
+
+	clientupdate "queryorchestration/internal/client/update"
+
+	collectorset "queryorchestration/internal/collector/set"
+
+	querytest "queryorchestration/internal/query/test"
+	queryupdate "queryorchestration/internal/query/update"
+
 	"github.com/getkin/kin-openapi/openapi3"
 	_ "github.com/lib/pq"
 )
@@ -44,6 +49,7 @@ type QueryAPIConfig struct {
 	api.BaseConfig
 	clientsync.ClientSyncConfig
 	queryversionsync.QueryVersionSyncConfig
+	objectstore.ObjectStoreConfig
 }
 
 func main() {
@@ -66,6 +72,7 @@ func main() {
 			Client: cli,
 		})
 		doc := document.New(cfg)
+		docup := documentupload.New(cfg)
 		quetest := querytest.New(cfg, &querytest.Services{
 			Collector: col,
 			Result:    res,
@@ -76,15 +83,16 @@ func main() {
 		})
 
 		services := &queryapi.Services{
-			Export:       exp,
-			Collector:    col,
-			CollectorSet: colupdate,
-			Query:        que,
-			QueryUpdate:  qupdate,
-			QueryTest:    quetest,
-			Client:       cli,
-			ClientUpdate: cliUpdate,
-			Document:     doc,
+			Export:         exp,
+			Collector:      col,
+			CollectorSet:   colupdate,
+			Query:          que,
+			QueryUpdate:    qupdate,
+			QueryTest:      quetest,
+			Client:         cli,
+			ClientUpdate:   cliUpdate,
+			Document:       doc,
+			DocumentUpload: docup,
 		}
 
 		cons := queryapi.NewControllers(services)
@@ -126,5 +134,11 @@ func main() {
 		os.Exit(1)
 	}
 
+	err = cfg.SetStoreClient(ctx)
+	if err != nil {
+		slog.Error(err.Error())
+		os.Exit(1)
+	}
+
 	server.Listen()
 }