[patch] fix: switch pending status to pr trigger step

api/v1/pullrequesttrigger_types.go

@@ -108,6 +108,8 @@ type PullRequestTriggerCondition struct {
 type PullRequestTriggerConditionType string
 
 const (
+	// PullRequestTriggerCondPendingStatusSent means the pull request trigger has been sent the pending status
+	PullRequestTriggerCondPendingStatusSent PullRequestTriggerConditionType = "PendingStatusSent"
 	// PullRequestTriggerCondFailed means the pull request trigger failed to retrieve the image from the registry
 	PullRequestTriggerCondFailed PullRequestTriggerConditionType = "Failed"
 )
@@ -153,3 +155,12 @@ type PullRequestTriggerList struct {
 func init() {
 	SchemeBuilder.Register(&PullRequestTrigger{}, &PullRequestTriggerList{})
 }
+
+func (prStatus *PullRequestTriggerStatus) IsContains(conditionType PullRequestTriggerConditionType) bool {
+	for _, c := range prStatus.Conditions {
+		if c.Type == conditionType {
+			return true
+		}
+	}
+	return false
+}

api/v1/queue_types.go

@@ -252,8 +252,6 @@ const (
 	QueueDeployed QueueConditionType = "QueueDeployed"
 	// QueueTestTriggered means the queue has been triggered testing
 	QueueTestTriggered QueueConditionType = "QueueTestTriggered"
-	// QueueTestPendingStatusSent means the queue has been sent the test pipeline pending status while testing
-	QueueTestPendingStatusSent QueueConditionType = "QueueTestPendingStatusSent"
 	// QueueTested means the queue has been finished testing
 	QueueTested QueueConditionType = "QueueTested"
 	// QueueTeamcityTestResult means the test result of Teamcity

internal/pullrequest/trigger/controller.go

@@ -138,6 +138,14 @@ func (c *controller) Reconcile(ctx context.Context, req reconcile.Request) (reco
 	maxRetry := prConfig.Trigger.MaxRetry
 	gitRepo := prConfig.GitRepository
 
+	// send pending status while test is running
+	isSentPendingStatus := prTrigger.Status.IsContains(s2hv1.PullRequestTriggerCondPendingStatusSent)
+	if !isSentPendingStatus {
+		if err := c.sendTestPendingResult(prTrigger); err != nil {
+			return reconcile.Result{}, errors.Wrapf(err, "cannot get pull request config of team: %s", c.teamName)
+		}
+	}
+
 	var tearDownDuration s2hv1.PullRequestTearDownDuration
 	// overwrite tearDownDuration
 	if prTrigger.Spec.TearDownDuration != nil {

internal/pullrequest/trigger/send_result.go

@@ -0,0 +1,51 @@
+package trigger
+
+import (
+	"context"
+	"net/http"
+
+	s2hv1 "github.com/agoda-com/samsahai/api/v1"
+	"github.com/agoda-com/samsahai/internal"
+	samsahairpc "github.com/agoda-com/samsahai/pkg/samsahai/rpc"
+	"github.com/twitchtv/twirp"
+	v1 "k8s.io/api/core/v1"
+)
+
+const sendTestPendingRetry = 3
+
+func (c *controller) sendTestPendingResult(prTrigger *s2hv1.PullRequestTrigger) error {
+	headers := make(http.Header)
+	headers.Set(internal.SamsahaiAuthHeader, c.authToken)
+	ctx, err := twirp.WithHTTPRequestHeaders(context.TODO(), headers)
+	if err != nil {
+		logger.Error(err, "cannot set request header")
+		return err
+	}
+
+	for retry := 0; retry <= sendTestPendingRetry; retry++ {
+		if _, err = c.s2hClient.RunPostPullRequestQueueTestRunnerTrigger(ctx, &samsahairpc.TeamWithPullRequest{
+			TeamName:   c.teamName,
+			Namespace:  internal.GenStagingNamespace(c.teamName),
+			BundleName: internal.GenPullRequestBundleName(prTrigger.Spec.BundleName, prTrigger.Spec.PRNumber),
+		}); err != nil {
+			logger.Error(err,
+				"cannot send pull request trigger pending status report,",
+				"team", c.teamName, "component", prTrigger.Spec.BundleName, "pr number", prTrigger.Spec.PRNumber)
+			// set state, cannot send test pending status
+			prTrigger.Status.SetCondition(
+				s2hv1.PullRequestTriggerCondPendingStatusSent,
+				v1.ConditionFalse,
+				"cannot send pull request trigger pending status")
+			continue
+		}
+		logger.Info("sent pull request test runner pending status successfully",
+			"team", c.teamName, "component", prTrigger.Spec.BundleName, "pr number", prTrigger.Spec.PRNumber)
+		// set state, test pending status has been sent
+		prTrigger.Status.SetCondition(
+			s2hv1.PullRequestTriggerCondPendingStatusSent,
+			v1.ConditionTrue,
+			"pull request trigger pending status has been sent")
+		break
+	}
+	return err
+}

internal/staging/start_testrunner.go

@@ -1,14 +1,11 @@
 package staging
 
 import (
-	"context"
 	"fmt"
-	"net/http"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/twitchtv/twirp"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -18,7 +15,6 @@ import (
 	"github.com/agoda-com/samsahai/internal/staging/testrunner/gitlab"
 	"github.com/agoda-com/samsahai/internal/staging/testrunner/teamcity"
 	"github.com/agoda-com/samsahai/internal/staging/testrunner/testmock"
-	samsahairpc "github.com/agoda-com/samsahai/pkg/samsahai/rpc"
 )
 
 type testResult string
@@ -28,8 +24,7 @@ const (
 	testPolling        = 5 * time.Second  // 5 secs
 	testTriggerTimeout = 1 * time.Minute  // 1 minutes
 
-	testResultRetry      = 3 // 3 times
-	sendTestPendingRetry = 3 // 3 times
+	testResultRetry = 3 // 3 times
 
 	testResultSuccess testResult = "PASSED"
 	testResultFailure testResult = "FAILED"
@@ -78,14 +73,6 @@ func (c *controller) startTesting(queue *s2hv1.Queue) error {
 		return err
 	}
 
-	// send pending status while test is running
-	isSentPendingStatus := queue.Status.IsContains(s2hv1.QueueTestPendingStatusSent)
-	if queue.Spec.Type == s2hv1.QueueTypePullRequest && !isSentPendingStatus {
-		if err := c.sendTestPendingResult(queue); err != nil {
-			return err
-		}
-	}
-
 	// get result from tests (polling check)
 	testCondition := v1.ConditionTrue
 	message := "queue testing succeeded"
@@ -331,47 +318,3 @@ func (c *controller) setTestResultCondition(queue *s2hv1.Queue, testRunnerName s
 	// update queue back to k8s
 	return c.updateQueue(queue)
 }
-
-func (c *controller) sendTestPendingResult(queue *s2hv1.Queue) error {
-	headers := make(http.Header)
-	headers.Set(internal.SamsahaiAuthHeader, c.authToken)
-	ctx, err := twirp.WithHTTPRequestHeaders(context.TODO(), headers)
-	if err != nil {
-		logger.Error(err, "cannot set request header")
-		return err
-	}
-
-	for retry := 0; retry <= sendTestPendingRetry; retry++ {
-		if _, err = c.s2hClient.RunPostPullRequestQueueTestRunnerTrigger(ctx, &samsahairpc.TeamWithPullRequest{
-			TeamName:   c.teamName,
-			Namespace:  internal.GenStagingNamespace(c.teamName),
-			BundleName: internal.GenPullRequestBundleName(queue.Spec.Name, queue.Spec.PRNumber),
-		}); err != nil {
-			logger.Error(err,
-				"cannot send pull request test runner pending status report,",
-				"team", c.teamName, "component", queue.Spec.Name, "pr number", queue.Spec.PRNumber)
-			// set state, cannot send test pending status
-			queue.Status.SetCondition(
-				s2hv1.QueueTestPendingStatusSent,
-				v1.ConditionFalse,
-				"cannot send queue test pending status")
-			if err := c.updateQueue(queue); err != nil {
-				logger.Error(err, "cannot update queue", "name", queue.Name)
-			}
-			continue
-		}
-		logger.Info("sent pull request test runner pending status successfully",
-			"team", c.teamName, "component", queue.Spec.Name, "pr number", queue.Spec.PRNumber)
-		// set state, test pending status has been sent
-		queue.Status.SetCondition(
-			s2hv1.QueueTestPendingStatusSent,
-			v1.ConditionTrue,
-			"queue test pending status has been sent")
-		if err = c.updateQueue(queue); err != nil {
-			logger.Error(err, "cannot update queue", "name", queue.Name)
-			return err
-		}
-		break
-	}
-	return err
-}