From c1e2aceb1ea25e74b64a18202f9ffe3b54b12ed6 Mon Sep 17 00:00:00 2001
From: Kevin Hannon <kehannon@redhat.com>
Date: Fri, 9 Aug 2024 11:32:06 -0400
Subject: [PATCH] add the unparam linter to golangci and fix those issues
 flagged

---
 .golangci.yaml                            |  1 +
 pkg/controllers/jobset_controller.go      | 19 ++++++-------------
 pkg/controllers/jobset_controller_test.go |  6 +-----
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index 6c5422c52..bc62949f3 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -16,3 +16,4 @@ linters-settings:
 linters:
   enable:
     - goimports
+    - unparam
diff --git a/pkg/controllers/jobset_controller.go b/pkg/controllers/jobset_controller.go
index ef76878cb..20f62f52b 100644
--- a/pkg/controllers/jobset_controller.go
+++ b/pkg/controllers/jobset_controller.go
@@ -489,11 +489,7 @@ func (r *JobSetReconciler) reconcileReplicatedJobs(ctx context.Context, js *jobs
 	startupPolicy := js.Spec.StartupPolicy
 
 	for _, replicatedJob := range js.Spec.ReplicatedJobs {
-		jobs, err := constructJobsFromTemplate(js, &replicatedJob, ownedJobs)
-		if err != nil {
-			return err
-		}
-
+		jobs := constructJobsFromTemplate(js, &replicatedJob, ownedJobs)
 		status := findReplicatedJobStatus(replicatedJobStatus, replicatedJob.Name)
 
 		// For startup policy, if the replicatedJob is started we can skip this loop.
@@ -639,23 +635,20 @@ func executeSuccessPolicy(js *jobset.JobSet, ownedJobs *childJobs, updateStatusO
 	return false
 }
 
-func constructJobsFromTemplate(js *jobset.JobSet, rjob *jobset.ReplicatedJob, ownedJobs *childJobs) ([]*batchv1.Job, error) {
+func constructJobsFromTemplate(js *jobset.JobSet, rjob *jobset.ReplicatedJob, ownedJobs *childJobs) []*batchv1.Job {
 	var jobs []*batchv1.Job
 	for jobIdx := 0; jobIdx < int(rjob.Replicas); jobIdx++ {
 		jobName := placement.GenJobName(js.Name, rjob.Name, jobIdx)
 		if create := shouldCreateJob(jobName, ownedJobs); !create {
 			continue
 		}
-		job, err := constructJob(js, rjob, jobIdx)
-		if err != nil {
-			return nil, err
-		}
+		job := constructJob(js, rjob, jobIdx)
 		jobs = append(jobs, job)
 	}
-	return jobs, nil
+	return jobs
 }
 
-func constructJob(js *jobset.JobSet, rjob *jobset.ReplicatedJob, jobIdx int) (*batchv1.Job, error) {
+func constructJob(js *jobset.JobSet, rjob *jobset.ReplicatedJob, jobIdx int) *batchv1.Job {
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels:      collections.CloneMap(rjob.Template.Labels),
@@ -689,7 +682,7 @@ func constructJob(js *jobset.JobSet, rjob *jobset.ReplicatedJob, jobIdx int) (*b
 	jobsetSuspended := jobSetSuspended(js)
 	job.Spec.Suspend = ptr.To(jobsetSuspended)
 
-	return job, nil
+	return job
 }
 
 func addTaintToleration(job *batchv1.Job) {
diff --git a/pkg/controllers/jobset_controller_test.go b/pkg/controllers/jobset_controller_test.go
index 0c6129393..cbaaa36e6 100644
--- a/pkg/controllers/jobset_controller_test.go
+++ b/pkg/controllers/jobset_controller_test.go
@@ -688,11 +688,7 @@ func TestConstructJobsFromTemplate(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			var got []*batchv1.Job
 			for _, rjob := range tc.js.Spec.ReplicatedJobs {
-				jobs, err := constructJobsFromTemplate(tc.js, &rjob, tc.ownedJobs)
-				if err != nil {
-					t.Errorf("constructJobsFromTemplate() error = %v", err)
-					return
-				}
+				jobs := constructJobsFromTemplate(tc.js, &rjob, tc.ownedJobs)
 				got = append(got, jobs...)
 			}