Rename jobIdStr -> jobId , runIdStr -> runId (#3974)

* Rename jobIdStr -> jobId , runIdStr -> runId * Lint Signed-off-by: Chris Martin <[email protected]> * chnage over field names in executor api Signed-off-by: Chris Martin <[email protected]> * fix JobIding! Signed-off-by: Chris Martin <[email protected]> --------- Signed-off-by: Chris Martin <[email protected]>
armadaproject · Sep 30, 2024 · aa98b44 · aa98b44
1 parent d6554a7
commit aa98b44
Show file tree

Hide file tree

Showing 43 changed files with 1,408 additions and 1,407 deletions.
diff --git a/internal/common/eventutil/eventutil.go b/internal/common/eventutil/eventutil.go
@@ -139,7 +139,7 @@ func ApiJobFromLogSubmitJob(ownerId string, groups []string, queueName string, j
 	}
 
 	return &api.Job{
-		Id:       e.JobIdStr,
+		Id:       e.JobId,
 		ClientId: e.DeduplicationId,
 		Queue:    queueName,
 		JobSetId: jobSetName,

diff --git a/internal/common/eventutil/eventutil_test.go b/internal/common/eventutil/eventutil_test.go
@@ -269,7 +269,7 @@ func TestSequenceEventListSizeBytes(t *testing.T) {
 			{
 				Event: &armadaevents.EventSequence_Event_CancelledJob{
 					CancelledJob: &armadaevents.CancelledJob{
-						JobIdStr: jobId,
+						JobId: jobId,
 					},
 				},
 			},
@@ -291,9 +291,9 @@ func TestLimitSequencesEventMessageCount(t *testing.T) {
 			JobSetName: "jobSetName1",
 			Groups:     []string{"group1", "group2"},
 			Events: []*armadaevents.EventSequence_Event{
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "a"}}},
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "b"}}},
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "c"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "a"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "b"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "c"}}},
 			},
 		},
 		{
@@ -302,8 +302,8 @@ func TestLimitSequencesEventMessageCount(t *testing.T) {
 			JobSetName: "jobSetName1",
 			Groups:     []string{"group1", "group2"},
 			Events: []*armadaevents.EventSequence_Event{
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "d"}}},
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "e"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "d"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "e"}}},
 			},
 		},
 	}
@@ -315,8 +315,8 @@ func TestLimitSequencesEventMessageCount(t *testing.T) {
 			JobSetName: "jobSetName1",
 			Groups:     []string{"group1", "group2"},
 			Events: []*armadaevents.EventSequence_Event{
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "a"}}},
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "b"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "a"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "b"}}},
 			},
 		},
 		{
@@ -325,7 +325,7 @@ func TestLimitSequencesEventMessageCount(t *testing.T) {
 			JobSetName: "jobSetName1",
 			Groups:     []string{"group1", "group2"},
 			Events: []*armadaevents.EventSequence_Event{
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "c"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "c"}}},
 			},
 		},
 		{
@@ -334,8 +334,8 @@ func TestLimitSequencesEventMessageCount(t *testing.T) {
 			JobSetName: "jobSetName1",
 			Groups:     []string{"group1", "group2"},
 			Events: []*armadaevents.EventSequence_Event{
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "d"}}},
-				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobIdStr: "e"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "d"}}},
+				{Event: &armadaevents.EventSequence_Event_SubmitJob{SubmitJob: &armadaevents.SubmitJob{JobId: "e"}}},
 			},
 		},
 	}

diff --git a/internal/common/ingest/ingestion_pipeline_test.go b/internal/common/ingest/ingestion_pipeline_test.go
@@ -38,8 +38,8 @@ var succeeded = &armadaevents.EventSequence{
 			Created: baseTimeProto,
 			Event: &armadaevents.EventSequence_Event_JobRunSucceeded{
 				JobRunSucceeded: &armadaevents.JobRunSucceeded{
-					RunIdStr: runId,
-					JobIdStr: jobId,
+					RunId: runId,
+					JobId: jobId,
 				},
 			},
 		},
@@ -55,8 +55,8 @@ var pendingAndRunning = &armadaevents.EventSequence{
 			Created: baseTimeProto,
 			Event: &armadaevents.EventSequence_Event_JobRunLeased{
 				JobRunLeased: &armadaevents.JobRunLeased{
-					RunIdStr:   runId,
-					JobIdStr:   jobId,
+					RunId:      runId,
+					JobId:      jobId,
 					ExecutorId: "k8sId1",
 				},
 			},
@@ -65,8 +65,8 @@ var pendingAndRunning = &armadaevents.EventSequence{
 			Created: baseTimeProto,
 			Event: &armadaevents.EventSequence_Event_JobRunRunning{
 				JobRunRunning: &armadaevents.JobRunRunning{
-					RunIdStr: runId,
-					JobIdStr: jobId,
+					RunId: runId,
+					JobId: jobId,
 				},
 			},
 		},
@@ -82,8 +82,8 @@ var failed = &armadaevents.EventSequence{
 			Created: baseTimeProto,
 			Event: &armadaevents.EventSequence_Event_JobRunErrors{
 				JobRunErrors: &armadaevents.JobRunErrors{
-					RunIdStr: runId,
-					JobIdStr: jobId,
+					RunId: runId,
+					JobId: jobId,
 					Errors: []*armadaevents.Error{
 						{
 							Terminal: true,
@@ -97,7 +97,7 @@ var failed = &armadaevents.EventSequence{
 			Created: baseTimeProto,
 			Event: &armadaevents.EventSequence_Event_JobErrors{
 				JobErrors: &armadaevents.JobErrors{
-					JobIdStr: jobId,
+					JobId: jobId,
 					Errors: []*armadaevents.Error{
 						{
 							Terminal: true,
@@ -369,8 +369,8 @@ func generateEventSequence(numberOfEvents int) *armadaevents.EventSequence {
 			Created: baseTimeProto,
 			Event: &armadaevents.EventSequence_Event_JobRunSucceeded{
 				JobRunSucceeded: &armadaevents.JobRunSucceeded{
-					RunIdStr: runId,
-					JobIdStr: jobId,
+					RunId: runId,
+					JobId: jobId,
 				},
 			},
 		})