diff --git a/components/compliance-service/dao/pgdb/agents.go b/components/compliance-service/dao/pgdb/agents.go index 383b78e4d12..6c84380b349 100644 --- a/components/compliance-service/dao/pgdb/agents.go +++ b/components/compliance-service/dao/pgdb/agents.go @@ -3,5 +3,5 @@ package pgdb type agent struct { ID string `db:"id"` Type string `db:"type"` - Status string `db:"Status"` + Status string `db:"status"` } diff --git a/components/compliance-service/dao/pgdb/jobs.go b/components/compliance-service/dao/pgdb/jobs.go index 927eba3a62e..7d08dce643b 100644 --- a/components/compliance-service/dao/pgdb/jobs.go +++ b/components/compliance-service/dao/pgdb/jobs.go @@ -39,7 +39,7 @@ SELECT j.id, j.name, j.type, - j.Status, + j.status, j.start_time, j.end_time, j.timeout, @@ -87,7 +87,7 @@ FROM jobs j FROM (SELECT r.node_id, r.report_id, - r.Status, + r.status, r.result, r.start_time, r.end_time) x)) AS results_agg, @@ -103,7 +103,7 @@ SELECT j.id, j.name, j.type, - j.Status, + j.status, j.start_time, j.end_time, j.parent_id, @@ -154,7 +154,7 @@ WHERE job_id = $1 ` const selectResultByJobAndNodeIds = ` -SELECT job_id, Status, result, start_time, end_time, report_id +SELECT job_id, status, result, start_time, end_time, report_id FROM results WHERE job_id=$1 AND node_id=$2 ORDER BY start_time DESC @@ -166,7 +166,7 @@ LIMIT 1; const sqlGetOWCAScans = ` SELECT j.id, j.end_time FROM jobs j -WHERE recurrence = '' AND type = 'exec' AND (end_time >= $1 OR Status = 'running'); +WHERE recurrence = '' AND type = 'exec' AND (end_time >= $1 OR status = 'running'); ` const selectProfileIdsFromJobsProfilesByJobId = ` @@ -218,7 +218,7 @@ const postgresTimeFormat = "2006-01-02T15:04:05" var jobsSortFields = map[string]string{ "name": "LOWER(j.name)", "type": "LOWER(j.type)", - "Status": "LOWER(j.Status)", + "status": "LOWER(j.status)", "start_time": "j.start_time", "end_time": "j.end_time", } @@ -229,7 +229,7 @@ var jobFilterField = map[string]string{ "name": "name", "parent_job": "parent_id", "profile": "profile", - "Status": "Status", + "status": "status", } // job used to insert to db @@ -243,7 +243,7 @@ type job struct { Timeout int32 `db:"timeout"` Retries int32 `db:"retries"` RetriesLeft int32 `db:"retries_left"` - Status string `db:"Status"` + Status string `db:"status"` Startime time.Time `db:"start_time"` Endtime time.Time `db:"end_time"` NodeSelectors json.RawMessage `db:"node_selectors"` @@ -298,7 +298,7 @@ type ResultsRow struct { JobID string `db:"job_id" json:"job_id,omitempty"` NodeID string `db:"node_id" json:"node_id"` ReportID string `db:"report_id" json:"report_id"` - Status string `db:"Status" json:"Status"` + Status string `db:"status" json:"status"` Result string `db:"result" json:"result"` StartTime time.Time `db:"start_time" json:"start_time"` EndTime time.Time `db:"end_time" json:"end_time"` @@ -423,7 +423,7 @@ func fromDBSelectJob(inSelectJob *jobSelectDetail) (jobs.Job, error) { resultsNew[i] = &jobs.ResultsRow{ NodeId: item["node_id"], ReportId: item["report_id"], - Status: item["Status"], + Status: item["status"], Result: item["result"], } @@ -648,11 +648,11 @@ func validateJobFilters(filters []*common.Filter) error { } } } - case "Status": + case "status": for _, item := range filter.Values { if item != "" { if !isValidJobStatus(item) { - return &errorutils.InvalidError{Msg: fmt.Sprintf("Invalid Status filter: %s. Status must be one of the following: 'completed', 'failed', 'new', 'running', 'scheduled'", item)} + return &errorutils.InvalidError{Msg: fmt.Sprintf("Invalid status filter: %s. status must be one of the following: 'completed', 'failed', 'new', 'running', 'scheduled'", item)} } } }