style: typos in fucntion names and comments

hashicorp · Mar 11, 2024 · 7a2740a · 7a2740a
1 parent 8000e15
commit 7a2740a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -11438,11 +11438,11 @@ func (a *Allocation) NeedsToReconnect() bool {
 	return disconnected
 }
 
-// LeaderOrMainTaskInInGroup will return the leader task in the allocation
+// LeaderOrMainTaskInGroup will return the leader task in the allocation
 // if there is one, otherwise it will return the first task that run as main.
 // If the task group is no longer present or there are no tasks in it, it
 // will return nil.
-func (a *Allocation) LeaderOrMainTaskInInGroup(tg *TaskGroup) *Task {
+func (a *Allocation) LeaderOrMainTaskInGroup(tg *TaskGroup) *Task {
 	if tg == nil {
 		return nil
 	}
@@ -11476,7 +11476,7 @@ func (a *Allocation) LeaderOrMainTaskInInGroup(tg *TaskGroup) *Task {
 	return task
 }
 
-// LatestStartOfTask returns the time of the last start event for the given task
+// LastStartOfTask returns the time of the last start event for the given task
 // using the allocations TaskStates. If the task has not started, the zero time
 // will be returned.
 func (a *Allocation) LastStartOfTask(taskName string) time.Time {

diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go
@@ -5915,14 +5915,14 @@ func TestAllocation_RescheduleTimeOnDisconnect(t *testing.T) {
 			taskGroup:       "web",
 			disconnectGroup: nil,
 			expected:        true,
-			expectedTime:    testNow.Add(RestartPolicyMinInterval), // RestartPolicyMinInterval is de default value
+			expectedTime:    testNow.Add(RestartPolicyMinInterval), // RestartPolicyMinInterval is the default value
 		},
 		{
 			name:            "empty_disconnect_group",
 			taskGroup:       "web",
 			disconnectGroup: &DisconnectStrategy{},
 			expected:        true,
-			expectedTime:    testNow.Add(RestartPolicyMinInterval), // RestartPolicyMinInterval is de default value
+			expectedTime:    testNow.Add(RestartPolicyMinInterval), // RestartPolicyMinInterval is the default value
 		},
 		{
 			name:      "replace_enabled",
@@ -5959,7 +5959,7 @@ func TestAllocation_RescheduleTimeOnDisconnect(t *testing.T) {
 	}
 }
 
-func TestAllocation_LeaderOrMainTaskInInGroup(t *testing.T) {
+func TestAllocation_LeaderOrMainTaskInGroup(t *testing.T) {
 	ci.Parallel(t)
 
 	taskGroupNoTasks := &TaskGroup{
@@ -6080,7 +6080,7 @@ func TestAllocation_LeaderOrMainTaskInInGroup(t *testing.T) {
 		ta := testAlloc.Copy()
 		ta.TaskGroup = tc.taskGroup.Name
 
-		got := ta.LeaderOrMainTaskInInGroup(tc.taskGroup)
+		got := ta.LeaderOrMainTaskInGroup(tc.taskGroup)
 		must.Eq(t, tc.expected, got)
 	}
 }

diff --git a/scheduler/reconnecting_picker/reconnecting_picker.go b/scheduler/reconnecting_picker/reconnecting_picker.go
@@ -94,7 +94,7 @@ func (rp *ReconnectingPicker) pickReplacement(_ *structs.Allocation, replacement
 func (rp *ReconnectingPicker) pickLongestRunning(original *structs.Allocation, replacement *structs.Allocation) *structs.Allocation {
 	tg := original.Job.LookupTaskGroup(original.TaskGroup)
 
-	lt := original.LeaderOrMainTaskInInGroup(tg)
+	lt := original.LeaderOrMainTaskInGroup(tg)
 
 	if lt == nil {
 		return replacement