Skip to content

run v4 cmd #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amberxu25 merged 6 commits into from
Nov 17, 2025
Merged

run v4 cmd #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27c0c4e
run v4 cmd and unit test
amberxu25 Nov 10, 2025
7c857ad
updated doc
amberxu25 Nov 10, 2025
29ff9ca
renamed original run test to run v3
amberxu25 Nov 10, 2025
794e882
Updated struct name in jobs
amberxu25 Nov 10, 2025
ce5d976
Simplified reworded flags in version change
amberxu25 Nov 13, 2025
1730a98
Updated doc to better help v3 users giving flags
amberxu25 Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ func buildFmeFlowRequest(endpoint string, method string, body io.Reader) (http.R
}

// since the JSON for published parameters has subtypes, we need to implement this ourselves
func (f *JobRequest) UnmarshalJSON(b []byte) error {
type job JobRequest
func (f *JobRequestV3) UnmarshalJSON(b []byte) error {
type job JobRequestV3
err := json.Unmarshal(b, (*job)(f))
if err != nil {
return err
Expand Down Expand Up @@ -85,9 +85,9 @@ func (f *JobRequest) UnmarshalJSON(b []byte) error {
return nil
}

func (f *JobRequest) MarshalJSON() ([]byte, error) {
func (f *JobRequestV3) MarshalJSON() ([]byte, error) {

type job JobRequest
type job JobRequestV3
if f.PublishedParameters != nil {
for _, v := range f.PublishedParameters {
b, err := json.Marshal(v)
Expand Down
44 changes: 22 additions & 22 deletions cmd/jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,28 @@ type JobStatusV4 struct {
}

type JobStatusV3 struct {
Request JobRequest `json:"request"`
TimeDelivered time.Time `json:"timeDelivered"`
Workspace string `json:"workspace"`
NumErrors int `json:"numErrors"`
NumLines int `json:"numLines"`
EngineHost string `json:"engineHost"`
TimeQueued time.Time `json:"timeQueued"`
CPUPct float64 `json:"cpuPct"`
Description string `json:"description"`
TimeStarted time.Time `json:"timeStarted"`
Repository string `json:"repository"`
UserName string `json:"userName"`
Result JobResult `json:"result"`
CPUTime int `json:"cpuTime"`
ID int `json:"id"`
TimeFinished time.Time `json:"timeFinished"`
EngineName string `json:"engineName"`
NumWarnings int `json:"numWarnings"`
TimeSubmitted time.Time `json:"timeSubmitted"`
ElapsedTime int `json:"elapsedTime"`
PeakMemUsage int `json:"peakMemUsage"`
Status string `json:"status"`
Request JobRequestV3 `json:"request"`
TimeDelivered time.Time `json:"timeDelivered"`
Workspace string `json:"workspace"`
NumErrors int `json:"numErrors"`
NumLines int `json:"numLines"`
EngineHost string `json:"engineHost"`
TimeQueued time.Time `json:"timeQueued"`
CPUPct float64 `json:"cpuPct"`
Description string `json:"description"`
TimeStarted time.Time `json:"timeStarted"`
Repository string `json:"repository"`
UserName string `json:"userName"`
Result JobResultV3 `json:"result"`
CPUTime int `json:"cpuTime"`
ID int `json:"id"`
TimeFinished time.Time `json:"timeFinished"`
EngineName string `json:"engineName"`
NumWarnings int `json:"numWarnings"`
TimeSubmitted time.Time `json:"timeSubmitted"`
ElapsedTime int `json:"elapsedTime"`
PeakMemUsage int `json:"peakMemUsage"`
Status string `json:"status"`
}

type JobsV4 struct {
Expand Down
Loading