chore: pass tektonClient from param in ConvertPipelineRun

Author: JordanGoasdoue

pkg/engines/tekton/activity.go

@@ -7,25 +7,20 @@ import (
 	"knative.dev/pkg/apis"
 
 	"github.com/jenkins-x/lighthouse/pkg/apis/lighthouse/v1alpha1"
-	"github.com/jenkins-x/lighthouse/pkg/clients"
 	"github.com/jenkins-x/lighthouse/pkg/config/job"
 	"github.com/jenkins-x/lighthouse/pkg/util"
 	pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
+	tektonversioned "github.com/tektoncd/pipeline/pkg/client/clientset/versioned"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // ConvertPipelineRun translates a PipelineRun into an ActivityRecord
-func ConvertPipelineRun(pr *pipelinev1.PipelineRun) (*v1alpha1.ActivityRecord, error) {
+func ConvertPipelineRun(tektonclient tektonversioned.Interface, pr *pipelinev1.PipelineRun) (*v1alpha1.ActivityRecord, error) {
 	if pr == nil {
 		return nil, nil
 	}
 
-	tektonclient, _, _, _, err := clients.GetAPIClients()
-	if err != nil {
-		return nil, err
-	}
-
 	record := new(v1alpha1.ActivityRecord)
 
 	record.Name = pr.Name

pkg/engines/tekton/activity_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/jenkins-x/lighthouse/pkg/util"
 	"github.com/stretchr/testify/assert"
 	pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
+	tektonfake "github.com/tektoncd/pipeline/pkg/client/clientset/versioned/fake"
 	"sigs.k8s.io/yaml"
 )
 
@@ -40,7 +41,8 @@ func TestConvertPipelineRun(t *testing.T) {
 			testDir := filepath.Join("test_data", "activity", tc.name)
 			pr := loadPipelineRun(t, testDir)
 
-			converted, err := tekton.ConvertPipelineRun(pr)
+			tektonfakeClient := tektonfake.NewSimpleClientset(pr)
+			converted, err := tekton.ConvertPipelineRun(tektonfakeClient, pr)
 			assert.NoError(t, err)
 			expected := loadRecord(t, testDir)
 

pkg/engines/tekton/controller.go

@@ -8,6 +8,7 @@ import (
 	"text/template"
 
 	lighthousev1alpha1 "github.com/jenkins-x/lighthouse/pkg/apis/lighthouse/v1alpha1"
+	"github.com/jenkins-x/lighthouse/pkg/clients"
 	configjob "github.com/jenkins-x/lighthouse/pkg/config/job"
 	"github.com/jenkins-x/lighthouse/pkg/util"
 	"github.com/pkg/errors"
@@ -179,7 +180,11 @@ func (r *LighthouseJobReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 			if r.dashboardURL != "" {
 				job.Status.ReportURL = r.getPipelingetPipelineTargetURLeTargetURL(pipelineRun)
 			}
-			activity, err := ConvertPipelineRun(&pipelineRun)
+			tektonclient, _, _, _, err := clients.GetAPIClients()
+			if err != nil {
+				return errors.Wrapf(err, "failed to get api clients")
+			}
+			activity, err := ConvertPipelineRun(tektonclient, &pipelineRun)
 			if err != nil {
 				return errors.Wrapf(err, "failed to convert PipelineRun")
 			}