diff --git a/.golangci.yml b/.golangci.yml index e69de29b..1bbc6b39 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -0,0 +1,50 @@ +--- +linters: + enable: + - errcheck + - gosimple + - govet + - staticcheck + - typecheck + - unused + - gofmt + - goimports + - gosec + - misspell + - sloglint + - spancheck + - godox + - cyclop + +linters-settings: + errcheck: + check-type-assertions: true + gofmt: + simplify: true + goimports: + local-prefixes: queryorchestration + misspell: + locale: US + cyclop: + max-complexity: 17 + package-average: 8 + godox: + keywords: + - NOTE + - OPTIMIZE + - HACK + - TODO + - FIXME + +issues: + exclude-rules: + - path: cmd/metricsExample_test/main\.go + linters: + - gosec + text: "G404" + - path: internal/serviceconfig/observability/prometheus/prometheus_test.go + linters: + - gosec + text: "G107" + max-issues-per-linter: 0 + max-same-issues: 0 diff --git a/api/docCleanRunner/runner.go b/api/docCleanRunner/runner.go index 2c81292f..9a66a8eb 100644 --- a/api/docCleanRunner/runner.go +++ b/api/docCleanRunner/runner.go @@ -3,6 +3,7 @@ package doccleanrunner import ( "context" "encoding/json" + documentclean "queryorchestration/internal/document/clean" "github.com/go-playground/validator/v10" diff --git a/api/docCleanRunner/runner_test.go b/api/docCleanRunner/runner_test.go index 5f9f63c7..a6c516ee 100644 --- a/api/docCleanRunner/runner_test.go +++ b/api/docCleanRunner/runner_test.go @@ -5,6 +5,9 @@ import ( "encoding/json" "fmt" "io" + "strings" + "testing" + doccleanrunner "queryorchestration/api/docCleanRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -16,8 +19,6 @@ import ( "queryorchestration/internal/serviceconfig/queue/documenttext" objectstoremock "queryorchestration/mocks/objectstore" queuemock "queryorchestration/mocks/queue" - "strings" - "testing" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/sqs" diff --git a/api/docInitRunner/runner.go b/api/docInitRunner/runner.go index 7bad2eca..988bc874 100644 --- a/api/docInitRunner/runner.go +++ b/api/docInitRunner/runner.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "log/slog" + "queryorchestration/internal/document" documentinit "queryorchestration/internal/document/init" diff --git a/api/docInitRunner/runner_test.go b/api/docInitRunner/runner_test.go index be4994ec..6961163d 100644 --- a/api/docInitRunner/runner_test.go +++ b/api/docInitRunner/runner_test.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "testing" + docinitrunner "queryorchestration/api/docInitRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -13,7 +15,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/documentsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/api/docSyncRunner/runner.go b/api/docSyncRunner/runner.go index 0c3da893..d5e20266 100644 --- a/api/docSyncRunner/runner.go +++ b/api/docSyncRunner/runner.go @@ -3,6 +3,7 @@ package docsyncrunner import ( "context" "encoding/json" + documentsync "queryorchestration/internal/document/sync" "github.com/go-playground/validator/v10" diff --git a/api/docSyncRunner/runner_test.go b/api/docSyncRunner/runner_test.go index c83d37a2..7bc29818 100644 --- a/api/docSyncRunner/runner_test.go +++ b/api/docSyncRunner/runner_test.go @@ -3,6 +3,8 @@ package docsyncrunner_test import ( "context" "encoding/json" + "testing" + docsyncrunner "queryorchestration/api/docSyncRunner" "queryorchestration/internal/client" "queryorchestration/internal/database" @@ -12,7 +14,6 @@ import ( "queryorchestration/internal/job" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/documentclean" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs/types" "github.com/go-playground/validator/v10" diff --git a/api/docTextRunner/runner.go b/api/docTextRunner/runner.go index 93b92656..e0dcb500 100644 --- a/api/docTextRunner/runner.go +++ b/api/docTextRunner/runner.go @@ -3,6 +3,7 @@ package doctextrunner import ( "context" "encoding/json" + documenttext "queryorchestration/internal/document/text" "github.com/go-playground/validator/v10" diff --git a/api/docTextRunner/runner_test.go b/api/docTextRunner/runner_test.go index cd81313e..9c35897a 100644 --- a/api/docTextRunner/runner_test.go +++ b/api/docTextRunner/runner_test.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "testing" + doctextrunner "queryorchestration/api/docTextRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -13,7 +15,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/querysync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/api/jobSyncRunner/runner.go b/api/jobSyncRunner/runner.go index 7bd69872..bd92cc50 100644 --- a/api/jobSyncRunner/runner.go +++ b/api/jobSyncRunner/runner.go @@ -3,6 +3,7 @@ package jobsyncrunner import ( "context" "encoding/json" + jobsync "queryorchestration/internal/job/sync" "github.com/go-playground/validator/v10" diff --git a/api/jobSyncRunner/runner_test.go b/api/jobSyncRunner/runner_test.go index bb9eea04..9e2bf294 100644 --- a/api/jobSyncRunner/runner_test.go +++ b/api/jobSyncRunner/runner_test.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "testing" + jobsyncrunner "queryorchestration/api/jobSyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -11,7 +13,6 @@ import ( "queryorchestration/internal/server/runner" "queryorchestration/internal/serviceconfig/queue/documentsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/api/queryRunner/runner.go b/api/queryRunner/runner.go index 356d6d93..973599b1 100644 --- a/api/queryRunner/runner.go +++ b/api/queryRunner/runner.go @@ -3,6 +3,7 @@ package queryrunner import ( "context" "encoding/json" + resultset "queryorchestration/internal/query/result/set" "github.com/go-playground/validator/v10" diff --git a/api/queryRunner/runner_test.go b/api/queryRunner/runner_test.go index 7840d659..0c6a525b 100644 --- a/api/queryRunner/runner_test.go +++ b/api/queryRunner/runner_test.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "testing" + queryrunner "queryorchestration/api/queryRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -15,7 +17,6 @@ import ( "queryorchestration/internal/server/runner" queryc "queryorchestration/internal/serviceconfig/queue/query" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/api/queryService/client.go b/api/queryService/client.go index dea05d49..e7bd1357 100644 --- a/api/queryService/client.go +++ b/api/queryService/client.go @@ -3,6 +3,7 @@ package queryservice import ( "fmt" "net/http" + "queryorchestration/internal/client" "github.com/labstack/echo/v4" diff --git a/api/queryService/client_test.go b/api/queryService/client_test.go index 68fa741e..ff9b222b 100644 --- a/api/queryService/client_test.go +++ b/api/queryService/client_test.go @@ -5,13 +5,14 @@ import ( "fmt" "net/http" "net/http/httptest" + "strings" + "testing" + queryservice "queryorchestration/api/queryService" "queryorchestration/internal/client" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "strings" - "testing" "github.com/go-playground/validator/v10" "github.com/google/uuid" diff --git a/api/queryService/controllers_test.go b/api/queryService/controllers_test.go index 3e4be39b..57dd25bb 100644 --- a/api/queryService/controllers_test.go +++ b/api/queryService/controllers_test.go @@ -1,9 +1,10 @@ package queryservice_test import ( - queryservice "queryorchestration/api/queryService" "testing" + queryservice "queryorchestration/api/queryService" + "github.com/go-playground/validator/v10" "github.com/stretchr/testify/assert" ) diff --git a/api/queryService/documents_test.go b/api/queryService/documents_test.go index ff1f8d37..965798c3 100644 --- a/api/queryService/documents_test.go +++ b/api/queryService/documents_test.go @@ -4,6 +4,9 @@ import ( "encoding/json" "net/http" "net/http/httptest" + "strings" + "testing" + queryservice "queryorchestration/api/queryService" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -11,8 +14,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/jobsync" queuemock "queryorchestration/mocks/queue" - "strings" - "testing" "github.com/go-playground/validator/v10" "github.com/google/uuid" diff --git a/api/queryService/export_test.go b/api/queryService/export_test.go index 2f1d983d..dedf3400 100644 --- a/api/queryService/export_test.go +++ b/api/queryService/export_test.go @@ -3,10 +3,11 @@ package queryservice_test import ( "net/http" "net/http/httptest" - queryservice "queryorchestration/api/queryService" "strings" "testing" + queryservice "queryorchestration/api/queryService" + "github.com/go-playground/validator/v10" "github.com/google/uuid" "github.com/labstack/echo/v4" diff --git a/api/queryService/job.go b/api/queryService/job.go index dd28db7b..8af9f73c 100644 --- a/api/queryService/job.go +++ b/api/queryService/job.go @@ -3,6 +3,7 @@ package queryservice import ( "fmt" "net/http" + "queryorchestration/internal/job" "github.com/labstack/echo/v4" diff --git a/api/queryService/job_test.go b/api/queryService/job_test.go index f2aaec9f..2ac294b7 100644 --- a/api/queryService/job_test.go +++ b/api/queryService/job_test.go @@ -5,6 +5,9 @@ import ( "fmt" "net/http" "net/http/httptest" + "strings" + "testing" + queryservice "queryorchestration/api/queryService" "queryorchestration/internal/client" "queryorchestration/internal/database" @@ -14,8 +17,6 @@ import ( "queryorchestration/internal/job" "queryorchestration/internal/job/collector" "queryorchestration/internal/serviceconfig" - "strings" - "testing" "github.com/go-playground/validator/v10" "github.com/google/uuid" diff --git a/api/queryService/jobcollector.go b/api/queryService/jobcollector.go index 96311753..7201e3e9 100644 --- a/api/queryService/jobcollector.go +++ b/api/queryService/jobcollector.go @@ -3,6 +3,7 @@ package queryservice import ( "fmt" "net/http" + collectorupdate "queryorchestration/internal/job/collector/update" "github.com/google/uuid" diff --git a/api/queryService/jobcollector_test.go b/api/queryService/jobcollector_test.go index 317e79db..3d0bcdd5 100644 --- a/api/queryService/jobcollector_test.go +++ b/api/queryService/jobcollector_test.go @@ -5,6 +5,9 @@ import ( "fmt" "net/http" "net/http/httptest" + "strings" + "testing" + queryservice "queryorchestration/api/queryService" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -15,8 +18,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/jobsync" queuemock "queryorchestration/mocks/queue" - "strings" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/go-playground/validator/v10" diff --git a/api/queryService/parse.go b/api/queryService/parse.go index d65f3255..2b7a9685 100644 --- a/api/queryService/parse.go +++ b/api/queryService/parse.go @@ -2,6 +2,7 @@ package queryservice import ( "errors" + "queryorchestration/internal/job" "queryorchestration/internal/query" resultprocessor "queryorchestration/internal/query/result/processor" diff --git a/api/queryService/parse_test.go b/api/queryService/parse_test.go index fbd36497..83fefc32 100644 --- a/api/queryService/parse_test.go +++ b/api/queryService/parse_test.go @@ -1,10 +1,11 @@ package queryservice import ( + "testing" + "queryorchestration/internal/job" "queryorchestration/internal/query" resultprocessor "queryorchestration/internal/query/result/processor" - "testing" "github.com/google/uuid" "github.com/oapi-codegen/runtime/types" diff --git a/api/queryService/query.go b/api/queryService/query.go index 1e7778bd..e1f65f6c 100644 --- a/api/queryService/query.go +++ b/api/queryService/query.go @@ -3,6 +3,7 @@ package queryservice import ( "fmt" "net/http" + "queryorchestration/internal/query/result" resultprocessor "queryorchestration/internal/query/result/processor" diff --git a/api/queryService/query_test.go b/api/queryService/query_test.go index c78cba96..bca6e5a0 100644 --- a/api/queryService/query_test.go +++ b/api/queryService/query_test.go @@ -5,6 +5,9 @@ import ( "fmt" "net/http" "net/http/httptest" + "strings" + "testing" + queryservice "queryorchestration/api/queryService" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -19,8 +22,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/queryversionsync" queuemock "queryorchestration/mocks/queue" - "strings" - "testing" "github.com/stretchr/testify/require" diff --git a/api/querySyncRunner/runner.go b/api/querySyncRunner/runner.go index ac7f7c7b..d524937a 100644 --- a/api/querySyncRunner/runner.go +++ b/api/querySyncRunner/runner.go @@ -3,6 +3,7 @@ package querysyncrunner import ( "context" "encoding/json" + querysync "queryorchestration/internal/query/sync" "github.com/go-playground/validator/v10" diff --git a/api/querySyncRunner/runner_test.go b/api/querySyncRunner/runner_test.go index f9363576..ecb9cf3a 100644 --- a/api/querySyncRunner/runner_test.go +++ b/api/querySyncRunner/runner_test.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "testing" + querysyncrunner "queryorchestration/api/querySyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -12,7 +14,6 @@ import ( "queryorchestration/internal/server/runner" queryc "queryorchestration/internal/serviceconfig/queue/query" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/api/queryVersionSyncRunner/runner.go b/api/queryVersionSyncRunner/runner.go index 123f8d5d..5b4c6208 100644 --- a/api/queryVersionSyncRunner/runner.go +++ b/api/queryVersionSyncRunner/runner.go @@ -3,6 +3,7 @@ package queryversionsyncrunner import ( "context" "encoding/json" + queryversionsync "queryorchestration/internal/query/versionsync" "github.com/go-playground/validator/v10" diff --git a/api/queryVersionSyncRunner/runner_test.go b/api/queryVersionSyncRunner/runner_test.go index 189430e4..1472654d 100644 --- a/api/queryVersionSyncRunner/runner_test.go +++ b/api/queryVersionSyncRunner/runner_test.go @@ -4,6 +4,8 @@ import ( "context" "encoding/json" "fmt" + "testing" + queryversionsyncrunner "queryorchestration/api/queryVersionSyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -11,7 +13,6 @@ import ( "queryorchestration/internal/server/runner" "queryorchestration/internal/serviceconfig/queue/jobsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/cmd/docCleanRunner/main.go b/cmd/docCleanRunner/main.go index a836bbdd..f64cab34 100644 --- a/cmd/docCleanRunner/main.go +++ b/cmd/docCleanRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + doccleanrunner "queryorchestration/api/docCleanRunner" documentclean "queryorchestration/internal/document/clean" cleanversion "queryorchestration/internal/document/clean/version" diff --git a/cmd/docInitRunner/main.go b/cmd/docInitRunner/main.go index 5d501d1c..633e4bf2 100644 --- a/cmd/docInitRunner/main.go +++ b/cmd/docInitRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + docinitrunner "queryorchestration/api/docInitRunner" documentinit "queryorchestration/internal/document/init" "queryorchestration/internal/server/runner" diff --git a/cmd/docSyncRunner/main.go b/cmd/docSyncRunner/main.go index 63043836..305f1cad 100644 --- a/cmd/docSyncRunner/main.go +++ b/cmd/docSyncRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + docsyncrunner "queryorchestration/api/docSyncRunner" "queryorchestration/internal/client" "queryorchestration/internal/document" diff --git a/cmd/docTextRunner/main.go b/cmd/docTextRunner/main.go index 693f57d3..6ad17191 100644 --- a/cmd/docTextRunner/main.go +++ b/cmd/docTextRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + doctextrunner "queryorchestration/api/docTextRunner" documenttext "queryorchestration/internal/document/text" textversion "queryorchestration/internal/document/text/version" diff --git a/cmd/jobSyncRunner/main.go b/cmd/jobSyncRunner/main.go index a3a1a8fb..3e26e152 100644 --- a/cmd/jobSyncRunner/main.go +++ b/cmd/jobSyncRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + jobsyncrunner "queryorchestration/api/jobSyncRunner" jobsync "queryorchestration/internal/job/sync" "queryorchestration/internal/server/runner" diff --git a/cmd/metricsExample_test/main.go b/cmd/metricsExample_test/main.go index 68e60741..74a31141 100644 --- a/cmd/metricsExample_test/main.go +++ b/cmd/metricsExample_test/main.go @@ -14,9 +14,10 @@ import ( "math/rand" "os" "os/signal" - "queryorchestration/internal/serviceconfig/observability/prometheus" "syscall" "time" + + "queryorchestration/internal/serviceconfig/observability/prometheus" ) func main() { diff --git a/cmd/queryRunner/main.go b/cmd/queryRunner/main.go index 3877d9f7..d0672cd0 100644 --- a/cmd/queryRunner/main.go +++ b/cmd/queryRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + queryrunner "queryorchestration/api/queryRunner" "queryorchestration/internal/query" "queryorchestration/internal/query/result" diff --git a/cmd/queryService/main.go b/cmd/queryService/main.go index d707e715..422ad23b 100644 --- a/cmd/queryService/main.go +++ b/cmd/queryService/main.go @@ -5,6 +5,7 @@ import ( "fmt" "log/slog" "os" + queryservice "queryorchestration/api/queryService" "queryorchestration/internal/client" "queryorchestration/internal/document" diff --git a/cmd/querySyncRunner/main.go b/cmd/querySyncRunner/main.go index 10e60c56..90569629 100644 --- a/cmd/querySyncRunner/main.go +++ b/cmd/querySyncRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + querysyncrunner "queryorchestration/api/querySyncRunner" resultsync "queryorchestration/internal/query/result/sync" querysync "queryorchestration/internal/query/sync" diff --git a/cmd/queryVersionSyncRunner/main.go b/cmd/queryVersionSyncRunner/main.go index a822b967..0f07bb90 100644 --- a/cmd/queryVersionSyncRunner/main.go +++ b/cmd/queryVersionSyncRunner/main.go @@ -4,6 +4,7 @@ import ( "context" "log/slog" "os" + queryversionsyncrunner "queryorchestration/api/queryVersionSyncRunner" queryversionsync "queryorchestration/internal/query/versionsync" "queryorchestration/internal/server/runner" diff --git a/internal/client/create.go b/internal/client/create.go index e8e500cc..172210e6 100644 --- a/internal/client/create.go +++ b/internal/client/create.go @@ -2,6 +2,7 @@ package client import ( "context" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/client/create_test.go b/internal/client/create_test.go index 38ed75d8..5bd0f4d9 100644 --- a/internal/client/create_test.go +++ b/internal/client/create_test.go @@ -2,11 +2,12 @@ package client_test import ( "context" + "testing" + "queryorchestration/internal/client" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/client/get.go b/internal/client/get.go index a2ff900f..e1b06705 100644 --- a/internal/client/get.go +++ b/internal/client/get.go @@ -2,6 +2,7 @@ package client import ( "context" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/client/get_test.go b/internal/client/get_test.go index f9e7380f..bc95c8b5 100644 --- a/internal/client/get_test.go +++ b/internal/client/get_test.go @@ -3,11 +3,12 @@ package client_test import ( "context" "errors" + "testing" + "queryorchestration/internal/client" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/client/service.go b/internal/client/service.go index 87cbd58f..d80e4f46 100644 --- a/internal/client/service.go +++ b/internal/client/service.go @@ -3,10 +3,11 @@ package client import ( "errors" "fmt" - "queryorchestration/internal/serviceconfig" "regexp" "strings" + "queryorchestration/internal/serviceconfig" + "github.com/google/uuid" ) diff --git a/internal/client/service_test.go b/internal/client/service_test.go index 4633a01f..b5d049f2 100644 --- a/internal/client/service_test.go +++ b/internal/client/service_test.go @@ -1,10 +1,11 @@ package client_test import ( + "testing" + "queryorchestration/internal/client" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/client/update.go b/internal/client/update.go index 0c1006c9..873064fa 100644 --- a/internal/client/update.go +++ b/internal/client/update.go @@ -4,6 +4,7 @@ import ( "context" "errors" "log/slog" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/validation" diff --git a/internal/client/update_test.go b/internal/client/update_test.go index d530cdcd..cbe89163 100644 --- a/internal/client/update_test.go +++ b/internal/client/update_test.go @@ -2,10 +2,11 @@ package client import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/database/migrations/migrations.go b/internal/database/migrations/migrations.go index bbdf170f..65049021 100644 --- a/internal/database/migrations/migrations.go +++ b/internal/database/migrations/migrations.go @@ -6,6 +6,7 @@ import ( "fmt" "log/slog" "path" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/database" diff --git a/internal/database/migrations/migrations_test.go b/internal/database/migrations/migrations_test.go index d042ba1c..3eb400b2 100644 --- a/internal/database/migrations/migrations_test.go +++ b/internal/database/migrations/migrations_test.go @@ -4,11 +4,12 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/migrations" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/database" "queryorchestration/internal/test" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/migrations/migrationsprivate_test.go b/internal/database/migrations/migrationsprivate_test.go index 6a77d14c..4ce00140 100644 --- a/internal/database/migrations/migrationsprivate_test.go +++ b/internal/database/migrations/migrationsprivate_test.go @@ -1,9 +1,10 @@ package migrations import ( - "queryorchestration/internal/serviceconfig/database" "testing" + "queryorchestration/internal/serviceconfig/database" + "github.com/stretchr/testify/assert" ) diff --git a/internal/database/parseuuid_test.go b/internal/database/parseuuid_test.go index e4092ede..29cad124 100644 --- a/internal/database/parseuuid_test.go +++ b/internal/database/parseuuid_test.go @@ -1,9 +1,10 @@ package database_test import ( - "queryorchestration/internal/database" "testing" + "queryorchestration/internal/database" + "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" "github.com/stretchr/testify/assert" diff --git a/internal/database/repository/clean_test.go b/internal/database/repository/clean_test.go index bf009602..dc677ec7 100644 --- a/internal/database/repository/clean_test.go +++ b/internal/database/repository/clean_test.go @@ -4,10 +4,11 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/repository/client_test.go b/internal/database/repository/client_test.go index 1fd25fac..772f9139 100644 --- a/internal/database/repository/client_test.go +++ b/internal/database/repository/client_test.go @@ -4,10 +4,11 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/repository/collector_test.go b/internal/database/repository/collector_test.go index be2a0a14..b1ed9f74 100644 --- a/internal/database/repository/collector_test.go +++ b/internal/database/repository/collector_test.go @@ -5,11 +5,12 @@ import ( "fmt" "os" "path" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/jackc/pgx/v5/pgtype" "github.com/stretchr/testify/assert" diff --git a/internal/database/repository/db_test.go b/internal/database/repository/db_test.go index 6c445054..cb4ab603 100644 --- a/internal/database/repository/db_test.go +++ b/internal/database/repository/db_test.go @@ -2,9 +2,10 @@ package repository_test import ( "context" - "queryorchestration/internal/database/repository" "testing" + "queryorchestration/internal/database/repository" + "github.com/jackc/pgx/v5" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/database/repository/document_test.go b/internal/database/repository/document_test.go index 4d168fac..e4f92e2e 100644 --- a/internal/database/repository/document_test.go +++ b/internal/database/repository/document_test.go @@ -4,10 +4,11 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/repository/failtype_test.go b/internal/database/repository/failtype_test.go index b42fca58..890b35dc 100644 --- a/internal/database/repository/failtype_test.go +++ b/internal/database/repository/failtype_test.go @@ -2,9 +2,10 @@ package repository_test import ( "fmt" - "queryorchestration/internal/database/repository" "testing" + "queryorchestration/internal/database/repository" + "github.com/stretchr/testify/assert" ) diff --git a/internal/database/repository/job_test.go b/internal/database/repository/job_test.go index 26456a04..e110a93d 100644 --- a/internal/database/repository/job_test.go +++ b/internal/database/repository/job_test.go @@ -4,10 +4,11 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/database/repository/mimetype_test.go b/internal/database/repository/mimetype_test.go index 3a7bf0f0..fae57fd0 100644 --- a/internal/database/repository/mimetype_test.go +++ b/internal/database/repository/mimetype_test.go @@ -2,9 +2,10 @@ package repository_test import ( "fmt" - "queryorchestration/internal/database/repository" "testing" + "queryorchestration/internal/database/repository" + "github.com/stretchr/testify/assert" ) diff --git a/internal/database/repository/query_test.go b/internal/database/repository/query_test.go index b02e7288..217d5618 100644 --- a/internal/database/repository/query_test.go +++ b/internal/database/repository/query_test.go @@ -4,11 +4,12 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" diff --git a/internal/database/repository/querytype_test.go b/internal/database/repository/querytype_test.go index 2cd29c3d..ad74d4d9 100644 --- a/internal/database/repository/querytype_test.go +++ b/internal/database/repository/querytype_test.go @@ -2,9 +2,10 @@ package repository_test import ( "fmt" - "queryorchestration/internal/database/repository" "testing" + "queryorchestration/internal/database/repository" + "github.com/stretchr/testify/assert" ) diff --git a/internal/database/repository/result_test.go b/internal/database/repository/result_test.go index a072571f..4b22a782 100644 --- a/internal/database/repository/result_test.go +++ b/internal/database/repository/result_test.go @@ -4,10 +4,11 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/jackc/pgx/v5/pgtype" "github.com/stretchr/testify/assert" diff --git a/internal/database/repository/text_test.go b/internal/database/repository/text_test.go index 08b623a0..3bd48965 100644 --- a/internal/database/repository/text_test.go +++ b/internal/database/repository/text_test.go @@ -4,10 +4,11 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/jackc/pgx/v5/pgtype" "github.com/stretchr/testify/assert" diff --git a/internal/document/clean/clean.go b/internal/document/clean/clean.go index 17af9289..e2e0fdba 100644 --- a/internal/document/clean/clean.go +++ b/internal/document/clean/clean.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "log/slog" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" diff --git a/internal/document/clean/clean_test.go b/internal/document/clean/clean_test.go index da5b199b..e7ce19ea 100644 --- a/internal/document/clean/clean_test.go +++ b/internal/document/clean/clean_test.go @@ -3,13 +3,14 @@ package documentclean import ( "context" "io" + "strings" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" cleanversion "queryorchestration/internal/document/clean/version" objectstoremock "queryorchestration/mocks/objectstore" - "strings" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/document/clean/contentType_test.go b/internal/document/clean/contentType_test.go index d9d90d32..06642235 100644 --- a/internal/document/clean/contentType_test.go +++ b/internal/document/clean/contentType_test.go @@ -4,11 +4,12 @@ import ( "context" "fmt" "io" - "queryorchestration/internal/document" - objectstoremock "queryorchestration/mocks/objectstore" "strings" "testing" + "queryorchestration/internal/document" + objectstoremock "queryorchestration/mocks/objectstore" + "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/document/clean/content_test.go b/internal/document/clean/content_test.go index dcb573a4..0d3e3059 100644 --- a/internal/document/clean/content_test.go +++ b/internal/document/clean/content_test.go @@ -3,11 +3,12 @@ package documentclean import ( "context" "io" + "strings" + "testing" + "queryorchestration/internal/document" cleanversion "queryorchestration/internal/document/clean/version" objectstoremock "queryorchestration/mocks/objectstore" - "strings" - "testing" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/stretchr/testify/assert" diff --git a/internal/document/clean/create.go b/internal/document/clean/create.go index c97ba3a4..69b9aba3 100644 --- a/internal/document/clean/create.go +++ b/internal/document/clean/create.go @@ -2,6 +2,7 @@ package documentclean import ( "context" + doctextrunner "queryorchestration/api/docTextRunner" "queryorchestration/internal/database" "queryorchestration/internal/serviceconfig/queue" diff --git a/internal/document/clean/create_test.go b/internal/document/clean/create_test.go index 9edead26..3430b9f7 100644 --- a/internal/document/clean/create_test.go +++ b/internal/document/clean/create_test.go @@ -4,6 +4,9 @@ import ( "context" "fmt" "io" + "strings" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" @@ -13,8 +16,6 @@ import ( "queryorchestration/internal/serviceconfig/queue/documenttext" objectstoremock "queryorchestration/mocks/objectstore" queuemock "queryorchestration/mocks/queue" - "strings" - "testing" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/sqs" diff --git a/internal/document/clean/parsetypes_test.go b/internal/document/clean/parsetypes_test.go index 2b388bdb..12715fd1 100644 --- a/internal/document/clean/parsetypes_test.go +++ b/internal/document/clean/parsetypes_test.go @@ -1,9 +1,10 @@ package documentclean_test import ( + "testing" + "queryorchestration/internal/database/repository" documentclean "queryorchestration/internal/document/clean" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/document/clean/service_test.go b/internal/document/clean/service_test.go index d931cf56..a10a7e55 100644 --- a/internal/document/clean/service_test.go +++ b/internal/document/clean/service_test.go @@ -1,11 +1,12 @@ package documentclean_test import ( + "testing" + documentclean "queryorchestration/internal/document/clean" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/objectstore" "queryorchestration/internal/serviceconfig/queue/documenttext" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/document/clean/version/service_test.go b/internal/document/clean/version/service_test.go index 2894665c..6677c8a1 100644 --- a/internal/document/clean/version/service_test.go +++ b/internal/document/clean/version/service_test.go @@ -1,9 +1,10 @@ package cleanversion_test import ( - cleanversion "queryorchestration/internal/document/clean/version" "testing" + cleanversion "queryorchestration/internal/document/clean/version" + "github.com/stretchr/testify/assert" ) diff --git a/internal/document/clean/version/version_test.go b/internal/document/clean/version/version_test.go index e29a1545..df3d1a06 100644 --- a/internal/document/clean/version/version_test.go +++ b/internal/document/clean/version/version_test.go @@ -1,9 +1,10 @@ package cleanversion_test import ( + "testing" + cleanversion "queryorchestration/internal/document/clean/version" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/document/get.go b/internal/document/get.go index ca1141ce..42871ca3 100644 --- a/internal/document/get.go +++ b/internal/document/get.go @@ -2,6 +2,7 @@ package document import ( "context" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/document/get_test.go b/internal/document/get_test.go index 3cabcd8c..4c3b246f 100644 --- a/internal/document/get_test.go +++ b/internal/document/get_test.go @@ -2,11 +2,12 @@ package document_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/document/init/create.go b/internal/document/init/create.go index 3396efb5..12b2f7f6 100644 --- a/internal/document/init/create.go +++ b/internal/document/init/create.go @@ -6,12 +6,13 @@ import ( "errors" "fmt" "log/slog" + "regexp" + docsyncrunner "queryorchestration/api/docSyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" "queryorchestration/internal/serviceconfig/queue" - "regexp" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" diff --git a/internal/document/init/create_test.go b/internal/document/init/create_test.go index 14fdc856..c619e2df 100644 --- a/internal/document/init/create_test.go +++ b/internal/document/init/create_test.go @@ -4,12 +4,13 @@ import ( "context" "errors" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" "queryorchestration/internal/job" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/document/init/service_test.go b/internal/document/init/service_test.go index b31d67f2..ac6905b6 100644 --- a/internal/document/init/service_test.go +++ b/internal/document/init/service_test.go @@ -1,9 +1,10 @@ package documentinit import ( + "testing" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/documentsync" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/document/list.go b/internal/document/list.go index 02fd9eff..a777eb46 100644 --- a/internal/document/list.go +++ b/internal/document/list.go @@ -2,6 +2,7 @@ package document import ( "context" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/document/list_test.go b/internal/document/list_test.go index 3d5a448f..49d33c40 100644 --- a/internal/document/list_test.go +++ b/internal/document/list_test.go @@ -2,11 +2,12 @@ package document_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/document/service_test.go b/internal/document/service_test.go index b60cfac2..f0318654 100644 --- a/internal/document/service_test.go +++ b/internal/document/service_test.go @@ -1,9 +1,10 @@ package document_test import ( - "queryorchestration/internal/document" "testing" + "queryorchestration/internal/document" + "github.com/stretchr/testify/assert" ) diff --git a/internal/document/sync/service_test.go b/internal/document/sync/service_test.go index 9b8115ad..963706ea 100644 --- a/internal/document/sync/service_test.go +++ b/internal/document/sync/service_test.go @@ -1,10 +1,11 @@ package documentsync_test import ( + "testing" + documentsync "queryorchestration/internal/document/sync" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/documentclean" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/document/sync/sync.go b/internal/document/sync/sync.go index 96aaa572..935f24b5 100644 --- a/internal/document/sync/sync.go +++ b/internal/document/sync/sync.go @@ -3,6 +3,7 @@ package documentsync import ( "context" "log/slog" + doccleanrunner "queryorchestration/api/docCleanRunner" "queryorchestration/internal/serviceconfig/queue" diff --git a/internal/document/sync/sync_test.go b/internal/document/sync/sync_test.go index 420a117f..10f9a66f 100644 --- a/internal/document/sync/sync_test.go +++ b/internal/document/sync/sync_test.go @@ -3,6 +3,8 @@ package documentsync_test import ( "context" "fmt" + "testing" + "queryorchestration/internal/client" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" @@ -10,7 +12,6 @@ import ( documentsync "queryorchestration/internal/document/sync" "queryorchestration/internal/job" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/document/text/create.go b/internal/document/text/create.go index 61ad0fb4..c6ef37d0 100644 --- a/internal/document/text/create.go +++ b/internal/document/text/create.go @@ -3,6 +3,7 @@ package documenttext import ( "context" "log/slog" + querysyncrunner "queryorchestration/api/querySyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/serviceconfig/queue" diff --git a/internal/document/text/create_test.go b/internal/document/text/create_test.go index b7ac4057..c6434e4e 100644 --- a/internal/document/text/create_test.go +++ b/internal/document/text/create_test.go @@ -3,6 +3,8 @@ package documenttext import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" @@ -10,7 +12,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/querysync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/document/text/extract.go b/internal/document/text/extract.go index 46471cce..353e653c 100644 --- a/internal/document/text/extract.go +++ b/internal/document/text/extract.go @@ -3,6 +3,7 @@ package documenttext import ( "context" "fmt" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" diff --git a/internal/document/text/extract_test.go b/internal/document/text/extract_test.go index 955b0b22..accbc413 100644 --- a/internal/document/text/extract_test.go +++ b/internal/document/text/extract_test.go @@ -2,11 +2,12 @@ package documenttext import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" textversion "queryorchestration/internal/document/text/version" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/document/text/service_test.go b/internal/document/text/service_test.go index ccdd44a1..2646165b 100644 --- a/internal/document/text/service_test.go +++ b/internal/document/text/service_test.go @@ -1,11 +1,12 @@ package documenttext_test import ( + "testing" + documenttext "queryorchestration/internal/document/text" textversion "queryorchestration/internal/document/text/version" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/querysync" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/document/text/version/service_test.go b/internal/document/text/version/service_test.go index 5f94579b..de4b7042 100644 --- a/internal/document/text/version/service_test.go +++ b/internal/document/text/version/service_test.go @@ -1,9 +1,10 @@ package textversion_test import ( - textversion "queryorchestration/internal/document/clean/version" "testing" + textversion "queryorchestration/internal/document/clean/version" + "github.com/stretchr/testify/assert" ) diff --git a/internal/document/text/version/version_test.go b/internal/document/text/version/version_test.go index f8068b21..3efbb60f 100644 --- a/internal/document/text/version/version_test.go +++ b/internal/document/text/version/version_test.go @@ -1,9 +1,10 @@ package textversion_test import ( + "testing" + textversion "queryorchestration/internal/document/clean/version" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/export/service_test.go b/internal/export/service_test.go index 7eef27d0..9e05f4d9 100644 --- a/internal/export/service_test.go +++ b/internal/export/service_test.go @@ -1,9 +1,10 @@ package export_test import ( - "queryorchestration/internal/export" "testing" + "queryorchestration/internal/export" + "github.com/stretchr/testify/assert" ) diff --git a/internal/job/collector/create.go b/internal/job/collector/create.go index ea8f526c..dc6b0ba6 100644 --- a/internal/job/collector/create.go +++ b/internal/job/collector/create.go @@ -3,6 +3,7 @@ package collector import ( "context" "errors" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/validation" diff --git a/internal/job/collector/create_test.go b/internal/job/collector/create_test.go index 0af531af..4de9aee3 100644 --- a/internal/job/collector/create_test.go +++ b/internal/job/collector/create_test.go @@ -2,11 +2,12 @@ package collector_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/job/collector" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/job/collector/createprivate_test.go b/internal/job/collector/createprivate_test.go index 7d6d1655..852a0678 100644 --- a/internal/job/collector/createprivate_test.go +++ b/internal/job/collector/createprivate_test.go @@ -2,10 +2,11 @@ package collector import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5" diff --git a/internal/job/collector/get.go b/internal/job/collector/get.go index 23424ee5..0cc72768 100644 --- a/internal/job/collector/get.go +++ b/internal/job/collector/get.go @@ -2,6 +2,7 @@ package collector import ( "context" + "queryorchestration/internal/database" resultprocessor "queryorchestration/internal/query/result/processor" diff --git a/internal/job/collector/get_test.go b/internal/job/collector/get_test.go index a25a9c1b..32e286e4 100644 --- a/internal/job/collector/get_test.go +++ b/internal/job/collector/get_test.go @@ -3,12 +3,13 @@ package collector_test import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/job/collector" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/job/collector/parse.go b/internal/job/collector/parse.go index 3e2a00ac..b01fe2c7 100644 --- a/internal/job/collector/parse.go +++ b/internal/job/collector/parse.go @@ -3,6 +3,7 @@ package collector import ( "encoding/json" "fmt" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" diff --git a/internal/job/collector/parse_test.go b/internal/job/collector/parse_test.go index 919a3520..066f65b5 100644 --- a/internal/job/collector/parse_test.go +++ b/internal/job/collector/parse_test.go @@ -2,9 +2,10 @@ package collector import ( "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" - "testing" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/job/collector/service_test.go b/internal/job/collector/service_test.go index 799d530e..5072e7af 100644 --- a/internal/job/collector/service_test.go +++ b/internal/job/collector/service_test.go @@ -1,10 +1,11 @@ package collector_test import ( + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/job/collector" "queryorchestration/internal/serviceconfig" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/job/collector/update/service_test.go b/internal/job/collector/update/service_test.go index 40454656..b9e1047b 100644 --- a/internal/job/collector/update/service_test.go +++ b/internal/job/collector/update/service_test.go @@ -1,10 +1,11 @@ package collectorupdate_test import ( + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/job/collector" "queryorchestration/internal/serviceconfig" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/job/collector/update/update.go b/internal/job/collector/update/update.go index 8064bd4d..4ede8c85 100644 --- a/internal/job/collector/update/update.go +++ b/internal/job/collector/update/update.go @@ -4,6 +4,7 @@ import ( "context" "errors" "log/slog" + jobsyncrunner "queryorchestration/api/jobSyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" diff --git a/internal/job/collector/update/update_test.go b/internal/job/collector/update/update_test.go index ad7033ef..e8648796 100644 --- a/internal/job/collector/update/update_test.go +++ b/internal/job/collector/update/update_test.go @@ -3,6 +3,8 @@ package collectorupdate_test import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/job/collector" @@ -10,7 +12,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/jobsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/google/uuid" diff --git a/internal/job/collector/update/updateprivate_test.go b/internal/job/collector/update/updateprivate_test.go index c84aba03..b5955195 100644 --- a/internal/job/collector/update/updateprivate_test.go +++ b/internal/job/collector/update/updateprivate_test.go @@ -3,6 +3,8 @@ package collectorupdate import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" cleanversion "queryorchestration/internal/document/clean/version" @@ -11,7 +13,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/jobsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/google/uuid" diff --git a/internal/job/create.go b/internal/job/create.go index 88d0b7d8..924bdcde 100644 --- a/internal/job/create.go +++ b/internal/job/create.go @@ -2,6 +2,7 @@ package job import ( "context" + "queryorchestration/internal/database" "queryorchestration/internal/job/collector" diff --git a/internal/job/create_test.go b/internal/job/create_test.go index c9a2afc2..0835a2a8 100644 --- a/internal/job/create_test.go +++ b/internal/job/create_test.go @@ -2,12 +2,13 @@ package job_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/job" "queryorchestration/internal/job/collector" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5" diff --git a/internal/job/get.go b/internal/job/get.go index 51b28311..c7105a74 100644 --- a/internal/job/get.go +++ b/internal/job/get.go @@ -2,6 +2,7 @@ package job import ( "context" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/job/get_test.go b/internal/job/get_test.go index db86c850..48113835 100644 --- a/internal/job/get_test.go +++ b/internal/job/get_test.go @@ -2,13 +2,14 @@ package job_test import ( "context" + "testing" + "queryorchestration/internal/client" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/job" "queryorchestration/internal/job/collector" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/job/service_test.go b/internal/job/service_test.go index 7c4c1d0e..1120f7e2 100644 --- a/internal/job/service_test.go +++ b/internal/job/service_test.go @@ -1,10 +1,11 @@ package job_test import ( + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/job" "queryorchestration/internal/serviceconfig" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/job/status.go b/internal/job/status.go index f815afa3..af5baca6 100644 --- a/internal/job/status.go +++ b/internal/job/status.go @@ -2,6 +2,7 @@ package job import ( "context" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/job/status_test.go b/internal/job/status_test.go index 194f647c..078bcf33 100644 --- a/internal/job/status_test.go +++ b/internal/job/status_test.go @@ -3,11 +3,12 @@ package job_test import ( "context" "errors" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/job" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/job/sync/sync.go b/internal/job/sync/sync.go index 9a512fc5..8f1dd63c 100644 --- a/internal/job/sync/sync.go +++ b/internal/job/sync/sync.go @@ -5,6 +5,7 @@ import ( "database/sql" "errors" "log/slog" + docsyncrunner "queryorchestration/api/docSyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" diff --git a/internal/job/sync/sync_test.go b/internal/job/sync/sync_test.go index 222d66c9..f324c437 100644 --- a/internal/job/sync/sync_test.go +++ b/internal/job/sync/sync_test.go @@ -3,13 +3,14 @@ package jobsync import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/documentsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/google/uuid" diff --git a/internal/job/update.go b/internal/job/update.go index 2192b514..8399d1dd 100644 --- a/internal/job/update.go +++ b/internal/job/update.go @@ -4,6 +4,7 @@ import ( "context" "errors" "log/slog" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/validation" diff --git a/internal/job/update_test.go b/internal/job/update_test.go index 23bf76dd..16237f07 100644 --- a/internal/job/update_test.go +++ b/internal/job/update_test.go @@ -2,12 +2,13 @@ package job_test import ( "context" + "testing" + "queryorchestration/internal/client" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/job" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/job/updateprivate_test.go b/internal/job/updateprivate_test.go index 33e83857..4e7c254b 100644 --- a/internal/job/updateprivate_test.go +++ b/internal/job/updateprivate_test.go @@ -2,11 +2,12 @@ package job import ( "context" + "testing" + "queryorchestration/internal/client" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/query/create.go b/internal/query/create.go index 6c91fa3e..a9f58346 100644 --- a/internal/query/create.go +++ b/internal/query/create.go @@ -3,6 +3,7 @@ package query import ( "context" "fmt" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" diff --git a/internal/query/create_test.go b/internal/query/create_test.go index cc369a7a..f8d7ce9a 100644 --- a/internal/query/create_test.go +++ b/internal/query/create_test.go @@ -3,12 +3,13 @@ package query_test import ( "context" "errors" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/createprivate_test.go b/internal/query/createprivate_test.go index 9b4f400c..b1b68bfa 100644 --- a/internal/query/createprivate_test.go +++ b/internal/query/createprivate_test.go @@ -2,11 +2,12 @@ package query import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5" diff --git a/internal/query/get.go b/internal/query/get.go index 7f21c543..a1ed0fc3 100644 --- a/internal/query/get.go +++ b/internal/query/get.go @@ -2,6 +2,7 @@ package query import ( "context" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" diff --git a/internal/query/get_test.go b/internal/query/get_test.go index 28739390..3d6bcfed 100644 --- a/internal/query/get_test.go +++ b/internal/query/get_test.go @@ -2,12 +2,13 @@ package query_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/query/list.go b/internal/query/list.go index ddfb9f5e..6da607b8 100644 --- a/internal/query/list.go +++ b/internal/query/list.go @@ -2,6 +2,7 @@ package query import ( "context" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/query/list_test.go b/internal/query/list_test.go index 46e774af..dca8880f 100644 --- a/internal/query/list_test.go +++ b/internal/query/list_test.go @@ -2,12 +2,13 @@ package query_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" diff --git a/internal/query/normalize.go b/internal/query/normalize.go index d851ed09..e05b96e4 100644 --- a/internal/query/normalize.go +++ b/internal/query/normalize.go @@ -5,10 +5,11 @@ import ( "encoding/json" "errors" "fmt" + "strings" + "queryorchestration/internal/database" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/validation" - "strings" "github.com/google/uuid" ) @@ -41,7 +42,7 @@ func (s *Service) NormalizeConfig(config Config) error { prettyJSON, err := json.Marshal(data) if err != nil { - return fmt.Errorf("error marshalling JSON: %s", err) + return fmt.Errorf("error marshaling JSON: %s", err) } strJSON := string(prettyJSON) diff --git a/internal/query/normalize_test.go b/internal/query/normalize_test.go index b5304d94..afd520ae 100644 --- a/internal/query/normalize_test.go +++ b/internal/query/normalize_test.go @@ -3,11 +3,12 @@ package query import ( "context" "errors" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/query/parse_test.go b/internal/query/parse_test.go index 72518fea..05a82861 100644 --- a/internal/query/parse_test.go +++ b/internal/query/parse_test.go @@ -1,11 +1,12 @@ package query_test import ( + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" resultprocessor "queryorchestration/internal/query/result/processor" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" diff --git a/internal/query/result/get.go b/internal/query/result/get.go index f677364b..7f18345b 100644 --- a/internal/query/result/get.go +++ b/internal/query/result/get.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" diff --git a/internal/query/result/get_test.go b/internal/query/result/get_test.go index 43eb1df6..003843fe 100644 --- a/internal/query/result/get_test.go +++ b/internal/query/result/get_test.go @@ -2,12 +2,13 @@ package result import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" diff --git a/internal/query/result/process.go b/internal/query/result/process.go index e992d3f0..80ec1865 100644 --- a/internal/query/result/process.go +++ b/internal/query/result/process.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "log/slog" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" diff --git a/internal/query/result/process_test.go b/internal/query/result/process_test.go index 853ab65b..666b6fd7 100644 --- a/internal/query/result/process_test.go +++ b/internal/query/result/process_test.go @@ -2,13 +2,14 @@ package result import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" resultprocessor "queryorchestration/internal/query/result/processor" jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/query/result/processor/parse.go b/internal/query/result/processor/parse.go index 4cd73166..a858f6c1 100644 --- a/internal/query/result/processor/parse.go +++ b/internal/query/result/processor/parse.go @@ -2,6 +2,7 @@ package resultprocessor import ( "fmt" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" diff --git a/internal/query/result/processor/parse_test.go b/internal/query/result/processor/parse_test.go index cb1ba2dc..77cf57bf 100644 --- a/internal/query/result/processor/parse_test.go +++ b/internal/query/result/processor/parse_test.go @@ -1,10 +1,11 @@ package resultprocessor_test import ( + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" - "testing" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" diff --git a/internal/query/result/processor/service_test.go b/internal/query/result/processor/service_test.go index f5eedec2..7119124d 100644 --- a/internal/query/result/processor/service_test.go +++ b/internal/query/result/processor/service_test.go @@ -1,9 +1,10 @@ package resultprocessor_test import ( - resultprocessor "queryorchestration/internal/query/result/processor" "testing" + resultprocessor "queryorchestration/internal/query/result/processor" + "github.com/google/uuid" "github.com/stretchr/testify/assert" ) diff --git a/internal/query/result/service_test.go b/internal/query/result/service_test.go index 1f07dc1c..0e680a2e 100644 --- a/internal/query/result/service_test.go +++ b/internal/query/result/service_test.go @@ -1,10 +1,11 @@ package result_test import ( + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/query/result" "queryorchestration/internal/serviceconfig" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/query/result/set/service_test.go b/internal/query/result/set/service_test.go index 7b03bda5..8cc060ab 100644 --- a/internal/query/result/set/service_test.go +++ b/internal/query/result/set/service_test.go @@ -1,10 +1,11 @@ package resultset_test import ( + "testing" + resultset "queryorchestration/internal/query/result/set" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/query" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/query/result/set/set.go b/internal/query/result/set/set.go index a15c70fe..b465f8b4 100644 --- a/internal/query/result/set/set.go +++ b/internal/query/result/set/set.go @@ -5,6 +5,7 @@ import ( "database/sql" "errors" "log/slog" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query/result" diff --git a/internal/query/result/set/set_test.go b/internal/query/result/set/set_test.go index 0120083c..432b5b35 100644 --- a/internal/query/result/set/set_test.go +++ b/internal/query/result/set/set_test.go @@ -3,6 +3,8 @@ package resultset import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" @@ -12,7 +14,6 @@ import ( "queryorchestration/internal/serviceconfig" queryc "queryorchestration/internal/serviceconfig/queue/query" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/result/sync/service_test.go b/internal/query/result/sync/service_test.go index 03680e34..8787131a 100644 --- a/internal/query/result/sync/service_test.go +++ b/internal/query/result/sync/service_test.go @@ -1,10 +1,11 @@ package resultsync_test import ( + "testing" + resultset "queryorchestration/internal/query/result/set" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/query" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/query/result/sync/trigger.go b/internal/query/result/sync/trigger.go index 1faf0296..260464d5 100644 --- a/internal/query/result/sync/trigger.go +++ b/internal/query/result/sync/trigger.go @@ -2,6 +2,7 @@ package resultsync import ( "context" + "queryorchestration/internal/serviceconfig/queue" "github.com/google/uuid" diff --git a/internal/query/result/sync/trigger_test.go b/internal/query/result/sync/trigger_test.go index 9d7cb90f..3b8110c7 100644 --- a/internal/query/result/sync/trigger_test.go +++ b/internal/query/result/sync/trigger_test.go @@ -3,11 +3,12 @@ package resultsync import ( "context" "fmt" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" queryc "queryorchestration/internal/serviceconfig/queue/query" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/service_test.go b/internal/query/service_test.go index 4dac02fe..51a40be4 100644 --- a/internal/query/service_test.go +++ b/internal/query/service_test.go @@ -1,10 +1,11 @@ package query_test import ( + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/query" "queryorchestration/internal/serviceconfig" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/query/sync/service_test.go b/internal/query/sync/service_test.go index 8c47e2ad..58e1e269 100644 --- a/internal/query/sync/service_test.go +++ b/internal/query/sync/service_test.go @@ -1,11 +1,12 @@ package querysync_test import ( + "testing" + "queryorchestration/internal/database/repository" querysync "queryorchestration/internal/query/sync" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/query" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/query/sync/sync.go b/internal/query/sync/sync.go index d0d4f16a..5e31a329 100644 --- a/internal/query/sync/sync.go +++ b/internal/query/sync/sync.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log/slog" + "queryorchestration/internal/database" "github.com/google/uuid" diff --git a/internal/query/sync/sync_test.go b/internal/query/sync/sync_test.go index 051ed24f..1127ca2f 100644 --- a/internal/query/sync/sync_test.go +++ b/internal/query/sync/sync_test.go @@ -3,13 +3,14 @@ package querysync import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultsync "queryorchestration/internal/query/result/sync" "queryorchestration/internal/serviceconfig" queryc "queryorchestration/internal/serviceconfig/queue/query" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/google/uuid" diff --git a/internal/query/test/service_test.go b/internal/query/test/service_test.go index 4bdae1a2..9077259e 100644 --- a/internal/query/test/service_test.go +++ b/internal/query/test/service_test.go @@ -1,10 +1,11 @@ package querytest_test import ( + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/query" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/test/test.go b/internal/query/test/test.go index ee44de19..254d6984 100644 --- a/internal/query/test/test.go +++ b/internal/query/test/test.go @@ -2,6 +2,7 @@ package querytest import ( "context" + "queryorchestration/internal/query/result" ) diff --git a/internal/query/test/test_test.go b/internal/query/test/test_test.go index bc77d47b..6b8bdbd3 100644 --- a/internal/query/test/test_test.go +++ b/internal/query/test/test_test.go @@ -2,6 +2,8 @@ package querytest_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/document" @@ -12,7 +14,6 @@ import ( "queryorchestration/internal/query/result" querytest "queryorchestration/internal/query/test" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/types/contextFull/creator.go b/internal/query/types/contextFull/creator.go index d7492a5a..c445756f 100644 --- a/internal/query/types/contextFull/creator.go +++ b/internal/query/types/contextFull/creator.go @@ -2,6 +2,7 @@ package contextfull import ( "context" + resultprocessor "queryorchestration/internal/query/result/processor" ) diff --git a/internal/query/types/contextFull/creator_test.go b/internal/query/types/contextFull/creator_test.go index c9be9c9e..7675857a 100644 --- a/internal/query/types/contextFull/creator_test.go +++ b/internal/query/types/contextFull/creator_test.go @@ -2,11 +2,12 @@ package contextfull_test import ( "context" + "testing" + "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" contextfull "queryorchestration/internal/query/types/contextFull" "queryorchestration/internal/serviceconfig" - "testing" "github.com/pashagolub/pgxmock/v3" "github.com/stretchr/testify/assert" diff --git a/internal/query/types/contextFull/process_test.go b/internal/query/types/contextFull/process_test.go index ccf94c18..a1013f36 100644 --- a/internal/query/types/contextFull/process_test.go +++ b/internal/query/types/contextFull/process_test.go @@ -2,9 +2,10 @@ package contextfull_test import ( "context" + "testing" + resultprocessor "queryorchestration/internal/query/result/processor" contextfull "queryorchestration/internal/query/types/contextFull" - "testing" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/query/types/contextFull/service.go b/internal/query/types/contextFull/service.go index be7c7a15..1d4ea70b 100644 --- a/internal/query/types/contextFull/service.go +++ b/internal/query/types/contextFull/service.go @@ -3,6 +3,7 @@ package contextfull import ( "context" "errors" + resultprocessor "queryorchestration/internal/query/result/processor" ) diff --git a/internal/query/types/contextFull/updator.go b/internal/query/types/contextFull/updator.go index 7b8342eb..74adcdf6 100644 --- a/internal/query/types/contextFull/updator.go +++ b/internal/query/types/contextFull/updator.go @@ -2,6 +2,7 @@ package contextfull import ( "context" + resultprocessor "queryorchestration/internal/query/result/processor" ) diff --git a/internal/query/types/contextFull/updator_test.go b/internal/query/types/contextFull/updator_test.go index 0950f635..05496ac0 100644 --- a/internal/query/types/contextFull/updator_test.go +++ b/internal/query/types/contextFull/updator_test.go @@ -2,11 +2,12 @@ package contextfull_test import ( "context" + "testing" + "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" contextfull "queryorchestration/internal/query/types/contextFull" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/stretchr/testify/require" diff --git a/internal/query/types/jsonExtractor/creator.go b/internal/query/types/jsonExtractor/creator.go index 0fa53e93..b9b2f609 100644 --- a/internal/query/types/jsonExtractor/creator.go +++ b/internal/query/types/jsonExtractor/creator.go @@ -3,6 +3,7 @@ package jsonextractor import ( "context" "errors" + resultprocessor "queryorchestration/internal/query/result/processor" ) diff --git a/internal/query/types/jsonExtractor/creator_test.go b/internal/query/types/jsonExtractor/creator_test.go index 09dc5c52..e2c21abd 100644 --- a/internal/query/types/jsonExtractor/creator_test.go +++ b/internal/query/types/jsonExtractor/creator_test.go @@ -2,11 +2,12 @@ package jsonextractor_test import ( "context" + "testing" + "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/types/jsonExtractor/process_test.go b/internal/query/types/jsonExtractor/process_test.go index 081a4227..217ab83d 100644 --- a/internal/query/types/jsonExtractor/process_test.go +++ b/internal/query/types/jsonExtractor/process_test.go @@ -3,13 +3,14 @@ package jsonextractor_test import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" contextfull "queryorchestration/internal/query/types/contextFull" jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/types/jsonExtractor/service.go b/internal/query/types/jsonExtractor/service.go index ef56aabe..7ce90dba 100644 --- a/internal/query/types/jsonExtractor/service.go +++ b/internal/query/types/jsonExtractor/service.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "queryorchestration/internal/database" resultprocessor "queryorchestration/internal/query/result/processor" "queryorchestration/internal/serviceconfig" diff --git a/internal/query/types/jsonExtractor/updator.go b/internal/query/types/jsonExtractor/updator.go index 28916bb5..17acbc37 100644 --- a/internal/query/types/jsonExtractor/updator.go +++ b/internal/query/types/jsonExtractor/updator.go @@ -2,6 +2,7 @@ package jsonextractor import ( "context" + resultprocessor "queryorchestration/internal/query/result/processor" ) diff --git a/internal/query/types/jsonExtractor/updator_test.go b/internal/query/types/jsonExtractor/updator_test.go index ea4004df..7e2378f7 100644 --- a/internal/query/types/jsonExtractor/updator_test.go +++ b/internal/query/types/jsonExtractor/updator_test.go @@ -2,11 +2,12 @@ package jsonextractor_test import ( "context" + "testing" + "queryorchestration/internal/database/repository" resultprocessor "queryorchestration/internal/query/result/processor" jsonextractor "queryorchestration/internal/query/types/jsonExtractor" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/query/update/service_test.go b/internal/query/update/service_test.go index 6f09ef96..080c69ec 100644 --- a/internal/query/update/service_test.go +++ b/internal/query/update/service_test.go @@ -1,10 +1,11 @@ package queryupdate_test import ( + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/query" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/update/update.go b/internal/query/update/update.go index 998cca5d..9db7ca22 100644 --- a/internal/query/update/update.go +++ b/internal/query/update/update.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "log/slog" + queryversionsyncrunner "queryorchestration/api/queryVersionSyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/database/repository" diff --git a/internal/query/update/update_test.go b/internal/query/update/update_test.go index eb1d2e9d..5935434a 100644 --- a/internal/query/update/update_test.go +++ b/internal/query/update/update_test.go @@ -3,6 +3,8 @@ package queryupdate_test import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" @@ -11,7 +13,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/queryversionsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/update/updateprivate_test.go b/internal/query/update/updateprivate_test.go index 6ae360f5..82ebf6df 100644 --- a/internal/query/update/updateprivate_test.go +++ b/internal/query/update/updateprivate_test.go @@ -4,6 +4,8 @@ import ( "context" "errors" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/query" @@ -11,7 +13,6 @@ import ( "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/queryversionsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/query/versionsync/service_test.go b/internal/query/versionsync/service_test.go index 2c9f29c6..160557e9 100644 --- a/internal/query/versionsync/service_test.go +++ b/internal/query/versionsync/service_test.go @@ -1,9 +1,10 @@ package queryversionsync_test import ( + "testing" + "queryorchestration/internal/query" "queryorchestration/internal/serviceconfig" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/query/versionsync/sync.go b/internal/query/versionsync/sync.go index 087f8bd7..e4eaef15 100644 --- a/internal/query/versionsync/sync.go +++ b/internal/query/versionsync/sync.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "errors" + jobsyncrunner "queryorchestration/api/jobSyncRunner" "queryorchestration/internal/database" "queryorchestration/internal/serviceconfig/queue" diff --git a/internal/query/versionsync/sync_test.go b/internal/query/versionsync/sync_test.go index ef7650a6..c366c8f8 100644 --- a/internal/query/versionsync/sync_test.go +++ b/internal/query/versionsync/sync_test.go @@ -3,12 +3,13 @@ package queryversionsync import ( "context" "fmt" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue/jobsync" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/stretchr/testify/require" diff --git a/internal/server/runner/listener.go b/internal/server/runner/listener.go index 0d7fff6d..c69cdd5f 100644 --- a/internal/server/runner/listener.go +++ b/internal/server/runner/listener.go @@ -3,6 +3,7 @@ package runner import ( "context" "errors" + "queryorchestration/internal/server" "queryorchestration/internal/serviceconfig/aws" diff --git a/internal/server/runner/listener_test.go b/internal/server/runner/listener_test.go index 06aaa9ec..140f9583 100644 --- a/internal/server/runner/listener_test.go +++ b/internal/server/runner/listener_test.go @@ -4,11 +4,12 @@ import ( "context" "os" "path" + "testing" + "time" + "queryorchestration/internal/test" queuemock "queryorchestration/mocks/queue" runnermock "queryorchestration/mocks/runner" - "testing" - "time" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/stretchr/testify/assert" diff --git a/internal/server/runner/poll.go b/internal/server/runner/poll.go index a3f0ab36..538229e5 100644 --- a/internal/server/runner/poll.go +++ b/internal/server/runner/poll.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log/slog" + "queryorchestration/internal/serviceconfig/queue" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/internal/server/runner/poll_test.go b/internal/server/runner/poll_test.go index 379072d7..5f828dc1 100644 --- a/internal/server/runner/poll_test.go +++ b/internal/server/runner/poll_test.go @@ -2,11 +2,12 @@ package runner import ( "context" - queuemock "queryorchestration/mocks/queue" - runnermock "queryorchestration/mocks/runner" "testing" "time" + queuemock "queryorchestration/mocks/queue" + runnermock "queryorchestration/mocks/runner" + "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" "github.com/stretchr/testify/assert" diff --git a/internal/server/server.go b/internal/server/server.go index 7e4bf1c4..e0c38e30 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -2,6 +2,7 @@ package server import ( "context" + "queryorchestration/internal/database/migrations" "queryorchestration/internal/serviceconfig" diff --git a/internal/server/server_test.go b/internal/server/server_test.go index 046253a4..1afbf346 100644 --- a/internal/server/server_test.go +++ b/internal/server/server_test.go @@ -5,9 +5,10 @@ import ( "fmt" "os" "path" + "testing" + "queryorchestration/internal/server" "queryorchestration/internal/test" - "testing" "github.com/go-playground/validator/v10" "github.com/stretchr/testify/assert" diff --git a/internal/server/service/listener.go b/internal/server/service/listener.go index 5af52cd9..c43dd6db 100644 --- a/internal/server/service/listener.go +++ b/internal/server/service/listener.go @@ -6,10 +6,11 @@ import ( "log/slog" "net" "net/http" - "queryorchestration/internal/server" "strconv" "time" + "queryorchestration/internal/server" + "github.com/getkin/kin-openapi/openapi3" "github.com/labstack/echo-contrib/echoprometheus" "github.com/labstack/echo/v4" diff --git a/internal/server/service/listener_test.go b/internal/server/service/listener_test.go index 97324bf2..04eeaf0d 100644 --- a/internal/server/service/listener_test.go +++ b/internal/server/service/listener_test.go @@ -5,9 +5,10 @@ import ( "os" "path" - "queryorchestration/internal/test" "testing" + "queryorchestration/internal/test" + "github.com/getkin/kin-openapi/openapi3" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" diff --git a/internal/serviceconfig/aws/config_test.go b/internal/serviceconfig/aws/config_test.go index af1134e9..8849e018 100644 --- a/internal/serviceconfig/aws/config_test.go +++ b/internal/serviceconfig/aws/config_test.go @@ -1,9 +1,10 @@ package aws_test import ( - "queryorchestration/internal/serviceconfig/aws" "testing" + "queryorchestration/internal/serviceconfig/aws" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/common.go b/internal/serviceconfig/common.go index d2803568..12397065 100644 --- a/internal/serviceconfig/common.go +++ b/internal/serviceconfig/common.go @@ -4,14 +4,15 @@ import ( "errors" "fmt" "log/slog" + "reflect" + "strings" + "sync" + "queryorchestration/internal/serviceconfig/aws" "queryorchestration/internal/serviceconfig/database" "queryorchestration/internal/serviceconfig/logger" "queryorchestration/internal/serviceconfig/observability" "queryorchestration/internal/serviceconfig/queue" - "reflect" - "strings" - "sync" "github.com/caarlos0/env/v11" "github.com/joho/godotenv" @@ -69,7 +70,11 @@ func getBaseConfig(cfg ConfigProvider) *BaseConfig { t := reflect.ValueOf(cfg).Type() if t == reflect.TypeOf(&BaseConfig{}) { - v := reflect.ValueOf(cfg).Interface().(*BaseConfig) + v, ok := reflect.ValueOf(cfg).Interface().(*BaseConfig) + if !ok { + return nil + } + return v } else if t.Kind() == reflect.Ptr && t.Elem().Kind() != reflect.Struct { return nil @@ -82,9 +87,19 @@ func getBaseConfig(cfg ConfigProvider) *BaseConfig { b := val.Field(i) intType := reflect.TypeOf((*ConfigProvider)(nil)).Elem() if b.Type().Implements(intType) { - baseConfig = getBaseConfig(b.Interface().(ConfigProvider)) + provider, ok := b.Interface().(ConfigProvider) + if !ok { + return nil + } + + baseConfig = getBaseConfig(provider) } else if reflect.PointerTo(b.Type()).Implements(intType) { - baseConfig = getBaseConfig(b.Addr().Interface().(ConfigProvider)) + provider, ok := b.Addr().Interface().(ConfigProvider) + if !ok { + return nil + } + + baseConfig = getBaseConfig(provider) } } diff --git a/internal/serviceconfig/common_test.go b/internal/serviceconfig/common_test.go index bca9bbf3..81f89ca1 100644 --- a/internal/serviceconfig/common_test.go +++ b/internal/serviceconfig/common_test.go @@ -2,11 +2,12 @@ package serviceconfig import ( "os" - "queryorchestration/internal/serviceconfig/aws" - "queryorchestration/internal/serviceconfig/database" "strings" "testing" + "queryorchestration/internal/serviceconfig/aws" + "queryorchestration/internal/serviceconfig/database" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/commonlog_test.go b/internal/serviceconfig/commonlog_test.go index 5b118c72..84a0733e 100644 --- a/internal/serviceconfig/commonlog_test.go +++ b/internal/serviceconfig/commonlog_test.go @@ -4,10 +4,11 @@ import ( "bytes" "log/slog" "os" - "queryorchestration/internal/serviceconfig" "strings" "testing" + "queryorchestration/internal/serviceconfig" + "github.com/stretchr/testify/require" ) diff --git a/internal/serviceconfig/database/config.go b/internal/serviceconfig/database/config.go index 40ac92a9..563f1338 100644 --- a/internal/serviceconfig/database/config.go +++ b/internal/serviceconfig/database/config.go @@ -3,6 +3,7 @@ package database import ( "context" "fmt" + "queryorchestration/internal/database/repository" "github.com/jackc/pgx/v5/pgxpool" diff --git a/internal/serviceconfig/database/config_test.go b/internal/serviceconfig/database/config_test.go index 5ee66aa0..40cdfde6 100644 --- a/internal/serviceconfig/database/config_test.go +++ b/internal/serviceconfig/database/config_test.go @@ -1,9 +1,10 @@ package database_test import ( - "queryorchestration/internal/serviceconfig/database" "testing" + "queryorchestration/internal/serviceconfig/database" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/database/pool.go b/internal/serviceconfig/database/pool.go index e866a392..dbd8a1cf 100644 --- a/internal/serviceconfig/database/pool.go +++ b/internal/serviceconfig/database/pool.go @@ -4,9 +4,10 @@ import ( "context" "fmt" "log/slog" - "queryorchestration/internal/database/repository" "time" + "queryorchestration/internal/database/repository" + "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" ) diff --git a/internal/serviceconfig/database/pool_test.go b/internal/serviceconfig/database/pool_test.go index 712b38ef..c82f6233 100644 --- a/internal/serviceconfig/database/pool_test.go +++ b/internal/serviceconfig/database/pool_test.go @@ -4,11 +4,12 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/database" "queryorchestration/internal/test" - "testing" "github.com/jackc/pgx/v5/pgxpool" "github.com/stretchr/testify/assert" diff --git a/internal/serviceconfig/database/transaction.go b/internal/serviceconfig/database/transaction.go index bb75ebd4..68879528 100644 --- a/internal/serviceconfig/database/transaction.go +++ b/internal/serviceconfig/database/transaction.go @@ -2,6 +2,7 @@ package database import ( "context" + "queryorchestration/internal/database/repository" ) diff --git a/internal/serviceconfig/database/transaction_test.go b/internal/serviceconfig/database/transaction_test.go index 52477216..1f9d7465 100644 --- a/internal/serviceconfig/database/transaction_test.go +++ b/internal/serviceconfig/database/transaction_test.go @@ -2,10 +2,11 @@ package database_test import ( "context" + "testing" + "queryorchestration/internal/database" "queryorchestration/internal/database/repository" "queryorchestration/internal/serviceconfig" - "testing" "github.com/google/uuid" "github.com/pashagolub/pgxmock/v3" diff --git a/internal/serviceconfig/objectstore/config.go b/internal/serviceconfig/objectstore/config.go index aa97a523..ed274e38 100644 --- a/internal/serviceconfig/objectstore/config.go +++ b/internal/serviceconfig/objectstore/config.go @@ -4,9 +4,10 @@ import ( "context" "fmt" "log/slog" - awsc "queryorchestration/internal/serviceconfig/aws" "time" + awsc "queryorchestration/internal/serviceconfig/aws" + "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" ) diff --git a/internal/serviceconfig/objectstore/config_test.go b/internal/serviceconfig/objectstore/config_test.go index 57c05aca..c59794eb 100644 --- a/internal/serviceconfig/objectstore/config_test.go +++ b/internal/serviceconfig/objectstore/config_test.go @@ -4,11 +4,12 @@ import ( "context" "errors" "os" + "testing" + "time" + "queryorchestration/internal/serviceconfig" objectstore "queryorchestration/internal/serviceconfig/objectstore" objectstoremock "queryorchestration/mocks/objectstore" - "testing" - "time" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/stretchr/testify/assert" diff --git a/internal/serviceconfig/observability/config_test.go b/internal/serviceconfig/observability/config_test.go index 9e64b63d..eab37d10 100644 --- a/internal/serviceconfig/observability/config_test.go +++ b/internal/serviceconfig/observability/config_test.go @@ -3,9 +3,10 @@ package observability_test import ( "context" "fmt" - "queryorchestration/internal/serviceconfig/observability" "testing" + "queryorchestration/internal/serviceconfig/observability" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/observability/prometheus/prometheus.go b/internal/serviceconfig/observability/prometheus/prometheus.go index bedd522a..68a583bb 100644 --- a/internal/serviceconfig/observability/prometheus/prometheus.go +++ b/internal/serviceconfig/observability/prometheus/prometheus.go @@ -5,6 +5,7 @@ import ( "fmt" "net/http" "sync" + "time" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -121,8 +122,9 @@ func New(ctx context.Context, config MetricsConfig) (*Metrics, error) { mux.Handle("/metrics", promhttp.Handler()) m.server = &http.Server{ - Addr: fmt.Sprintf(":%d", config.Port), - Handler: mux, + Addr: fmt.Sprintf(":%d", config.Port), + Handler: mux, + ReadHeaderTimeout: time.Minute, } go func() { diff --git a/internal/serviceconfig/observability/prometheus/prometheus_test.go b/internal/serviceconfig/observability/prometheus/prometheus_test.go index 067fc117..5cd8faed 100644 --- a/internal/serviceconfig/observability/prometheus/prometheus_test.go +++ b/internal/serviceconfig/observability/prometheus/prometheus_test.go @@ -27,7 +27,12 @@ func GetFreePortForTesting() (int, error) { defer l.Close() // Get the port that was assigned by the OS - return l.Addr().(*net.TCPAddr).Port, nil + addr, ok := l.Addr().(*net.TCPAddr) + if !ok { + return 0, fmt.Errorf("failed to parse TCP address") + } + + return addr.Port, nil } func TestMetricsIntegration(t *testing.T) { diff --git a/internal/serviceconfig/queue/config.go b/internal/serviceconfig/queue/config.go index 53adcd6d..fbd4a113 100644 --- a/internal/serviceconfig/queue/config.go +++ b/internal/serviceconfig/queue/config.go @@ -4,9 +4,10 @@ import ( "context" "fmt" "log/slog" - awsc "queryorchestration/internal/serviceconfig/aws" "time" + awsc "queryorchestration/internal/serviceconfig/aws" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/sqs" diff --git a/internal/serviceconfig/queue/config_test.go b/internal/serviceconfig/queue/config_test.go index d2d36c16..4ef995bb 100644 --- a/internal/serviceconfig/queue/config_test.go +++ b/internal/serviceconfig/queue/config_test.go @@ -3,9 +3,10 @@ package queue_test import ( "context" "os" + "testing" + "queryorchestration/internal/serviceconfig/queue" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/stretchr/testify/assert" diff --git a/internal/serviceconfig/queue/delete_test.go b/internal/serviceconfig/queue/delete_test.go index 4508d1ec..f372b5d0 100644 --- a/internal/serviceconfig/queue/delete_test.go +++ b/internal/serviceconfig/queue/delete_test.go @@ -2,9 +2,10 @@ package queue_test import ( "context" + "testing" + "queryorchestration/internal/serviceconfig/queue" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/stretchr/testify/assert" diff --git a/internal/serviceconfig/queue/documentclean/config_test.go b/internal/serviceconfig/queue/documentclean/config_test.go index d65fc5fb..b782c7f9 100644 --- a/internal/serviceconfig/queue/documentclean/config_test.go +++ b/internal/serviceconfig/queue/documentclean/config_test.go @@ -1,9 +1,10 @@ package documentclean_test import ( - "queryorchestration/internal/serviceconfig/queue/documentclean" "testing" + "queryorchestration/internal/serviceconfig/queue/documentclean" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/documentinit/config_test.go b/internal/serviceconfig/queue/documentinit/config_test.go index 9cdac18a..9551bf39 100644 --- a/internal/serviceconfig/queue/documentinit/config_test.go +++ b/internal/serviceconfig/queue/documentinit/config_test.go @@ -1,9 +1,10 @@ package documentinit_test import ( - "queryorchestration/internal/serviceconfig/queue/documentinit" "testing" + "queryorchestration/internal/serviceconfig/queue/documentinit" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/documentsync/config_test.go b/internal/serviceconfig/queue/documentsync/config_test.go index fc732f76..6c6c129f 100644 --- a/internal/serviceconfig/queue/documentsync/config_test.go +++ b/internal/serviceconfig/queue/documentsync/config_test.go @@ -1,9 +1,10 @@ package documentsync_test import ( - "queryorchestration/internal/serviceconfig/queue/documentsync" "testing" + "queryorchestration/internal/serviceconfig/queue/documentsync" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/documenttext/config_test.go b/internal/serviceconfig/queue/documenttext/config_test.go index dfeb9d42..c233e4eb 100644 --- a/internal/serviceconfig/queue/documenttext/config_test.go +++ b/internal/serviceconfig/queue/documenttext/config_test.go @@ -1,9 +1,10 @@ package documenttext_test import ( - "queryorchestration/internal/serviceconfig/queue/documenttext" "testing" + "queryorchestration/internal/serviceconfig/queue/documenttext" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/jobsync/config_test.go b/internal/serviceconfig/queue/jobsync/config_test.go index 3be9f37c..bf856387 100644 --- a/internal/serviceconfig/queue/jobsync/config_test.go +++ b/internal/serviceconfig/queue/jobsync/config_test.go @@ -1,9 +1,10 @@ package jobsync_test import ( - "queryorchestration/internal/serviceconfig/queue/jobsync" "testing" + "queryorchestration/internal/serviceconfig/queue/jobsync" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/query/config_test.go b/internal/serviceconfig/queue/query/config_test.go index 3091003e..3725a71c 100644 --- a/internal/serviceconfig/queue/query/config_test.go +++ b/internal/serviceconfig/queue/query/config_test.go @@ -1,9 +1,10 @@ package query_test import ( - "queryorchestration/internal/serviceconfig/queue/query" "testing" + "queryorchestration/internal/serviceconfig/queue/query" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/querysync/config_test.go b/internal/serviceconfig/queue/querysync/config_test.go index b920b60f..e2643095 100644 --- a/internal/serviceconfig/queue/querysync/config_test.go +++ b/internal/serviceconfig/queue/querysync/config_test.go @@ -1,9 +1,10 @@ package querysync_test import ( - "queryorchestration/internal/serviceconfig/queue/querysync" "testing" + "queryorchestration/internal/serviceconfig/queue/querysync" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/queryversionsync/config_test.go b/internal/serviceconfig/queue/queryversionsync/config_test.go index 7bdc8188..32f4bf47 100644 --- a/internal/serviceconfig/queue/queryversionsync/config_test.go +++ b/internal/serviceconfig/queue/queryversionsync/config_test.go @@ -1,9 +1,10 @@ package queryversionsync_test import ( - "queryorchestration/internal/serviceconfig/queue/queryversionsync" "testing" + "queryorchestration/internal/serviceconfig/queue/queryversionsync" + "github.com/stretchr/testify/assert" ) diff --git a/internal/serviceconfig/queue/receive_test.go b/internal/serviceconfig/queue/receive_test.go index a801c392..ab0007e2 100644 --- a/internal/serviceconfig/queue/receive_test.go +++ b/internal/serviceconfig/queue/receive_test.go @@ -2,9 +2,10 @@ package queue_test import ( "context" + "testing" + "queryorchestration/internal/serviceconfig/queue" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/internal/serviceconfig/queue/send_test.go b/internal/serviceconfig/queue/send_test.go index c86eca17..f3576157 100644 --- a/internal/serviceconfig/queue/send_test.go +++ b/internal/serviceconfig/queue/send_test.go @@ -2,9 +2,10 @@ package queue_test import ( "context" + "testing" + "queryorchestration/internal/serviceconfig/queue" queuemock "queryorchestration/mocks/queue" - "testing" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/stretchr/testify/assert" diff --git a/internal/test/aws.go b/internal/test/aws.go index b6ad1a16..41689342 100644 --- a/internal/test/aws.go +++ b/internal/test/aws.go @@ -5,10 +5,11 @@ import ( "fmt" "io" "net/http" - "queryorchestration/internal/serviceconfig" "testing" "time" + "queryorchestration/internal/serviceconfig" + "github.com/docker/go-connections/nat" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" diff --git a/internal/test/aws_test.go b/internal/test/aws_test.go index bfc2ea2a..456d463b 100644 --- a/internal/test/aws_test.go +++ b/internal/test/aws_test.go @@ -2,9 +2,10 @@ package test import ( "context" - "queryorchestration/internal/serviceconfig" "testing" + "queryorchestration/internal/serviceconfig" + "github.com/stretchr/testify/assert" ) diff --git a/internal/test/container.go b/internal/test/container.go index 8b79a4b8..a0e6d2ca 100644 --- a/internal/test/container.go +++ b/internal/test/container.go @@ -5,10 +5,11 @@ import ( "context" "fmt" "log/slog" - "queryorchestration/internal/serviceconfig" "strconv" "testing" + "queryorchestration/internal/serviceconfig" + "github.com/docker/go-connections/nat" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" diff --git a/internal/test/container_test.go b/internal/test/container_test.go index c2d34ed5..ebb669f3 100644 --- a/internal/test/container_test.go +++ b/internal/test/container_test.go @@ -2,9 +2,10 @@ package test import ( "context" - "queryorchestration/internal/serviceconfig" "testing" + "queryorchestration/internal/serviceconfig" + "github.com/stretchr/testify/assert" ) diff --git a/internal/test/database.go b/internal/test/database.go index 4bb581c9..e0f19077 100644 --- a/internal/test/database.go +++ b/internal/test/database.go @@ -3,11 +3,12 @@ package test import ( "context" "fmt" + "testing" + "time" + "queryorchestration/internal/database/migrations" "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/database" - "testing" - "time" "github.com/docker/go-connections/nat" "github.com/stretchr/testify/require" diff --git a/internal/test/database_test.go b/internal/test/database_test.go index 1c71bd0d..6d39bb8b 100644 --- a/internal/test/database_test.go +++ b/internal/test/database_test.go @@ -4,9 +4,10 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/ecosystem.go b/internal/test/ecosystem.go index b01dfbc8..972fdac3 100644 --- a/internal/test/ecosystem.go +++ b/internal/test/ecosystem.go @@ -2,10 +2,11 @@ package test import ( "context" + "testing" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/aws" "queryorchestration/internal/serviceconfig/database" - "testing" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" diff --git a/internal/test/ecosystem_test.go b/internal/test/ecosystem_test.go index 576840e7..69ccc317 100644 --- a/internal/test/ecosystem_test.go +++ b/internal/test/ecosystem_test.go @@ -4,9 +4,10 @@ import ( "context" "os" "path" - "queryorchestration/internal/serviceconfig" "testing" + "queryorchestration/internal/serviceconfig" + "github.com/stretchr/testify/assert" ) diff --git a/internal/test/network_test.go b/internal/test/network_test.go index d21c0622..3e70c2e8 100644 --- a/internal/test/network_test.go +++ b/internal/test/network_test.go @@ -2,9 +2,10 @@ package test_test import ( "context" - "queryorchestration/internal/test" "testing" + "queryorchestration/internal/test" + "github.com/stretchr/testify/assert" ) diff --git a/internal/test/objectstore.go b/internal/test/objectstore.go index 17ab5270..34ff465f 100644 --- a/internal/test/objectstore.go +++ b/internal/test/objectstore.go @@ -2,9 +2,10 @@ package test import ( "context" - objectstore "queryorchestration/internal/serviceconfig/objectstore" "testing" + objectstore "queryorchestration/internal/serviceconfig/objectstore" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/stretchr/testify/require" diff --git a/internal/test/objectstore_test.go b/internal/test/objectstore_test.go index f48e7206..b534702e 100644 --- a/internal/test/objectstore_test.go +++ b/internal/test/objectstore_test.go @@ -2,9 +2,10 @@ package test import ( "context" + "testing" + "queryorchestration/internal/serviceconfig" objectstore "queryorchestration/internal/serviceconfig/objectstore" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/queue.go b/internal/test/queue.go index a6a47288..35d5c84e 100644 --- a/internal/test/queue.go +++ b/internal/test/queue.go @@ -2,11 +2,12 @@ package test import ( "context" - "queryorchestration/internal/serviceconfig" - "queryorchestration/internal/serviceconfig/queue" "regexp" "testing" + "queryorchestration/internal/serviceconfig" + "queryorchestration/internal/serviceconfig/queue" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/sqs" "github.com/aws/aws-sdk-go-v2/service/sqs/types" diff --git a/internal/test/queue_test.go b/internal/test/queue_test.go index 083efb4f..9abfef33 100644 --- a/internal/test/queue_test.go +++ b/internal/test/queue_test.go @@ -2,11 +2,12 @@ package test import ( "context" - "queryorchestration/internal/serviceconfig" - "queryorchestration/internal/serviceconfig/queue" "regexp" "testing" + "queryorchestration/internal/serviceconfig" + "queryorchestration/internal/serviceconfig/queue" + "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/sqs/types" "github.com/stretchr/testify/assert" diff --git a/internal/test/runner.go b/internal/test/runner.go index ded2fd73..514639ec 100644 --- a/internal/test/runner.go +++ b/internal/test/runner.go @@ -2,6 +2,8 @@ package test import ( "context" + "testing" + doccleanrunner "queryorchestration/api/docCleanRunner" docinitrunner "queryorchestration/api/docInitRunner" docsyncrunner "queryorchestration/api/docSyncRunner" @@ -10,7 +12,6 @@ import ( queryrunner "queryorchestration/api/queryRunner" querysyncrunner "queryorchestration/api/querySyncRunner" queryversionsyncrunner "queryorchestration/api/queryVersionSyncRunner" - "testing" "queryorchestration/internal/serviceconfig" diff --git a/internal/test/runner_test.go b/internal/test/runner_test.go index 1af92d91..925839b4 100644 --- a/internal/test/runner_test.go +++ b/internal/test/runner_test.go @@ -2,9 +2,10 @@ package test import ( "context" - "queryorchestration/internal/serviceconfig" "testing" + "queryorchestration/internal/serviceconfig" + "github.com/stretchr/testify/assert" ) diff --git a/internal/test/service.go b/internal/test/service.go index d5cb2d76..391055e8 100644 --- a/internal/test/service.go +++ b/internal/test/service.go @@ -3,9 +3,10 @@ package test import ( "context" "fmt" + "testing" + queryservice "queryorchestration/api/queryService" "queryorchestration/internal/serviceconfig" - "testing" "github.com/docker/go-connections/nat" "github.com/stretchr/testify/require" diff --git a/internal/test/service_test.go b/internal/test/service_test.go index c08c059a..0a2db0f0 100644 --- a/internal/test/service_test.go +++ b/internal/test/service_test.go @@ -4,9 +4,10 @@ import ( "context" "os" "path" + "testing" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/test" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/internal/validation/validation_test.go b/internal/validation/validation_test.go index 3d87f006..ffe56c99 100644 --- a/internal/validation/validation_test.go +++ b/internal/validation/validation_test.go @@ -1,9 +1,10 @@ package validation_test import ( - "queryorchestration/internal/validation" "testing" + "queryorchestration/internal/validation" + "github.com/google/uuid" "github.com/stretchr/testify/assert" ) diff --git a/scripts/Taskfile.yml b/scripts/Taskfile.yml index fe7cb92a..d7356692 100644 --- a/scripts/Taskfile.yml +++ b/scripts/Taskfile.yml @@ -85,10 +85,8 @@ tasks: cmds: - golangci-lint run go:lint:fix: - deps: - - go:lint cmds: - - gofmt -w . + - golangci-lint run --fix yaml:lint: cmds: - yamllint . -s diff --git a/test/process_test.go b/test/process_test.go index ba414222..7a9e7bf7 100644 --- a/test/process_test.go +++ b/test/process_test.go @@ -5,14 +5,15 @@ import ( "fmt" "os" "path" + "strings" + "testing" + "time" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/objectstore" documentcleanc "queryorchestration/internal/serviceconfig/queue/documentclean" "queryorchestration/internal/test" queryservice "queryorchestration/pkg/queryService" - "strings" - "testing" - "time" "github.com/aws/aws-sdk-go-v2/service/s3" awstypes "github.com/aws/aws-sdk-go-v2/service/s3/types" diff --git a/test/queryService/accessory_test.go b/test/queryService/accessory_test.go index aec9a64d..872ec2ca 100644 --- a/test/queryService/accessory_test.go +++ b/test/queryService/accessory_test.go @@ -4,9 +4,10 @@ import ( "context" "fmt" "net/http" - "queryorchestration/internal/test" "testing" + "queryorchestration/internal/test" + "github.com/stretchr/testify/assert" ) diff --git a/test/queryService/client_test.go b/test/queryService/client_test.go index c7a27a46..b2bf7a2c 100644 --- a/test/queryService/client_test.go +++ b/test/queryService/client_test.go @@ -2,9 +2,10 @@ package endtoend import ( "context" + "testing" + "queryorchestration/internal/test" queryservice "queryorchestration/pkg/queryService" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/test/queryService/exportservice_test.go b/test/queryService/exportservice_test.go index 7fef87f6..43784791 100644 --- a/test/queryService/exportservice_test.go +++ b/test/queryService/exportservice_test.go @@ -2,9 +2,10 @@ package endtoend import ( "context" + "testing" + "queryorchestration/internal/test" queryservice "queryorchestration/pkg/queryService" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/test/queryService/job_test.go b/test/queryService/job_test.go index edcc96a5..dee72a57 100644 --- a/test/queryService/job_test.go +++ b/test/queryService/job_test.go @@ -2,9 +2,10 @@ package endtoend import ( "context" + "testing" + "queryorchestration/internal/test" queryservice "queryorchestration/pkg/queryService" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/test/queryService/jobcollectorservice_test.go b/test/queryService/jobcollectorservice_test.go index f963fb5b..3447087c 100644 --- a/test/queryService/jobcollectorservice_test.go +++ b/test/queryService/jobcollectorservice_test.go @@ -5,12 +5,13 @@ import ( "log" "os" "path" + "regexp" + "testing" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue" "queryorchestration/internal/test" queryservice "queryorchestration/pkg/queryService" - "regexp" - "testing" "github.com/oapi-codegen/runtime/types" "github.com/stretchr/testify/assert" diff --git a/test/queryService/queryservice_test.go b/test/queryService/queryservice_test.go index e81b7620..bbbfe9f1 100644 --- a/test/queryService/queryservice_test.go +++ b/test/queryService/queryservice_test.go @@ -4,12 +4,13 @@ import ( "context" "os" "path" + "regexp" + "testing" + "queryorchestration/internal/serviceconfig" "queryorchestration/internal/serviceconfig/queue" "queryorchestration/internal/test" queryservice "queryorchestration/pkg/queryService" - "regexp" - "testing" "github.com/oapi-codegen/runtime/types" "github.com/stretchr/testify/assert"