remove DispatchIdempotencyToken from JobListStub

hashicorp · Oct 21, 2021 · 39333d9 · 39333d9
1 parent c797570
commit 39333d9
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 64 deletions.
diff --git a/api/jobs.go b/api/jobs.go
@@ -988,24 +988,23 @@ type TaskGroupSummary struct {
 // JobListStub is used to return a subset of information about
 // jobs during list operations.
 type JobListStub struct {
-	ID                       string
-	ParentID                 string
-	Name                     string
-	Namespace                string `json:",omitempty"`
-	Datacenters              []string
-	Type                     string
-	Priority                 int
-	Periodic                 bool
-	ParameterizedJob         bool
-	DispatchIdempotencyToken string
-	Stop                     bool
-	Status                   string
-	StatusDescription        string
-	JobSummary               *JobSummary
-	CreateIndex              uint64
-	ModifyIndex              uint64
-	JobModifyIndex           uint64
-	SubmitTime               int64
+	ID                string
+	ParentID          string
+	Name              string
+	Namespace         string `json:",omitempty"`
+	Datacenters       []string
+	Type              string
+	Priority          int
+	Periodic          bool
+	ParameterizedJob  bool
+	Stop              bool
+	Status            string
+	StatusDescription string
+	JobSummary        *JobSummary
+	CreateIndex       uint64
+	ModifyIndex       uint64
+	JobModifyIndex    uint64
+	SubmitTime        int64
 }
 
 // JobIDSort is used to sort jobs by their job ID's.

diff --git a/command/job_status.go b/command/job_status.go
@@ -189,10 +189,6 @@ func (c *JobStatusCommand) Run(args []string) int {
 		fmt.Sprintf("Parameterized|%v", parameterized),
 	}
 
-	if job.DispatchIdempotencyToken != nil && *job.DispatchIdempotencyToken != "" {
-		basic = append(basic, fmt.Sprintf("Idempotency Token|%v", *job.DispatchIdempotencyToken))
-	}
-
 	if periodic && !parameterized {
 		if *job.Stop {
 			basic = append(basic, "Next Periodic Launch|none (job stopped)")
@@ -306,18 +302,17 @@ func (c *JobStatusCommand) outputParameterizedInfo(client *api.Client, job *api.
 	}
 
 	out := make([]string, 1)
-	out[0] = "ID|Status|Idempotency Token"
+	out[0] = "ID|Status"
 	for _, child := range children {
 		// Ensure that we are only showing jobs whose parent is the requested
 		// job.
 		if child.ParentID != *job.ID {
 			continue
 		}
 
-		out = append(out, fmt.Sprintf("%s|%s|%s",
+		out = append(out, fmt.Sprintf("%s|%s",
 			child.ID,
-			child.Status,
-			child.DispatchIdempotencyToken))
+			child.Status))
 	}
 
 	c.Ui.Output(c.Colorize().Color("\n[bold]Dispatched Jobs[reset]"))

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -4409,25 +4409,24 @@ func (j *Job) HasUpdateStrategy() bool {
 // Stub is used to return a summary of the job
 func (j *Job) Stub(summary *JobSummary) *JobListStub {
 	return &JobListStub{
-		ID:                       j.ID,
-		Namespace:                j.Namespace,
-		ParentID:                 j.ParentID,
-		Name:                     j.Name,
-		Datacenters:              j.Datacenters,
-		Multiregion:              j.Multiregion,
-		Type:                     j.Type,
-		Priority:                 j.Priority,
-		Periodic:                 j.IsPeriodic(),
-		ParameterizedJob:         j.IsParameterized(),
-		DispatchIdempotencyToken: j.DispatchIdempotencyToken,
-		Stop:                     j.Stop,
-		Status:                   j.Status,
-		StatusDescription:        j.StatusDescription,
-		CreateIndex:              j.CreateIndex,
-		ModifyIndex:              j.ModifyIndex,
-		JobModifyIndex:           j.JobModifyIndex,
-		SubmitTime:               j.SubmitTime,
-		JobSummary:               summary,
+		ID:                j.ID,
+		Namespace:         j.Namespace,
+		ParentID:          j.ParentID,
+		Name:              j.Name,
+		Datacenters:       j.Datacenters,
+		Multiregion:       j.Multiregion,
+		Type:              j.Type,
+		Priority:          j.Priority,
+		Periodic:          j.IsPeriodic(),
+		ParameterizedJob:  j.IsParameterized(),
+		Stop:              j.Stop,
+		Status:            j.Status,
+		StatusDescription: j.StatusDescription,
+		CreateIndex:       j.CreateIndex,
+		ModifyIndex:       j.ModifyIndex,
+		JobModifyIndex:    j.JobModifyIndex,
+		SubmitTime:        j.SubmitTime,
+		JobSummary:        summary,
 	}
 }
 
@@ -4582,25 +4581,24 @@ func (j *Job) SetSubmitTime() {
 // JobListStub is used to return a subset of job information
 // for the job list
 type JobListStub struct {
-	ID                       string
-	ParentID                 string
-	Name                     string
-	Namespace                string `json:",omitempty"`
-	Datacenters              []string
-	Multiregion              *Multiregion
-	Type                     string
-	Priority                 int
-	Periodic                 bool
-	ParameterizedJob         bool
-	DispatchIdempotencyToken string
-	Stop                     bool
-	Status                   string
-	StatusDescription        string
-	JobSummary               *JobSummary
-	CreateIndex              uint64
-	ModifyIndex              uint64
-	JobModifyIndex           uint64
-	SubmitTime               int64
+	ID                string
+	ParentID          string
+	Name              string
+	Namespace         string `json:",omitempty"`
+	Datacenters       []string
+	Multiregion       *Multiregion
+	Type              string
+	Priority          int
+	Periodic          bool
+	ParameterizedJob  bool
+	Stop              bool
+	Status            string
+	StatusDescription string
+	JobSummary        *JobSummary
+	CreateIndex       uint64
+	ModifyIndex       uint64
+	JobModifyIndex    uint64
+	SubmitTime        int64
 }
 
 // JobSummary summarizes the state of the allocations of a job