From 773886220ff099fbdde9e9967936d1d3bcb122df Mon Sep 17 00:00:00 2001
From: Piyush Garg <pgarg@redhat.com>
Date: Fri, 24 Jan 2025 23:57:23 +0530
Subject: [PATCH] Fix eventlistener permissions and tests

This will fix eventlistener permissions and will send
a dummy event to trigger logs
---
 test/e2e/eventlistener/eventListener_test.go  | 23 +++++++++++++++----
 .../eventlistener/eventlistener_log.yaml      |  9 ++------
 .../eventlistener_v1beta1_log.yaml            |  9 ++------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/test/e2e/eventlistener/eventListener_test.go b/test/e2e/eventlistener/eventListener_test.go
index 9a7cf296ff..84bf49e917 100644
--- a/test/e2e/eventlistener/eventListener_test.go
+++ b/test/e2e/eventlistener/eventListener_test.go
@@ -19,6 +19,7 @@ package eventlistener
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/tektoncd/cli/test/cli"
@@ -72,8 +73,15 @@ func TestEventListenerLogsE2E(t *testing.T) {
 	t.Logf("Creating EventListener %s in namespace %s", elName, namespace)
 	createResources(t, c, namespace)
 	kubectl.MustSucceed(t, "create", "-f", helper.GetResourcePath("eventlistener/eventlistener_log.yaml"))
-	// Wait for pods to run and crash for next test
-	kubectl.MustSucceed(t, "wait", "--for=jsonpath=.status.phase=Running", "pod", "-n", namespace, "--timeout=2m", "--all")
+	// Wait for pods to run
+	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=5m", "--all")
+	svcURL := fmt.Sprintf("http://el-github-listener-interceptor.%s.svc.cluster.local:8080", namespace)
+
+	// Send dummy event
+	kubectl.MustSucceed(t, "-n", namespace, "run", "curlrequest", "--image=curlimages/curl", "--restart=Never", "--",
+		"curl -v -H 'X-GitHub-Event: pull_request' -H 'X-Hub-Signature: sha1=ba0cdc263b3492a74b601d240c27efe81c4720cb' -H 'Content-Type: application/json' "+
+			"-d '{\"action\": \"opened\", \"pull_request\":{\"head\":{\"sha\": \"28911bbb5a3e2ea034daf1f6be0a822d50e31e73\"}},\"repository\":{\"clone_url\": \"https://github.com/tektoncd/triggers.git\"}}'",
+		svcURL)
 
 	t.Run("Get logs of EventListener", func(t *testing.T) {
 		res := tkn.MustSucceed(t, "eventlistener", "logs", elName, "-t", "1")
@@ -107,8 +115,15 @@ func TestEventListener_v1beta1LogsE2E(t *testing.T) {
 	t.Logf("Creating EventListener %s in namespace %s", elName, namespace)
 	createResources(t, c, namespace)
 	kubectl.MustSucceed(t, "create", "-f", helper.GetResourcePath("eventlistener/eventlistener_v1beta1_log.yaml"))
-	// Wait for pods to run and crash for next test
-	kubectl.MustSucceed(t, "wait", "--for=jsonpath=.status.phase=Running", "pod", "-n", namespace, "--timeout=2m", "--all")
+	// Wait for pods to run
+	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=5m", "--all")
+	svcURL := fmt.Sprintf("http://el-github-listener-interceptor.%s.svc.cluster.local:8080", namespace)
+
+	// Send dummy event
+	kubectl.MustSucceed(t, "-n", namespace, "run", "curlrequest", "--image=curlimages/curl", "--restart=Never", "--",
+		"curl -v -H 'X-GitHub-Event: pull_request' -H 'X-Hub-Signature: sha1=ba0cdc263b3492a74b601d240c27efe81c4720cb' -H 'Content-Type: application/json' "+
+			"-d '{\"action\": \"opened\", \"pull_request\":{\"head\":{\"sha\": \"28911bbb5a3e2ea034daf1f6be0a822d50e31e73\"}},\"repository\":{\"clone_url\": \"https://github.com/tektoncd/triggers.git\"}}'",
+		svcURL)
 
 	t.Run("Get logs of EventListener", func(t *testing.T) {
 		res := tkn.MustSucceed(t, "eventlistener", "logs", elName, "-t", "1")
diff --git a/test/resources/eventlistener/eventlistener_log.yaml b/test/resources/eventlistener/eventlistener_log.yaml
index 5e14e80130..1c52e50a08 100644
--- a/test/resources/eventlistener/eventlistener_log.yaml
+++ b/test/resources/eventlistener/eventlistener_log.yaml
@@ -18,7 +18,7 @@ kind: EventListener
 metadata:
   name: github-listener-interceptor
 spec:
-  serviceAccountName: tekton-triggers-github-log-sa
+  serviceAccountName: tekton-triggers-github-sa
   triggers:
     - name: github-listener
       interceptors:
@@ -82,18 +82,13 @@ spec:
                   - name: url
                     value: $(tt.params.gitrepositoryurl)
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tekton-triggers-github-log-sa
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: tekton-triggers-github-binding
 subjects:
   - kind: ServiceAccount
-    name: tekton-triggers-github-log-sa
+    name: tekton-triggers-github-sa
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/test/resources/eventlistener/eventlistener_v1beta1_log.yaml b/test/resources/eventlistener/eventlistener_v1beta1_log.yaml
index cf13060851..c622d90103 100644
--- a/test/resources/eventlistener/eventlistener_v1beta1_log.yaml
+++ b/test/resources/eventlistener/eventlistener_v1beta1_log.yaml
@@ -18,7 +18,7 @@ kind: EventListener
 metadata:
   name: github-listener-interceptor
 spec:
-  serviceAccountName: tekton-triggers-github-log-sa
+  serviceAccountName: tekton-triggers-github-sa
   triggers:
     - name: github-listener
       interceptors:
@@ -89,18 +89,13 @@ spec:
                   - name: url
                     value: $(tt.params.gitrepositoryurl)
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tekton-triggers-github-log-sa
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: tekton-triggers-github-binding
 subjects:
   - kind: ServiceAccount
-    name: tekton-triggers-github-log-sa
+    name: tekton-triggers-github-sa
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role