b3cf7a4f65
Previously:
- There is confusion between nameWithOwner and queryLanguage. Both are strings.
Between
runResult, err := codeql.RunQuery(databasePath, job.QueryLanguage, queryPackPath, tempDir)
(agent.go l205)
and
func RunQuery(database string, nwo string, queryPackPath string, tempDir string) (*RunQueryResult, error)
QueryLanguage is suddenly name with owner in the code.
Added some debugging, the value is the query language in the two places it gets used:
server | 2024/07/03 18:30:15 DEBUG Processed request info location="{Data:map[bucket:packs key:1]}" language=cpp
...
agent | 2024/07/03 18:30:15 DEBUG XX: is nwo a name/owner, or the original callers' queryLanguage? nwo=cpp
...
agent | 2024/07/03 18:30:19 DEBUG XX: 2: is nwo a name/owner, or the original callers' queryLanguage? nwo=cpp
Changes:
- Introduce explicit type QueryLanguage = string and update code to clarify
- inline trivial function
31 lines
1.3 KiB
Go
31 lines
1.3 KiB
Go
package queue
|
|
|
|
import (
|
|
"mrvacommander/pkg/artifactstore"
|
|
"mrvacommander/pkg/common"
|
|
)
|
|
|
|
type QueryLanguage string
|
|
|
|
// AnalyzeJob represents a job specifying a repository and a query pack to analyze it with.
|
|
// This is the message format that the agent receives from the queue.
|
|
// TODO: make query_pack_location query_pack_url with a presigned URL
|
|
type AnalyzeJob struct {
|
|
Spec common.JobSpec // json:"job_spec"
|
|
QueryPackLocation artifactstore.ArtifactLocation // json:"query_pack_location"
|
|
QueryLanguage QueryLanguage // json:"query_language"
|
|
}
|
|
|
|
// AnalyzeResult represents the result of an analysis job.
|
|
// This is the message format that the agent sends to the queue.
|
|
// Status will only ever be StatusSuccess or StatusError when sent in a result.
|
|
// TODO: make result_location result_archive_url with a presigned URL
|
|
type AnalyzeResult struct {
|
|
Spec common.JobSpec // json:"job_spec"
|
|
Status common.Status // json:"status"
|
|
ResultCount int // json:"result_count"
|
|
ResultLocation artifactstore.ArtifactLocation // json:"result_location"
|
|
SourceLocationPrefix string // json:"source_location_prefix"
|
|
DatabaseSHA string // json:"database_sha"
|
|
}
|