Skip to content

Commit c7c513a

Browse files
zakiskzakisk
committed
chore: Use GHE fro github enterprise instead of second
this renames every env variable in e2e that was using prefix "TEST_GITHUB_SECOND" for GitHub enterprise env variable Signed-off-by: Zaki Shaikh <zashaikh@redhat.com>
1 parent 357d970 commit c7c513a

10 files changed

Lines changed: 105 additions & 105 deletions

File tree

‎.github/workflows/e2e.yaml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@ jobs:
8080
TEST_GITHUB_REPO_OWNER_WEBHOOK: openshift-pipelines/pipelines-as-code-e2e-tests-webhook
8181
TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
8282

83-
# GitHub Enterprise (Second)
84-
TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
85-
TEST_GITHUB_SECOND_EL_URL: https://ghe.paac-127-0-0-1.nip.io
86-
TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
87-
TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
88-
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
89-
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
90-
TEST_GITHUB_SECOND_WEBHOOK_ORG: pac-e2e-webhook-tests
91-
TEST_GITHUB_SECOND_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_TOKEN }}
92-
TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
93-
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
83+
# GitHub Enterprise
84+
TEST_GITHUB_GHE_API_URL: ghe.pipelinesascode.com
85+
TEST_GITHUB_GHE_EL_URL: https://ghe.paac-127-0-0-1.nip.io
86+
TEST_GITHUB_GHE_REPO_INSTALLATION_ID: 1
87+
TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
88+
TEST_GITHUB_GHE_SMEE_URL: ${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}
89+
TEST_GITHUB_GHE_TOKEN: ${{ secrets.TEST_GITHUB_GHE_TOKEN }}
90+
TEST_GITHUB_GHE_WEBHOOK_ORG: pac-e2e-webhook-tests
91+
TEST_GITHUB_GHE_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_TOKEN }}
92+
TEST_GITHUB_GHE_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_SECRET }}
93+
TEST_GITHUB_GHE_APPLICATION_ID: ${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}
9494

9595
# GitLab
9696
TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
@@ -220,7 +220,7 @@ jobs:
220220
- name: Run gosmee for second controller GHE App
221221
if: startsWith(matrix.provider, 'github_ghe') || matrix.provider == 'concurrency'
222222
run: |
223-
nohup gosmee client --saveDir /tmp/gosmee-replay-ghe "${TEST_GITHUB_SECOND_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe.log 2>&1 &
223+
nohup gosmee client --saveDir /tmp/gosmee-replay-ghe "${TEST_GITHUB_GHE_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe.log 2>&1 &
224224
225225
- name: Generate unique gosmee URL for GHE webhook tests
226226
if: startsWith(matrix.provider, 'github_ghe') || matrix.provider == 'concurrency'
@@ -233,9 +233,9 @@ jobs:
233233
- name: Run gosmee for second controller GHE webhook
234234
if: startsWith(matrix.provider, 'github_ghe') || matrix.provider == 'concurrency'
235235
env:
236-
TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
236+
TEST_GITHUB_GHE_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
237237
run: |
238-
nohup gosmee client --saveDir /tmp/gosmee-replay-ghe-webhook "${TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe-webhook.log 2>&1 &
238+
nohup gosmee client --saveDir /tmp/gosmee-replay-ghe-webhook "${TEST_GITHUB_GHE_WEBHOOK_SMEE_URL}" "https://ghe.paac-127-0-0-1.nip.io" >> /tmp/gosmee-ghe-webhook.log 2>&1 &
239239
240240
- name: Setup tmate session
241241
uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3
@@ -262,18 +262,18 @@ jobs:
262262
TEST_GITHUB_REPO_OWNER_WEBHOOK: openshift-pipelines/pipelines-as-code-e2e-tests-webhook
263263
TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
264264

265-
# GitHub Enterprise (Second)
266-
TEST_GITHUB_SECOND_API_URL: ghe.pipelinesascode.com
267-
TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
268-
TEST_GITHUB_SECOND_EL_URL: https://ghe.paac-127-0-0-1.nip.io
269-
TEST_GITHUB_SECOND_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}
270-
TEST_GITHUB_SECOND_REPO_INSTALLATION_ID: 1
271-
TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
272-
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
273-
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
274-
TEST_GITHUB_SECOND_WEBHOOK_ORG: pac-e2e-webhook-tests
275-
TEST_GITHUB_SECOND_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}
276-
TEST_GITHUB_SECOND_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_TOKEN }}
265+
# GitHub Enterprise
266+
TEST_GITHUB_GHE_API_URL: ghe.pipelinesascode.com
267+
TEST_GITHUB_GHE_APPLICATION_ID: ${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}
268+
TEST_GITHUB_GHE_EL_URL: https://ghe.paac-127-0-0-1.nip.io
269+
TEST_GITHUB_GHE_PRIVATE_KEY: ${{ secrets.TEST_GITHUB_GHE_PRIVATE_KEY }}
270+
TEST_GITHUB_GHE_REPO_INSTALLATION_ID: 1
271+
TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP: pipelines-as-code/e2e
272+
TEST_GITHUB_GHE_SMEE_URL: ${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}
273+
TEST_GITHUB_GHE_TOKEN: ${{ secrets.TEST_GITHUB_GHE_TOKEN }}
274+
TEST_GITHUB_GHE_WEBHOOK_ORG: pac-e2e-webhook-tests
275+
TEST_GITHUB_GHE_WEBHOOK_SECRET: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_SECRET }}
276+
TEST_GITHUB_GHE_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_TOKEN }}
277277

278278
# GitLab
279279
TEST_GITLAB_API_URL: https://gitlab.com
@@ -311,7 +311,7 @@ jobs:
311311
env:
312312
PAC_DIR: ${{ github.workspace }}
313313
VARS_APPLICATION_ID: ${{ vars.APPLICATION_ID }}
314-
VARS_TEST_GITHUB_SECOND_APPLICATION_ID: ${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}
314+
VARS_TEST_GITHUB_GHE_APPLICATION_ID: ${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}
315315
run: |
316316
mkdir -p ~/secrets
317317
echo "${VARS_APPLICATION_ID}" > ~/secrets/github-application-id
@@ -321,10 +321,10 @@ jobs:
321321
322322
323323
mkdir -p ~/secrets-second
324-
echo "${VARS_TEST_GITHUB_SECOND_APPLICATION_ID}" > ~/secrets-second/github-application-id
325-
echo "${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
326-
echo "${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_SECRET }}" > ~/secrets-second/webhook.secret
327-
echo "${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}" > ~/secrets-second/smee
324+
echo "${VARS_TEST_GITHUB_GHE_APPLICATION_ID}" > ~/secrets-second/github-application-id
325+
echo "${{ secrets.TEST_GITHUB_GHE_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
326+
echo "${{ secrets.TEST_GITHUB_GHE_WEBHOOK_SECRET }}" > ~/secrets-second/webhook.secret
327+
echo "${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}" > ~/secrets-second/smee
328328
329329
export PAC_SECRET_FOLDER=~/secrets
330330
export PAC_SECOND_SECRET_FOLDER=~/secrets-second
@@ -372,8 +372,8 @@ jobs:
372372
TEST_EL_WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }}
373373
TEST_GITHUB_REPO_INSTALLATION_ID: ${{ vars.INSTALLATION_ID }}
374374
TEST_GITHUB_TOKEN: ${{ secrets.GH_APPS_TOKEN }}
375-
TEST_GITHUB_SECOND_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_TOKEN }}
376-
TEST_GITHUB_SECOND_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_SECOND_WEBHOOK_TOKEN }}
375+
TEST_GITHUB_GHE_TOKEN: ${{ secrets.TEST_GITHUB_GHE_TOKEN }}
376+
TEST_GITHUB_GHE_WEBHOOK_TOKEN: ${{ secrets.TEST_GITHUB_GHE_WEBHOOK_TOKEN }}
377377
TEST_GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
378378
TEST_GITLAB_SECOND_TOKEN: ${{ secrets.TEST_GITLAB_SECOND_TOKEN }}
379379
TEST_GITLAB_SECOND_GROUP: ${{ vars.TEST_GITLAB_SECOND_GROUP }}
@@ -382,7 +382,7 @@ jobs:
382382
TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_DATA_CENTER_WEBHOOK_SECRET }}
383383
TEST_GITEA_SMEEURL: ${{ steps.gosmee-url.outputs.url }}
384384
TEST_GITLAB_SMEEURL: ${{ steps.gosmee-gitlab-url.outputs.url }}
385-
TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
385+
TEST_GITHUB_GHE_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
386386
run: |
387387
./hack/gh-workflow-ci.sh run_e2e_tests
388388
@@ -396,8 +396,8 @@ jobs:
396396
- name: Collect logs
397397
if: ${{ always() }}
398398
env:
399-
TEST_GITHUB_SECOND_SMEE_URL: ${{ secrets.TEST_GITHUB_SECOND_SMEE_URL }}
400-
TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
399+
TEST_GITHUB_GHE_SMEE_URL: ${{ secrets.TEST_GITHUB_GHE_SMEE_URL }}
400+
TEST_GITHUB_GHE_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}
401401
TEST_GITLAB_SMEEURL: ${{ steps.gosmee-gitlab-url.outputs.url }}
402402
run: |
403403
./hack/gh-workflow-ci.sh collect_logs

‎hack/gh-workflow-ci.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,27 @@ create_pac_github_app_secret() {
3939

4040
create_second_github_app_controller_on_ghe() {
4141
# Read from environment variables instead of arguments
42-
local test_github_second_smee_url="${TEST_GITHUB_SECOND_SMEE_URL}"
43-
local test_github_second_private_key="${TEST_GITHUB_SECOND_PRIVATE_KEY}"
44-
local test_github_second_application_id="${TEST_GITHUB_SECOND_APPLICATION_ID}"
45-
local test_github_second_webhook_secret="${TEST_GITHUB_SECOND_WEBHOOK_SECRET}"
42+
local test_github_ghe_smee_url="${TEST_GITHUB_GHE_SMEE_URL}"
43+
local test_github_ghe_private_key="${TEST_GITHUB_GHE_PRIVATE_KEY}"
44+
local test_github_ghe_application_id="${TEST_GITHUB_GHE_APPLICATION_ID}"
45+
local test_github_ghe_webhook_secret="${TEST_GITHUB_GHE_WEBHOOK_SECRET}"
4646

4747
# install uv
4848
type -p uv >/dev/null 2>&1 || { curl -LsSf https://astral.sh/uv/install.sh | sh; }
4949

5050
./hack/second-controller.py \
5151
--controller-image="ko" \
52-
--smee-url="${test_github_second_smee_url}" \
52+
--smee-url="${test_github_ghe_smee_url}" \
5353
--ingress-domain="paac-127-0-0-1.nip.io" \
5454
--namespace="pipelines-as-code" \
5555
ghe | tee /tmp/generated.yaml
5656

5757
ko apply --insecure-registry -f /tmp/generated.yaml
5858
kubectl delete secret -n pipelines-as-code ghe-secret || true
5959
kubectl -n pipelines-as-code create secret generic ghe-secret \
60-
--from-literal github-private-key="${test_github_second_private_key}" \
61-
--from-literal github-application-id="${test_github_second_application_id}" \
62-
--from-literal webhook.secret="${test_github_second_webhook_secret}"
60+
--from-literal github-private-key="${test_github_ghe_private_key}" \
61+
--from-literal github-application-id="${test_github_ghe_application_id}" \
62+
--from-literal webhook.secret="${test_github_ghe_webhook_secret}"
6363
sed "s/name: pipelines-as-code/name: ghe-configmap/" <config/302-pac-configmap.yaml | kubectl apply -n pipelines-as-code -f-
6464
kubectl patch configmap -n pipelines-as-code ghe-configmap -p '{"data":{"application-name": "Pipelines as Code GHE"}}'
6565
kubectl -n pipelines-as-code delete pod -l app.kubernetes.io/name=ghe-controller
@@ -242,7 +242,7 @@ output_logs() {
242242
collect_logs() {
243243
# Read from environment variables (use default empty value for optional vars)
244244
local test_gitea_smee_url="${TEST_GITEA_SMEEURL:-}"
245-
local github_ghe_smee_url="${TEST_GITHUB_SECOND_SMEE_URL:-}"
245+
local github_ghe_smee_url="${TEST_GITHUB_GHE_SMEE_URL:-}"
246246
local test_gitlab_smee_url="${TEST_GITLAB_SMEEURL:-}"
247247

248248
mkdir -p /tmp/logs
@@ -331,15 +331,15 @@ help() {
331331
332332
create_second_github_app_controller_on_ghe
333333
Create the second controller on GHE
334-
Required env vars: TEST_GITHUB_SECOND_SMEE_URL, TEST_GITHUB_SECOND_PRIVATE_KEY, TEST_GITHUB_SECOND_WEBHOOK_SECRET
334+
Required env vars: TEST_GITHUB_GHE_SMEE_URL, TEST_GITHUB_GHE_PRIVATE_KEY, TEST_GITHUB_GHE_WEBHOOK_SECRET
335335
336336
run_e2e_tests
337337
Run the e2e tests
338338
Required env vars: TEST_PROVIDER plus many test-specific environment variables
339339
340340
collect_logs
341341
Collect logs from the cluster
342-
Optional env vars: TEST_GITEA_SMEEURL, TEST_GITHUB_SECOND_SMEE_URL (for scrubbing URLs from logs)
342+
Optional env vars: TEST_GITEA_SMEEURL, TEST_GITHUB_GHE_SMEE_URL (for scrubbing URLs from logs)
343343
344344
output_logs
345345
Will output logs using snazzy formatting when available or otherwise through a simple

‎test/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ Example from e2e.yaml workflow:
228228
PAC_SECOND_SECRET_FOLDER: ~/secrets-second
229229
run: |
230230
mkdir -p ~/secrets-second
231-
echo "${{ vars.TEST_GITHUB_SECOND_APPLICATION_ID }}" > ~/secrets-second/github-application-id
232-
echo "${{ secrets.TEST_GITHUB_SECOND_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
231+
echo "${{ vars.TEST_GITHUB_GHE_APPLICATION_ID }}" > ~/secrets-second/github-application-id
232+
echo "${{ secrets.TEST_GITHUB_GHE_PRIVATE_KEY }}" > ~/secrets-second/github-private-key
233233
# ... other secrets ...
234234
235235
cd startpaac

‎test/github_incoming_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ func verifyIncomingWebhook(t *testing.T, randomedString, pipelinerunName string,
198198
// For GHE + webhook, create a dynamic repo with SMEE webhook
199199
if onGHE && onWebhook {
200200
repoName := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-test")
201-
smeeURL := os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL")
201+
smeeURL := os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SMEE_URL")
202202
webhookSecret := os.Getenv("TEST_EL_WEBHOOK_SECRET")
203203

204204
runcnx.Clients.Log.Infof("Creating dynamic GHE repository %s/%s with webhook to %s", opts.Organization, repoName, smeeURL)

‎test/github_pullrequest_oktotest_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func TestGithubGHEPullRequestOkToTest(t *testing.T) {
5656
assert.NilError(t, err)
5757
initialPipelineRunCount := len(pruns.Items)
5858

59-
installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"), 10, 64)
59+
installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"), 10, 64)
6060
assert.NilError(t, err)
6161

6262
sendIssueComment := func(t *testing.T, sender string) {
@@ -90,10 +90,10 @@ func TestGithubGHEPullRequestOkToTest(t *testing.T) {
9090

9191
err = payload.Send(ctx,
9292
g.Cnx,
93-
os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
94-
os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
95-
os.Getenv("TEST_GITHUB_SECOND_API_URL"),
96-
os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"),
93+
os.Getenv("TEST_GITHUB_GHE_EL_URL"),
94+
os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
95+
os.Getenv("TEST_GITHUB_GHE_API_URL"),
96+
os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"),
9797
event,
9898
"issue_comment",
9999
)

‎test/github_pullrequest_rerequest_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestGithubGHEPullRerequest(t *testing.T) {
4747
Sender: g.Options.Organization,
4848
}
4949

50-
installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"), 10, 64)
50+
installID, err := strconv.ParseInt(os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"), 10, 64)
5151
assert.NilError(t, err)
5252
event := github.CheckRunEvent{
5353
Action: github.Ptr("rerequested"),
@@ -78,10 +78,10 @@ func TestGithubGHEPullRerequest(t *testing.T) {
7878

7979
err = payload.Send(ctx,
8080
g.Cnx,
81-
os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
82-
os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
83-
os.Getenv("TEST_GITHUB_SECOND_API_URL"),
84-
os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"),
81+
os.Getenv("TEST_GITHUB_GHE_EL_URL"),
82+
os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
83+
os.Getenv("TEST_GITHUB_GHE_API_URL"),
84+
os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"),
8585
event,
8686
"check_run",
8787
)
@@ -128,10 +128,10 @@ func TestGithubGHEPullRerequest(t *testing.T) {
128128

129129
err = payload.Send(ctx,
130130
g.Cnx,
131-
os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
132-
os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
133-
os.Getenv("TEST_GITHUB_SECOND_API_URL"),
134-
os.Getenv("TEST_GITHUB_SECOND_APPLICATION_ID"),
131+
os.Getenv("TEST_GITHUB_GHE_EL_URL"),
132+
os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
133+
os.Getenv("TEST_GITHUB_GHE_API_URL"),
134+
os.Getenv("TEST_GITHUB_GHE_APPLICATION_ID"),
135135
csEvent,
136136
"check_suite",
137137
)
@@ -173,10 +173,10 @@ func TestGithubGHEPullRerequest(t *testing.T) {
173173

174174
err = payload.Send(ctx,
175175
g.Cnx,
176-
os.Getenv("TEST_GITHUB_SECOND_EL_URL"),
177-
os.Getenv("TEST_GITHUB_SECOND_WEBHOOK_SECRET"),
178-
os.Getenv("TEST_GITHUB_SECOND_API_URL"),
179-
os.Getenv("TEST_GITHUB_SECOND_REPO_INSTALLATION_ID"),
176+
os.Getenv("TEST_GITHUB_GHE_EL_URL"),
177+
os.Getenv("TEST_GITHUB_GHE_WEBHOOK_SECRET"),
178+
os.Getenv("TEST_GITHUB_GHE_API_URL"),
179+
os.Getenv("TEST_GITHUB_GHE_REPO_INSTALLATION_ID"),
180180
nullBranchEvent,
181181
"check_run",
182182
)

‎test/pkg/configfile/config.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ type GitHubConfig struct {
3535
}
3636

3737
type GitHubEnterpriseConfig struct {
38-
APIURL string `env:"TEST_GITHUB_SECOND_API_URL" json:"api_url" yaml:"api_url"`
39-
Token string `env:"TEST_GITHUB_SECOND_TOKEN" json:"token" yaml:"token"`
40-
ControllerURL string `env:"TEST_GITHUB_SECOND_EL_URL" json:"controller_url" yaml:"controller_url"`
41-
RepoOwnerGithubApp string `env:"TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP" json:"repo_owner_githubapp" yaml:"repo_owner_githubapp"`
42-
RepoInstallationID string `env:"TEST_GITHUB_SECOND_REPO_INSTALLATION_ID" json:"repo_installation_id" yaml:"repo_installation_id"`
43-
SmeeURL string `env:"TEST_GITHUB_SECOND_SMEE_URL" json:"smee_url" yaml:"smee_url"`
44-
WebhookSmeeURL string `env:"TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL" json:"webhook_smee_url" yaml:"webhook_smee_url"`
45-
WebhookOrg string `env:"TEST_GITHUB_SECOND_WEBHOOK_ORG" json:"webhook_org" yaml:"webhook_org"`
38+
APIURL string `env:"TEST_GITHUB_GHE_API_URL" json:"api_url" yaml:"api_url"`
39+
Token string `env:"TEST_GITHUB_GHE_TOKEN" json:"token" yaml:"token"`
40+
ControllerURL string `env:"TEST_GITHUB_GHE_EL_URL" json:"controller_url" yaml:"controller_url"`
41+
RepoOwnerGithubApp string `env:"TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP" json:"repo_owner_githubapp" yaml:"repo_owner_githubapp"`
42+
RepoInstallationID string `env:"TEST_GITHUB_GHE_REPO_INSTALLATION_ID" json:"repo_installation_id" yaml:"repo_installation_id"`
43+
SmeeURL string `env:"TEST_GITHUB_GHE_SMEE_URL" json:"smee_url" yaml:"smee_url"`
44+
WebhookSmeeURL string `env:"TEST_GITHUB_GHE_WEBHOOK_SMEE_URL" json:"webhook_smee_url" yaml:"webhook_smee_url"`
45+
WebhookOrg string `env:"TEST_GITHUB_GHE_WEBHOOK_ORG" json:"webhook_org" yaml:"webhook_org"`
4646
}
4747

4848
type GitLabConfig struct {

‎test/pkg/configfile/config_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ bitbucket_datacenter:
169169
"TEST_GITHUB_REPO_OWNER_GITHUBAPP", "TEST_GITHUB_REPO_OWNER_WEBHOOK",
170170
"TEST_GITHUB_REPO_INSTALLATION_ID",
171171
"TEST_GITHUB_PRIVATE_TASK_NAME", "TEST_GITHUB_PRIVATE_TASK_URL",
172-
"TEST_GITHUB_SECOND_API_URL", "TEST_GITHUB_SECOND_TOKEN",
173-
"TEST_GITHUB_SECOND_EL_URL", "TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP",
174-
"TEST_GITHUB_SECOND_REPO_INSTALLATION_ID",
172+
"TEST_GITHUB_GHE_API_URL", "TEST_GITHUB_GHE_TOKEN",
173+
"TEST_GITHUB_GHE_EL_URL", "TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP",
174+
"TEST_GITHUB_GHE_REPO_INSTALLATION_ID",
175175
"TEST_GITLAB_API_URL", "TEST_GITLAB_TOKEN", "TEST_GITLAB_SECOND_TOKEN",
176176
"TEST_GITLAB_GROUP", "TEST_GITLAB_SECOND_GROUP", "TEST_GITLAB_SMEEURL",
177177
"TEST_GITEA_API_URL", "TEST_GITEA_INTERNAL_URL", "TEST_GITEA_PASSWORD",
@@ -200,11 +200,11 @@ bitbucket_datacenter:
200200
"TEST_GITHUB_REPO_INSTALLATION_ID": "12345",
201201
"TEST_GITHUB_PRIVATE_TASK_NAME": "task-remote",
202202
"TEST_GITHUB_PRIVATE_TASK_URL": "https://github.com/org/repo/blob/main/task.yaml",
203-
"TEST_GITHUB_SECOND_API_URL": "https://ghe.example.com/api/v3",
204-
"TEST_GITHUB_SECOND_TOKEN": "ghe-token",
205-
"TEST_GITHUB_SECOND_EL_URL": "https://ghe-ctrl.example.com",
206-
"TEST_GITHUB_SECOND_REPO_OWNER_GITHUBAPP": "ghe-org/repo",
207-
"TEST_GITHUB_SECOND_REPO_INSTALLATION_ID": "1",
203+
"TEST_GITHUB_GHE_API_URL": "https://ghe.example.com/api/v3",
204+
"TEST_GITHUB_GHE_TOKEN": "ghe-token",
205+
"TEST_GITHUB_GHE_EL_URL": "https://ghe-ctrl.example.com",
206+
"TEST_GITHUB_GHE_REPO_OWNER_GITHUBAPP": "ghe-org/repo",
207+
"TEST_GITHUB_GHE_REPO_INSTALLATION_ID": "1",
208208
"TEST_GITLAB_API_URL": "https://gitlab.com",
209209
"TEST_GITLAB_TOKEN": "glpat-xyz",
210210
"TEST_GITLAB_SECOND_TOKEN": "glpat-second",

0 commit comments

Comments
 (0)