jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in feature/docinitialisation (pull request #41)

Browse Source 
Queuing Changes and Cfg Testing

* staarting

* staarting

* startedpush

* note

* save

* mocking

* removederrs

* fixtests

* cleanuperrs

* newenvsetup

* preppingtests

* queue

* mmovetocfgpassunittests

* sortoutconfig

* passinginteg

* deps

* fixtests
This commit is contained in:
Michael McGuinness
2025-02-03 17:30:50 +00:00
parent 15adaebfcd
commit 7001ca854c
135 changed files with 3916 additions and 1523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/queryService/client_test.go
+6 -6
View File
@@ -38,7 +38,7 @@ func TestCreateClient(t *testing.T) {
Name: "example_name",
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -54,7 +54,7 @@ func TestCreateClient(t *testing.T) {
)
err = cons.CreateClient(ctx)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusCreated, rec.Code)
assert.Equal(t, fmt.Sprintf("{\"id\":\"%s\"}\n", id), rec.Body.String())
}
@@ -88,12 +88,12 @@ func TestGetClient(t *testing.T) {
)
err = cons.GetClient(ctx, id)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
var res queryservice.JobClient
err = json.Unmarshal(rec.Body.Bytes(), &res)
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, queryservice.JobClient{
Id: id,
Name: "client_name",
@@ -120,7 +120,7 @@ func TestUpdateClient(t *testing.T) {
CanSync: &cs,
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -142,7 +142,7 @@ func TestUpdateClient(t *testing.T) {
pool.ExpectCommit()
err = cons.UpdateClient(ctx, id)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Empty(t, rec.Body.String())
}
api/queryService/controllers.go
+2
View File
@@ -10,6 +10,8 @@ import (
"github.com/go-playground/validator/v10"
)
const Name = "queryService"
type Services struct {
Export *export.Service
Collector *collector.Service
api/queryService/export_test.go
+2 -2
View File
@@ -22,7 +22,7 @@ func TestTriggerExport(t *testing.T) {
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{})
err := cons.TriggerExport(ctx)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.NotEmpty(t, rec.Body.String())
}
@@ -38,7 +38,7 @@ func TestExportState(t *testing.T) {
id := uuid.New()
err := cons.ExportState(ctx, id)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.NotEmpty(t, rec.Body.String())
}
api/queryService/job_test.go
+6 -6
View File
@@ -49,7 +49,7 @@ func TestCreateJob(t *testing.T) {
ClientId: uuid.New(),
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -71,7 +71,7 @@ func TestCreateJob(t *testing.T) {
pool.ExpectCommit()
err = cons.CreateJob(ctx)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusCreated, rec.Code)
assert.Equal(t, fmt.Sprintf("{\"id\":\"%s\"}\n", id), rec.Body.String())
}
@@ -113,12 +113,12 @@ func TestGetJob(t *testing.T) {
)
err = cons.GetJob(ctx, j.ID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
var res queryservice.Job
err = json.Unmarshal(rec.Body.Bytes(), &res)
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, queryservice.Job{
Id: j.ID,
ClientId: j.ClientID,
@@ -152,7 +152,7 @@ func TestUpdateJob(t *testing.T) {
CanSync: &ucs,
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -180,7 +180,7 @@ func TestUpdateJob(t *testing.T) {
pool.ExpectCommit()
err = cons.UpdateJob(ctx, j.ID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Empty(t, rec.Body.String())
}
api/queryService/jobcollector_test.go
+4 -4
View File
@@ -36,7 +36,7 @@ func TestUpdateJobCollector(t *testing.T) {
ActiveVersion: &av,
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -72,7 +72,7 @@ func TestUpdateJobCollector(t *testing.T) {
pool.ExpectCommit()
err = cons.UpdateJobCollectorByJobId(ctx, current.JobID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Empty(t, rec.Body.String())
}
@@ -114,12 +114,12 @@ func TestGetJobCollectorByJobId(t *testing.T) {
)
err = cons.GetJobCollectorByJobId(ctx, coll.JobID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
var res queryservice.JobCollector
err = json.Unmarshal(rec.Body.Bytes(), &res)
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, queryservice.JobCollector{
JobId: coll.JobID,
MinimumCleanerVersion: coll.MinCleanVersion,
api/queryService/parse_test.go
+11 -11
View File
@@ -25,7 +25,7 @@ func TestParseQueries(t *testing.T) {
},
}
out, err := parseQueries(in)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, out, len(in))
assert.ElementsMatch(t, []Query{
{
@@ -54,7 +54,7 @@ func TestParseQuery(t *testing.T) {
Config: &cfg,
}
out, err := parseQuery(in)
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, Query{
Id: in.ID,
Type: CONTEXTFULL,
@@ -76,7 +76,7 @@ func TestParseQueryMinimal(t *testing.T) {
LatestVersion: 2,
}
out, err := parseQuery(in)
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, Query{
Id: in.ID,
Type: CONTEXTFULL,
@@ -88,39 +88,39 @@ func TestParseQueryMinimal(t *testing.T) {
func TestParseQueryType(t *testing.T) {
qt, err := parseQueryType(resultprocessor.TypeContextFull)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, CONTEXTFULL, qt)
qt, err = parseQueryType(resultprocessor.TypeJsonExtractor)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, JSONEXTRACTOR, qt)
_, err = parseQueryType(resultprocessor.Type(-1))
assert.NotNil(t, err)
assert.Error(t, err)
}
func TestParseSpecQueryType(t *testing.T) {
qt, err := parseSpecQueryType(CONTEXTFULL)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, resultprocessor.Type(resultprocessor.TypeContextFull), qt)
qt, err = parseSpecQueryType(JSONEXTRACTOR)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, resultprocessor.Type(resultprocessor.TypeJsonExtractor), qt)
_, err = parseSpecQueryType("invalid")
assert.NotNil(t, err)
assert.Error(t, err)
}
func TestParseStringToUUIDArray(t *testing.T) {
ids := []uuid.UUID{uuid.New()}
out, err := parseStringToUUIDArray(&[]string{ids[0].String()})
assert.Nil(t, err)
assert.NoError(t, err)
assert.ElementsMatch(t, ids, *out)
_, err = parseStringToUUIDArray(&[]string{"invalid_uuid"})
assert.Error(t, err)
out, err = parseStringToUUIDArray(nil)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Nil(t, out)
}
api/queryService/query_test.go
+11 -11
View File
@@ -44,7 +44,7 @@ func TestCreateQuery(t *testing.T) {
Type: queryservice.CONTEXTFULL,
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -62,7 +62,7 @@ func TestCreateQuery(t *testing.T) {
pool.ExpectCommit()
err = cons.CreateQuery(ctx)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusCreated, rec.Code)
assert.Equal(t, fmt.Sprintf("{\"id\":\"%s\"}\n", id), rec.Body.String())
}
@@ -93,12 +93,12 @@ func TestListQueries(t *testing.T) {
)
err = cons.ListQueries(ctx)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
var res queryservice.ListQueries
err = json.Unmarshal(rec.Body.Bytes(), &res)
assert.Nil(t, err)
assert.NoError(t, err)
assert.NotNil(t, res.Queries)
assert.ElementsMatch(t, res.Queries, []queryservice.Query{
{
@@ -138,12 +138,12 @@ func TestGetQuery(t *testing.T) {
)
err = cons.GetQuery(ctx, id)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
var res queryservice.Query
err = json.Unmarshal(rec.Body.Bytes(), &res)
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, queryservice.Query{
Id: id,
Type: queryservice.CONTEXTFULL,
@@ -170,7 +170,7 @@ func TestUpdateQuery(t *testing.T) {
ActiveVersion: &av,
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -193,7 +193,7 @@ func TestUpdateQuery(t *testing.T) {
pool.ExpectCommit()
err = cons.UpdateQuery(ctx, id)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Empty(t, rec.Body.String())
}
@@ -241,7 +241,7 @@ func TestTestQuery(t *testing.T) {
QueryVersion: params.QueryVersion,
}
bodyBytes, err := json.Marshal(body)
assert.Nil(t, err)
assert.NoError(t, err)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(bodyBytes)))
@@ -275,12 +275,12 @@ func TestTestQuery(t *testing.T) {
)
err = cons.TestQuery(ctx, params.QueryID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
var res queryservice.QueryTestResponse
err = json.Unmarshal(rec.Body.Bytes(), &res)
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, queryservice.QueryTestResponse{
Value: "old_value",
}, res)