pj-rehearse: code cleanups

Unused parameters and misplaced nil check.
alvaroaleman · Jul 9, 2020 · c17675e · c17675e
1 parent d56f3c1
commit c17675e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cmd/pj-rehearse/main.go b/cmd/pj-rehearse/main.go
@@ -310,7 +310,7 @@ func rehearseMain() error {
 	toRehearseClusterProfiles := diffs.GetPresubmitsForClusterProfiles(prConfig.Prow, changedClusterProfiles, logger)
 	toRehearse.AddAll(toRehearseClusterProfiles)
 
-	presubmitsWithChangedRegistry := rehearse.AddRandomJobsForChangedRegistry(changedRegistrySteps, graph, prConfig.Prow.JobConfig.PresubmitsStatic, filepath.Join(o.releaseRepoPath, config.CiopConfigInRepoPath), loggers)
+	presubmitsWithChangedRegistry := rehearse.AddRandomJobsForChangedRegistry(changedRegistrySteps, prConfig.Prow.JobConfig.PresubmitsStatic, filepath.Join(o.releaseRepoPath, config.CiopConfigInRepoPath), loggers)
 	toRehearse.AddAll(presubmitsWithChangedRegistry)
 
 	resolver := registry.NewResolver(refs, chains, workflows)

diff --git a/pkg/config/template_test.go b/pkg/config/template_test.go
@@ -186,12 +186,12 @@ func TestCreateClusterProfiles(t *testing.T) {
 		t.Fatal(err)
 	}
 	cms, err := client.List(metav1.ListOptions{})
-	sort.Slice(cms.Items, func(i, j int) bool {
-		return cms.Items[i].Name < cms.Items[j].Name
-	})
 	if err != nil {
 		t.Fatal(err)
 	}
+	sort.Slice(cms.Items, func(i, j int) bool {
+		return cms.Items[i].Name < cms.Items[j].Name
+	})
 	expected := []v1.ConfigMap{{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "rehearse-cluster-profile-profile0-e92d4a59",

diff --git a/pkg/rehearse/jobs.go b/pkg/rehearse/jobs.go
@@ -614,7 +614,7 @@ func getAllAncestors(changed []registry.Node) []registry.Node {
 	return ancestors
 }
 
-func AddRandomJobsForChangedRegistry(regSteps []registry.Node, graph registry.NodeByName, prConfigPresubmits map[string][]prowconfig.Presubmit, configPath string, loggers Loggers) config.Presubmits {
+func AddRandomJobsForChangedRegistry(regSteps []registry.Node, prConfigPresubmits map[string][]prowconfig.Presubmit, configPath string, loggers Loggers) config.Presubmits {
 	configsByFilename, err := config.LoadDataByFilename(configPath)
 	if err != nil {
 		loggers.Debug.Errorf("Failed to load config by filename in AddRandomJobsForChangedRegistry: %v", err)

diff --git a/pkg/rehearse/jobs_test.go b/pkg/rehearse/jobs_test.go
@@ -188,10 +188,10 @@ func TestReplaceClusterProfiles(t *testing.T) {
 	}
 
 	profiles := []config.ConfigMapSource{{
-		SHA:      "47f520ef9c2662fc9a2675f1dd4f02d5082b2776",
+		SHA:        "47f520ef9c2662fc9a2675f1dd4f02d5082b2776",
 		PathInRepo: filepath.Join(config.ClusterProfilesPath, "changed-profile0"),
 	}, {
-		SHA:      "85c627078710b8beee65d06d0cf157094fc46b03",
+		SHA:        "85c627078710b8beee65d06d0cf157094fc46b03",
 		PathInRepo: filepath.Join(config.ClusterProfilesPath, "changed-profile1"),
 	}}