From fe567ee9660a8019fe21fa7c917349364fb1c733 Mon Sep 17 00:00:00 2001 From: Ezequiel Torres Feyuk Date: Thu, 28 Jun 2018 15:48:28 -0300 Subject: [PATCH] Task query optional parameters (#69) * Change TaskQuery struct parameters to optional * Thrift API is modified to make all the parameters in the TaskQuery struct optional * Autogenerated code is regenerated * Changes in TaskQuery structs used in the project * Now that TaskQuery receive optional values, pointers instead of values must be passed to the struct --- auroraAPI.thrift | 20 +- examples/client.go | 12 +- gen-go/apache/aurora/ttypes.go | 365 +++++++++++++++++++++------------ realis.go | 12 +- realis_e2e_test.go | 6 +- 5 files changed, 253 insertions(+), 162 deletions(-) diff --git a/auroraAPI.thrift b/auroraAPI.thrift index 6236523..8acd4f3 100644 --- a/auroraAPI.thrift +++ b/auroraAPI.thrift @@ -540,16 +540,16 @@ struct GetJobsResult { * (terms are AND'ed together). */ struct TaskQuery { - 14: string role - 9: string environment - 2: string jobName - 4: set taskIds - 5: set statuses - 7: set instanceIds - 10: set slaveHosts - 11: set jobKeys - 12: i32 offset - 13: i32 limit + 14: optional string role + 9: optional string environment + 2: optional string jobName + 4: optional set taskIds + 5: optional set statuses + 7: optional set instanceIds + 10: optional set slaveHosts + 11: optional set jobKeys + 12: optional i32 offset + 13: optional i32 limit } struct HostStatus { diff --git a/examples/client.go b/examples/client.go index dc71f8e..5eae5c4 100644 --- a/examples/client.go +++ b/examples/client.go @@ -553,9 +553,9 @@ func main() { case "taskStatus": fmt.Println("Getting task status") taskQ := &aurora.TaskQuery{ - Role: job.JobKey().Role, - Environment: job.JobKey().Environment, - JobName: job.JobKey().Name, + Role: &job.JobKey().Role, + Environment: &job.JobKey().Environment, + JobName: &job.JobKey().Name, } tasks, err := r.GetTaskStatus(taskQ) if err != nil { @@ -567,9 +567,9 @@ func main() { case "tasksWithoutConfig": fmt.Println("Getting task status") taskQ := &aurora.TaskQuery{ - Role: job.JobKey().Role, - Environment: job.JobKey().Environment, - JobName: job.JobKey().Name, + Role: &job.JobKey().Role, + Environment: &job.JobKey().Environment, + JobName: &job.JobKey().Name, } tasks, err := r.GetTasksWithoutConfigs(taskQ) if err != nil { diff --git a/gen-go/apache/aurora/ttypes.go b/gen-go/apache/aurora/ttypes.go index 4d8fa54..1bb406a 100644 --- a/gen-go/apache/aurora/ttypes.go +++ b/gen-go/apache/aurora/ttypes.go @@ -8020,64 +8020,139 @@ func (p *GetJobsResult_) String() string { // - Limit type TaskQuery struct { // unused field # 1 - JobName string `thrift:"jobName,2" json:"jobName"` + JobName *string `thrift:"jobName,2" json:"jobName,omitempty"` // unused field # 3 - TaskIds map[string]bool `thrift:"taskIds,4" json:"taskIds"` - Statuses map[ScheduleStatus]bool `thrift:"statuses,5" json:"statuses"` + TaskIds map[string]bool `thrift:"taskIds,4" json:"taskIds,omitempty"` + Statuses map[ScheduleStatus]bool `thrift:"statuses,5" json:"statuses,omitempty"` // unused field # 6 - InstanceIds map[int32]bool `thrift:"instanceIds,7" json:"instanceIds"` + InstanceIds map[int32]bool `thrift:"instanceIds,7" json:"instanceIds,omitempty"` // unused field # 8 - Environment string `thrift:"environment,9" json:"environment"` - SlaveHosts map[string]bool `thrift:"slaveHosts,10" json:"slaveHosts"` - JobKeys map[*JobKey]bool `thrift:"jobKeys,11" json:"jobKeys"` - Offset int32 `thrift:"offset,12" json:"offset"` - Limit int32 `thrift:"limit,13" json:"limit"` - Role string `thrift:"role,14" json:"role"` + Environment *string `thrift:"environment,9" json:"environment,omitempty"` + SlaveHosts map[string]bool `thrift:"slaveHosts,10" json:"slaveHosts,omitempty"` + JobKeys map[*JobKey]bool `thrift:"jobKeys,11" json:"jobKeys,omitempty"` + Offset *int32 `thrift:"offset,12" json:"offset,omitempty"` + Limit *int32 `thrift:"limit,13" json:"limit,omitempty"` + Role *string `thrift:"role,14" json:"role,omitempty"` } func NewTaskQuery() *TaskQuery { return &TaskQuery{} } +var TaskQuery_Role_DEFAULT string + func (p *TaskQuery) GetRole() string { - return p.Role + if !p.IsSetRole() { + return TaskQuery_Role_DEFAULT + } + return *p.Role } +var TaskQuery_Environment_DEFAULT string + func (p *TaskQuery) GetEnvironment() string { - return p.Environment + if !p.IsSetEnvironment() { + return TaskQuery_Environment_DEFAULT + } + return *p.Environment } +var TaskQuery_JobName_DEFAULT string + func (p *TaskQuery) GetJobName() string { - return p.JobName + if !p.IsSetJobName() { + return TaskQuery_JobName_DEFAULT + } + return *p.JobName } +var TaskQuery_TaskIds_DEFAULT map[string]bool + func (p *TaskQuery) GetTaskIds() map[string]bool { return p.TaskIds } +var TaskQuery_Statuses_DEFAULT map[ScheduleStatus]bool + func (p *TaskQuery) GetStatuses() map[ScheduleStatus]bool { return p.Statuses } +var TaskQuery_InstanceIds_DEFAULT map[int32]bool + func (p *TaskQuery) GetInstanceIds() map[int32]bool { return p.InstanceIds } +var TaskQuery_SlaveHosts_DEFAULT map[string]bool + func (p *TaskQuery) GetSlaveHosts() map[string]bool { return p.SlaveHosts } +var TaskQuery_JobKeys_DEFAULT map[*JobKey]bool + func (p *TaskQuery) GetJobKeys() map[*JobKey]bool { return p.JobKeys } +var TaskQuery_Offset_DEFAULT int32 + func (p *TaskQuery) GetOffset() int32 { - return p.Offset + if !p.IsSetOffset() { + return TaskQuery_Offset_DEFAULT + } + return *p.Offset } +var TaskQuery_Limit_DEFAULT int32 + func (p *TaskQuery) GetLimit() int32 { - return p.Limit + if !p.IsSetLimit() { + return TaskQuery_Limit_DEFAULT + } + return *p.Limit } +func (p *TaskQuery) IsSetRole() bool { + return p.Role != nil +} + +func (p *TaskQuery) IsSetEnvironment() bool { + return p.Environment != nil +} + +func (p *TaskQuery) IsSetJobName() bool { + return p.JobName != nil +} + +func (p *TaskQuery) IsSetTaskIds() bool { + return p.TaskIds != nil +} + +func (p *TaskQuery) IsSetStatuses() bool { + return p.Statuses != nil +} + +func (p *TaskQuery) IsSetInstanceIds() bool { + return p.InstanceIds != nil +} + +func (p *TaskQuery) IsSetSlaveHosts() bool { + return p.SlaveHosts != nil +} + +func (p *TaskQuery) IsSetJobKeys() bool { + return p.JobKeys != nil +} + +func (p *TaskQuery) IsSetOffset() bool { + return p.Offset != nil +} + +func (p *TaskQuery) IsSetLimit() bool { + return p.Limit != nil +} + func (p *TaskQuery) Read(iprot thrift.TProtocol) error { if _, err := iprot.ReadStructBegin(); err != nil { return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) @@ -8151,7 +8226,7 @@ func (p *TaskQuery) readField14(iprot thrift.TProtocol) error { if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 14: ", err) } else { - p.Role = v + p.Role = &v } return nil } @@ -8160,7 +8235,7 @@ func (p *TaskQuery) readField9(iprot thrift.TProtocol) error { if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 9: ", err) } else { - p.Environment = v + p.Environment = &v } return nil } @@ -8169,7 +8244,7 @@ func (p *TaskQuery) readField2(iprot thrift.TProtocol) error { if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 2: ", err) } else { - p.JobName = v + p.JobName = &v } return nil } @@ -8287,7 +8362,7 @@ func (p *TaskQuery) readField12(iprot thrift.TProtocol) error { if v, err := iprot.ReadI32(); err != nil { return thrift.PrependError("error reading field 12: ", err) } else { - p.Offset = v + p.Offset = &v } return nil } @@ -8296,7 +8371,7 @@ func (p *TaskQuery) readField13(iprot thrift.TProtocol) error { if v, err := iprot.ReadI32(); err != nil { return thrift.PrependError("error reading field 13: ", err) } else { - p.Limit = v + p.Limit = &v } return nil } @@ -8345,171 +8420,191 @@ func (p *TaskQuery) Write(oprot thrift.TProtocol) error { } func (p *TaskQuery) writeField2(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("jobName", thrift.STRING, 2); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:jobName: ", p), err) - } - if err := oprot.WriteString(string(p.JobName)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T.jobName (2) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 2:jobName: ", p), err) + if p.IsSetJobName() { + if err := oprot.WriteFieldBegin("jobName", thrift.STRING, 2); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:jobName: ", p), err) + } + if err := oprot.WriteString(string(*p.JobName)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T.jobName (2) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 2:jobName: ", p), err) + } } return err } func (p *TaskQuery) writeField4(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("taskIds", thrift.SET, 4); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:taskIds: ", p), err) - } - if err := oprot.WriteSetBegin(thrift.STRING, len(p.TaskIds)); err != nil { - return thrift.PrependError("error writing set begin: ", err) - } - for v, _ := range p.TaskIds { - if err := oprot.WriteString(string(v)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + if p.IsSetTaskIds() { + if err := oprot.WriteFieldBegin("taskIds", thrift.SET, 4); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:taskIds: ", p), err) + } + if err := oprot.WriteSetBegin(thrift.STRING, len(p.TaskIds)); err != nil { + return thrift.PrependError("error writing set begin: ", err) + } + for v, _ := range p.TaskIds { + if err := oprot.WriteString(string(v)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + } + if err := oprot.WriteSetEnd(); err != nil { + return thrift.PrependError("error writing set end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 4:taskIds: ", p), err) } - } - if err := oprot.WriteSetEnd(); err != nil { - return thrift.PrependError("error writing set end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 4:taskIds: ", p), err) } return err } func (p *TaskQuery) writeField5(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("statuses", thrift.SET, 5); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:statuses: ", p), err) - } - if err := oprot.WriteSetBegin(thrift.I32, len(p.Statuses)); err != nil { - return thrift.PrependError("error writing set begin: ", err) - } - for v, _ := range p.Statuses { - if err := oprot.WriteI32(int32(v)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + if p.IsSetStatuses() { + if err := oprot.WriteFieldBegin("statuses", thrift.SET, 5); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:statuses: ", p), err) + } + if err := oprot.WriteSetBegin(thrift.I32, len(p.Statuses)); err != nil { + return thrift.PrependError("error writing set begin: ", err) + } + for v, _ := range p.Statuses { + if err := oprot.WriteI32(int32(v)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + } + if err := oprot.WriteSetEnd(); err != nil { + return thrift.PrependError("error writing set end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 5:statuses: ", p), err) } - } - if err := oprot.WriteSetEnd(); err != nil { - return thrift.PrependError("error writing set end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 5:statuses: ", p), err) } return err } func (p *TaskQuery) writeField7(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("instanceIds", thrift.SET, 7); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:instanceIds: ", p), err) - } - if err := oprot.WriteSetBegin(thrift.I32, len(p.InstanceIds)); err != nil { - return thrift.PrependError("error writing set begin: ", err) - } - for v, _ := range p.InstanceIds { - if err := oprot.WriteI32(int32(v)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + if p.IsSetInstanceIds() { + if err := oprot.WriteFieldBegin("instanceIds", thrift.SET, 7); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:instanceIds: ", p), err) + } + if err := oprot.WriteSetBegin(thrift.I32, len(p.InstanceIds)); err != nil { + return thrift.PrependError("error writing set begin: ", err) + } + for v, _ := range p.InstanceIds { + if err := oprot.WriteI32(int32(v)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + } + if err := oprot.WriteSetEnd(); err != nil { + return thrift.PrependError("error writing set end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 7:instanceIds: ", p), err) } - } - if err := oprot.WriteSetEnd(); err != nil { - return thrift.PrependError("error writing set end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 7:instanceIds: ", p), err) } return err } func (p *TaskQuery) writeField9(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("environment", thrift.STRING, 9); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:environment: ", p), err) - } - if err := oprot.WriteString(string(p.Environment)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T.environment (9) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 9:environment: ", p), err) + if p.IsSetEnvironment() { + if err := oprot.WriteFieldBegin("environment", thrift.STRING, 9); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:environment: ", p), err) + } + if err := oprot.WriteString(string(*p.Environment)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T.environment (9) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 9:environment: ", p), err) + } } return err } func (p *TaskQuery) writeField10(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("slaveHosts", thrift.SET, 10); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:slaveHosts: ", p), err) - } - if err := oprot.WriteSetBegin(thrift.STRING, len(p.SlaveHosts)); err != nil { - return thrift.PrependError("error writing set begin: ", err) - } - for v, _ := range p.SlaveHosts { - if err := oprot.WriteString(string(v)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + if p.IsSetSlaveHosts() { + if err := oprot.WriteFieldBegin("slaveHosts", thrift.SET, 10); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:slaveHosts: ", p), err) + } + if err := oprot.WriteSetBegin(thrift.STRING, len(p.SlaveHosts)); err != nil { + return thrift.PrependError("error writing set begin: ", err) + } + for v, _ := range p.SlaveHosts { + if err := oprot.WriteString(string(v)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) + } + } + if err := oprot.WriteSetEnd(); err != nil { + return thrift.PrependError("error writing set end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 10:slaveHosts: ", p), err) } - } - if err := oprot.WriteSetEnd(); err != nil { - return thrift.PrependError("error writing set end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 10:slaveHosts: ", p), err) } return err } func (p *TaskQuery) writeField11(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("jobKeys", thrift.SET, 11); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:jobKeys: ", p), err) - } - if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.JobKeys)); err != nil { - return thrift.PrependError("error writing set begin: ", err) - } - for v, _ := range p.JobKeys { - if err := v.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err) + if p.IsSetJobKeys() { + if err := oprot.WriteFieldBegin("jobKeys", thrift.SET, 11); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:jobKeys: ", p), err) + } + if err := oprot.WriteSetBegin(thrift.STRUCT, len(p.JobKeys)); err != nil { + return thrift.PrependError("error writing set begin: ", err) + } + for v, _ := range p.JobKeys { + if err := v.Write(oprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err) + } + } + if err := oprot.WriteSetEnd(); err != nil { + return thrift.PrependError("error writing set end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 11:jobKeys: ", p), err) } - } - if err := oprot.WriteSetEnd(); err != nil { - return thrift.PrependError("error writing set end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 11:jobKeys: ", p), err) } return err } func (p *TaskQuery) writeField12(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("offset", thrift.I32, 12); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:offset: ", p), err) - } - if err := oprot.WriteI32(int32(p.Offset)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T.offset (12) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 12:offset: ", p), err) + if p.IsSetOffset() { + if err := oprot.WriteFieldBegin("offset", thrift.I32, 12); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:offset: ", p), err) + } + if err := oprot.WriteI32(int32(*p.Offset)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T.offset (12) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 12:offset: ", p), err) + } } return err } func (p *TaskQuery) writeField13(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("limit", thrift.I32, 13); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:limit: ", p), err) - } - if err := oprot.WriteI32(int32(p.Limit)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T.limit (13) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 13:limit: ", p), err) + if p.IsSetLimit() { + if err := oprot.WriteFieldBegin("limit", thrift.I32, 13); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:limit: ", p), err) + } + if err := oprot.WriteI32(int32(*p.Limit)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T.limit (13) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 13:limit: ", p), err) + } } return err } func (p *TaskQuery) writeField14(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("role", thrift.STRING, 14); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:role: ", p), err) - } - if err := oprot.WriteString(string(p.Role)); err != nil { - return thrift.PrependError(fmt.Sprintf("%T.role (14) field write error: ", p), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 14:role: ", p), err) + if p.IsSetRole() { + if err := oprot.WriteFieldBegin("role", thrift.STRING, 14); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:role: ", p), err) + } + if err := oprot.WriteString(string(*p.Role)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T.role (14) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 14:role: ", p), err) + } } return err } diff --git a/realis.go b/realis.go index 82a5eac..3e4837a 100644 --- a/realis.go +++ b/realis.go @@ -497,9 +497,9 @@ func (r *realisClient) Close() { // Uses predefined set of states to retrieve a set of active jobs in Apache Aurora. func (r *realisClient) GetInstanceIds(key *aurora.JobKey, states map[aurora.ScheduleStatus]bool) (map[int32]bool, error) { taskQ := &aurora.TaskQuery{ - Role: key.Role, - Environment: key.Environment, - JobName: key.Name, + Role: &key.Role, + Environment: &key.Environment, + JobName: &key.Name, Statuses: states, } @@ -880,9 +880,9 @@ func (r *realisClient) FetchTaskConfig(instKey aurora.InstanceKey) (*aurora.Task ids[instKey.InstanceId] = true taskQ := &aurora.TaskQuery{ - Role: instKey.JobKey.Role, - Environment: instKey.JobKey.Environment, - JobName: instKey.JobKey.Name, + Role: &instKey.JobKey.Role, + Environment: &instKey.JobKey.Environment, + JobName: &instKey.JobKey.Name, InstanceIds: ids, Statuses: aurora.ACTIVE_STATES, } diff --git a/realis_e2e_test.go b/realis_e2e_test.go index 342dbb1..cbf2804 100644 --- a/realis_e2e_test.go +++ b/realis_e2e_test.go @@ -75,11 +75,7 @@ func TestNonExistentEndpoint(t *testing.T) { ) defer r.Close() - taskQ := &aurora.TaskQuery{ - Role: "no", - Environment: "task", - JobName: "here", - } + taskQ := &aurora.TaskQuery{} _, err = r.GetTasksWithoutConfigs(taskQ)