diff --git a/tools/thothctl/internal/workspaceops/operations.go b/tools/thothctl/internal/workspaceops/operations.go index 082a5b2e..0064a894 100644 --- a/tools/thothctl/internal/workspaceops/operations.go +++ b/tools/thothctl/internal/workspaceops/operations.go @@ -103,15 +103,15 @@ func (EvidenceRequest) operatorCommand() string { return "preprocess-evidence func (RunRequest) operatorCommand() string { return "preprocess-run" } func (r InspectRequest) stdinEnvelope() (requestEnvelope, error) { - return requestEnvelope{SchemaVersion: 1, Operation: r.operatorCommand(), WorkspaceID: r.Workspace}, nil + return requestEnvelope{SchemaVersion: 1, WorkspaceID: r.Workspace}, nil } func (r DwhRequest) stdinEnvelope() (requestEnvelope, error) { - return requestEnvelope{SchemaVersion: 1, Operation: r.operatorCommand(), WorkspaceID: r.Workspace, Resume: r.Resume}, nil + return requestEnvelope{SchemaVersion: 1, WorkspaceID: r.Workspace, Resume: r.Resume}, nil } func (r SuggestFksRequest) stdinEnvelope() (requestEnvelope, error) { - envelope := requestEnvelope{SchemaVersion: 1, Operation: r.operatorCommand(), WorkspaceID: r.Workspace, Assume: append([]string(nil), r.Assume...)} + envelope := requestEnvelope{SchemaVersion: 1, WorkspaceID: r.Workspace, Assume: append([]string(nil), r.Assume...)} totalBytes := 0 for _, path := range r.FromSQL { contents, err := safeio.ReadCanonicalUTF8(path, 1<<20) @@ -134,7 +134,6 @@ func (r CheckSchemaRequest) stdinEnvelope() (requestEnvelope, error) { } return requestEnvelope{ SchemaVersion: 1, - Operation: r.operatorCommand(), WorkspaceID: r.Workspace, Annotations: annotations, ReviewedCandidates: r.ReviewedCandidates, @@ -142,27 +141,26 @@ func (r CheckSchemaRequest) stdinEnvelope() (requestEnvelope, error) { } func (r IndexSchemaRequest) stdinEnvelope() (requestEnvelope, error) { - return requestEnvelope{SchemaVersion: 1, Operation: r.operatorCommand(), WorkspaceID: r.Workspace}, nil + return requestEnvelope{SchemaVersion: 1, WorkspaceID: r.Workspace}, nil } func (r EvidenceRequest) stdinEnvelope() (requestEnvelope, error) { - return requestEnvelope{SchemaVersion: 1, Operation: r.operatorCommand(), WorkspaceID: r.Workspace, Resume: r.Resume, DryRun: r.DryRun}, nil + return requestEnvelope{SchemaVersion: 1, WorkspaceID: r.Workspace, Resume: r.Resume, DryRun: r.DryRun}, nil } func (r RunRequest) stdinEnvelope() (requestEnvelope, error) { - return requestEnvelope{SchemaVersion: 1, Operation: r.operatorCommand(), WorkspaceID: r.Workspace, Resume: r.Resume}, nil + return requestEnvelope{SchemaVersion: 1, WorkspaceID: r.Workspace, Resume: r.Resume}, nil } type requestEnvelope struct { - SchemaVersion int `json:"schemaVersion"` - Operation string `json:"operation"` - WorkspaceID string `json:"workspaceId"` - Resume string `json:"resume,omitempty"` - DryRun bool `json:"dryRun,omitempty"` - Assume []string `json:"assume,omitempty"` - SQLFiles []inputFile `json:"sqlFiles,omitempty"` - Annotations string `json:"annotations,omitempty"` - ReviewedCandidates string `json:"reviewedCandidates,omitempty"` + SchemaVersion int `json:"schemaVersion"` + WorkspaceID string `json:"workspaceId"` + Resume string `json:"resumeRunId,omitempty"` + DryRun bool `json:"dryRun,omitempty"` + Assume []string `json:"assume,omitempty"` + SQLFiles []inputFile `json:"fromSql,omitempty"` + Annotations string `json:"annotationsYaml,omitempty"` + ReviewedCandidates string `json:"reviewedCandidatesDigest,omitempty"` } type inputFile struct {