From 22ef7b3a71549fc8278594846a7a448fc2d7b566 Mon Sep 17 00:00:00 2001
From: Yusuke Kuoka <ykuoka@gmail.com>
Date: Sat, 12 Mar 2022 12:10:04 +0000
Subject: [PATCH] acceptance,e2e: Fix deploy.sh and e2e_test.go for testing
 with GitHub App

---
 acceptance/deploy.sh |  6 +++---
 test/e2e/e2e_test.go | 25 +++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/acceptance/deploy.sh b/acceptance/deploy.sh
index a7288588..9199c504 100755
--- a/acceptance/deploy.sh
+++ b/acceptance/deploy.sh
@@ -6,7 +6,7 @@ tpe=${ACCEPTANCE_TEST_SECRET_TYPE}
 
 VALUES_FILE=${VALUES_FILE:-$(dirname $0)/values.yaml}
 
-kubectl delete secret controller-manager || :
+kubectl delete secret -n actions-runner-system controller-manager || :
 
 if [ "${tpe}" == "token" ]; then
   if ! kubectl get secret controller-manager -n actions-runner-system >/dev/null; then
@@ -18,8 +18,8 @@ elif [ "${tpe}" == "app" ]; then
   kubectl create secret generic controller-manager \
     -n actions-runner-system \
     --from-literal=github_app_id=${APP_ID:?must not be empty} \
-    --from-literal=github_app_installation_id=${INSTALLATION_ID:?must not be empty} \
-    --from-file=github_app_private_key=${PRIVATE_KEY_FILE_PATH:?must not be empty}
+    --from-literal=github_app_installation_id=${APP_INSTALLATION_ID:?must not be empty} \
+    --from-file=github_app_private_key=${APP_PRIVATE_KEY_FILE:?must not be empty}
 else
   echo "ACCEPTANCE_TEST_SECRET_TYPE must be set to either \"token\" or \"app\"" 1>&2
   exit 1
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index 743c01ce..0d58b5ff 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -167,16 +167,22 @@ func TestE2ERunnerDeploy(t *testing.T) {
 	t.Run("Verify workflow run result", func(t *testing.T) {
 		env.verifyActionsWorkflowRun(t)
 	})
+
+	t.FailNow()
 }
 
 type env struct {
 	*testing.Env
 
 	useRunnerSet bool
+	// Uses GITHUB_APP_ID, GITHUB_APP_INSTALLATION_ID, and GITHUB_APP_PRIVATE_KEY
+	// to let ARC authenticate as a GitHub App
+	useApp bool
 
 	testID                                                   string
 	testName                                                 string
 	repoToCommit                                             string
+	appID, appInstallationID, appPrivateKeyFile              string
 	runnerLabel, githubToken, testRepo, testOrg, testOrgRepo string
 	githubTokenWebhook                                       string
 	testEnterprise                                           string
@@ -204,6 +210,9 @@ func initTestEnv(t *testing.T) *env {
 	e.testName = testName
 	e.runnerLabel = "test-" + id
 	e.githubToken = testing.Getenv(t, "GITHUB_TOKEN")
+	e.appID = testing.Getenv(t, "GITHUB_APP_ID")
+	e.appInstallationID = testing.Getenv(t, "GITHUB_APP_INSTALLATION_ID")
+	e.appPrivateKeyFile = testing.Getenv(t, "GITHUB_APP_PRIVATE_KEY_FILE")
 	e.githubTokenWebhook = testing.Getenv(t, "WEBHOOK_GITHUB_TOKEN")
 	e.repoToCommit = testing.Getenv(t, "TEST_COMMIT_REPO")
 	e.testRepo = testing.Getenv(t, "TEST_REPO", "")
@@ -260,7 +269,6 @@ func (e *env) installActionsRunnerController(t *testing.T) {
 	scriptEnv := []string{
 		"KUBECONFIG=" + e.Kubeconfig(),
 		"ACCEPTANCE_TEST_DEPLOYMENT_TOOL=" + "helm",
-		"ACCEPTANCE_TEST_SECRET_TYPE=token",
 	}
 
 	if e.useRunnerSet {
@@ -274,7 +282,6 @@ func (e *env) installActionsRunnerController(t *testing.T) {
 		"TEST_REPO=" + e.testRepo,
 		"TEST_ORG=" + e.testOrg,
 		"TEST_ORG_REPO=" + e.testOrgRepo,
-		"GITHUB_TOKEN=" + e.githubToken,
 		"WEBHOOK_GITHUB_TOKEN=" + e.githubTokenWebhook,
 		"RUNNER_LABEL=" + e.runnerLabel,
 		"TEST_ID=" + e.testID,
@@ -285,6 +292,20 @@ func (e *env) installActionsRunnerController(t *testing.T) {
 		fmt.Sprintf("ENTERPRISE_RUNNER_MIN_REPLICAS=%d", e.minReplicas),
 	}
 
+	if e.useApp {
+		varEnv = append(varEnv,
+			"ACCEPTANCE_TEST_SECRET_TYPE=app",
+			"APP_ID="+e.appID,
+			"APP_INSTALLATION_ID="+e.appInstallationID,
+			"APP_PRIVATE_KEY_FILE="+e.appPrivateKeyFile,
+		)
+	} else {
+		varEnv = append(varEnv,
+			"ACCEPTANCE_TEST_SECRET_TYPE=token",
+			"GITHUB_TOKEN="+e.githubToken,
+		)
+	}
+
 	if e.dockerdWithinRunnerContainer {
 		varEnv = append(varEnv,
 			"RUNNER_DOCKERD_WITHIN_RUNNER_CONTAINER=true",