Skip to content

Commit 5a38b89

Browse files
zakiskzakisk
committed
chore: replace e2e env variables from server to data center
this replaces all the env variables names from bitbucket server to data center. Signed-off-by: Zaki Shaikh <zashaikh@redhat.com>
1 parent 2ada0e4 commit 5a38b89

File tree

9 files changed

+79
-79
lines changed

9 files changed

+79
-79
lines changed

‎.github/workflows/e2e.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ jobs:
111111
TEST_BITBUCKET_CLOUD_USER: cboudjna
112112

113113
# Bitbucket Server
114-
TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
115-
TEST_BITBUCKET_SERVER_E2E_REPOSITORY: PAC/pac-e2e-tests
116-
TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
117-
TEST_BITBUCKET_SERVER_USER: pipelines
118-
TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
114+
TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
115+
TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY: PAC/pac-e2e-tests
116+
TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}
117+
TEST_BITBUCKET_DATA_CENTER_USER: pipelines
118+
TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_DATA_CENTER_WEBHOOK_SECRET }}
119119
TESTRR_URL: https://testrr.pipelinesascode.com
120120
TESTRR_PROJECT: pipelinesascode
121121
TESTRR_USERNAME: pac
@@ -297,11 +297,11 @@ jobs:
297297
TEST_BITBUCKET_CLOUD_USER: cboudjna
298298

299299
# Bitbucket Server
300-
TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
301-
TEST_BITBUCKET_SERVER_E2E_REPOSITORY: PAC/pac-e2e-tests
302-
TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
303-
TEST_BITBUCKET_SERVER_USER: pipelines
304-
TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
300+
TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
301+
TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY: PAC/pac-e2e-tests
302+
TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}
303+
TEST_BITBUCKET_DATA_CENTER_USER: pipelines
304+
TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_DATA_CENTER_WEBHOOK_SECRET }}
305305
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
306306
with:
307307
detached: true
@@ -377,9 +377,9 @@ jobs:
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 }}
380-
TEST_BITBUCKET_SERVER_TOKEN: ${{ secrets.BITBUCKET_SERVER_TOKEN }}
381-
TEST_BITBUCKET_SERVER_API_URL: ${{ secrets.BITBUCKET_SERVER_API_URL }}
382-
TEST_BITBUCKET_SERVER_WEBHOOK_SECRET: ${{ secrets.BITBUCKET_SERVER_WEBHOOK_SECRET }}
380+
TEST_BITBUCKET_DATA_CENTER_TOKEN: ${{ secrets.BITBUCKET_DATA_CENTER_TOKEN }}
381+
TEST_BITBUCKET_DATA_CENTER_API_URL: ${{ secrets.BITBUCKET_DATA_CENTER_API_URL }}
382+
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 }}
385385
TEST_GITHUB_SECOND_WEBHOOK_SMEE_URL: ${{ steps.gosmee-ghe-webhook-url.outputs.url }}

‎test/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ this repo should differ from the one which is configured as part of `TEST_GITHUB
5555
- `TEST_GITEA_PASSWORD` - set password as **pac**
5656
- `TEST_GITEA_USERNAME` - set username as **pac**
5757
- `TEST_GITEA_REPO_OWNER` - set repo owner as **pac/pac**
58-
- `TEST_BITBUCKET_SERVER_USER` - Bitbucket Data Center Username
59-
- `TEST_BITBUCKET_SERVER_TOKEN` - Bitbucket Data Center token
60-
- `TEST_BITBUCKET_SERVER_E2E_REPOSITORY` - Bitbucket Data Center repository (i.e. `project/repo`)
61-
- `TEST_BITBUCKET_SERVER_API_URL` - URL where your Bitbucket Data Center instance is running.
62-
- `TEST_BITBUCKET_SERVER_WEBHOOK_SECRET` - Webhook secret
58+
- `TEST_BITBUCKET_DATA_CENTER_USER` - Bitbucket Data Center Username
59+
- `TEST_BITBUCKET_DATA_CENTER_TOKEN` - Bitbucket Data Center token
60+
- `TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY` - Bitbucket Data Center repository (i.e. `project/repo`)
61+
- `TEST_BITBUCKET_DATA_CENTER_API_URL` - URL where your Bitbucket Data Center instance is running.
62+
- `TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET` - Webhook secret
6363

6464
- `PAC_API_INSTRUMENTATION_DIR` - Optional. When set, E2E tests write per-test JSON reports of GitHub API calls parsed from controller logs to this directory. Useful for analyzing API usage and rate limits. Example: `export PAC_API_INSTRUMENTATION_DIR=/tmp/api-instrumentation`.
6565

‎test/bitbucket_datacenter_dynamic_variables_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
func TestBitbucketDataCenterDynamicVariables(t *testing.T) {
2323
targetNS := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-ns")
2424
ctx := context.Background()
25-
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_SERVER_E2E_REPOSITORY")
25+
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY")
2626

2727
ctx, runcnx, opts, client, err := tbbdc.Setup(ctx)
2828
assert.NilError(t, err)

‎test/bitbucket_datacenter_pull_request_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
func TestBitbucketDataCenterPullRequest(t *testing.T) {
2020
targetNS := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-ns")
2121
ctx := context.Background()
22-
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_SERVER_E2E_REPOSITORY")
22+
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY")
2323

2424
ctx, runcnx, opts, client, err := tbbdc.Setup(ctx)
2525
assert.NilError(t, err)
@@ -50,7 +50,7 @@ func TestBitbucketDataCenterPullRequest(t *testing.T) {
5050
func TestBitbucketDataCenterCELPathChangeInPullRequest(t *testing.T) {
5151
targetNS := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-ns")
5252
ctx := context.Background()
53-
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_SERVER_E2E_REPOSITORY")
53+
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY")
5454

5555
ctx, runcnx, opts, client, err := tbbdc.Setup(ctx)
5656
assert.NilError(t, err)

‎test/bitbucket_datacenter_push_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
func TestBitbucketDataCenterCELPathChangeOnPush(t *testing.T) {
2222
targetNS := names.SimpleNameGenerator.RestrictLengthWithRandomSuffix("pac-e2e-ns")
2323
ctx := context.Background()
24-
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_SERVER_E2E_REPOSITORY")
24+
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY")
2525

2626
ctx, runcnx, opts, client, err := tbbs.Setup(ctx)
2727
assert.NilError(t, err)

‎test/pkg/bitbucketdatacenter/crd.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ func CreateCRD(ctx context.Context, t *testing.T, client *scm.Client, run *param
3434
assert.NilError(t, err)
3535
run.Clients.Log.Infof("Namespace %s is created", targetNS)
3636

37-
token, _ := os.LookupEnv("TEST_BITBUCKET_SERVER_TOKEN")
38-
apiURL, _ := os.LookupEnv("TEST_BITBUCKET_SERVER_API_URL")
39-
apiUser, _ := os.LookupEnv("TEST_BITBUCKET_SERVER_USER")
40-
webhookSecret := os.Getenv("TEST_BITBUCKET_SERVER_WEBHOOK_SECRET")
37+
token, _ := os.LookupEnv("TEST_BITBUCKET_DATA_CENTER_TOKEN")
38+
apiURL, _ := os.LookupEnv("TEST_BITBUCKET_DATA_CENTER_API_URL")
39+
apiUser, _ := os.LookupEnv("TEST_BITBUCKET_DATA_CENTER_USER")
40+
webhookSecret := os.Getenv("TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET")
4141
secretName := "bitbucket-datacenter-webhook-config" // #nosec G101
4242
err = secret.Create(ctx, run, map[string]string{
4343
"provider.token": token,

‎test/pkg/bitbucketdatacenter/setup.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ import (
2020
)
2121

2222
func Setup(ctx context.Context) (context.Context, *params.Run, options.E2E, *scm.Client, error) {
23-
bitbucketDataCenterUser := os.Getenv("TEST_BITBUCKET_SERVER_USER")
24-
bitbucketDataCenterToken := os.Getenv("TEST_BITBUCKET_SERVER_TOKEN")
25-
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_SERVER_E2E_REPOSITORY")
26-
bitbucketDataCenterAPIURL := os.Getenv("TEST_BITBUCKET_SERVER_API_URL")
23+
bitbucketDataCenterUser := os.Getenv("TEST_BITBUCKET_DATA_CENTER_USER")
24+
bitbucketDataCenterToken := os.Getenv("TEST_BITBUCKET_DATA_CENTER_TOKEN")
25+
bitbucketWSOwner := os.Getenv("TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY")
26+
bitbucketDataCenterAPIURL := os.Getenv("TEST_BITBUCKET_DATA_CENTER_API_URL")
2727

2828
if err := setup.RequireEnvs(
29-
"TEST_BITBUCKET_SERVER_USER",
30-
"TEST_BITBUCKET_SERVER_TOKEN",
31-
"TEST_BITBUCKET_SERVER_E2E_REPOSITORY",
32-
"TEST_BITBUCKET_SERVER_API_URL",
33-
"TEST_BITBUCKET_SERVER_WEBHOOK_SECRET",
29+
"TEST_BITBUCKET_DATA_CENTER_USER",
30+
"TEST_BITBUCKET_DATA_CENTER_TOKEN",
31+
"TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY",
32+
"TEST_BITBUCKET_DATA_CENTER_API_URL",
33+
"TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET",
3434
); err != nil {
3535
return ctx, nil, options.E2E{}, nil, err
3636
}

‎test/pkg/configfile/config.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ type BitbucketCloudConfig struct {
7171
}
7272

7373
type BitbucketServerConfig struct {
74-
APIURL string `env:"TEST_BITBUCKET_SERVER_API_URL" json:"api_url" yaml:"api_url"`
75-
User string `env:"TEST_BITBUCKET_SERVER_USER" json:"user" yaml:"user"`
76-
Token string `env:"TEST_BITBUCKET_SERVER_TOKEN" json:"token" yaml:"token"`
77-
E2ERepository string `env:"TEST_BITBUCKET_SERVER_E2E_REPOSITORY" json:"e2e_repository" yaml:"e2e_repository"`
78-
WebhookSecret string `env:"TEST_BITBUCKET_SERVER_WEBHOOK_SECRET" json:"webhook_secret" yaml:"webhook_secret"`
74+
APIURL string `env:"TEST_BITBUCKET_DATA_CENTER_API_URL" json:"api_url" yaml:"api_url"`
75+
User string `env:"TEST_BITBUCKET_DATA_CENTER_USER" json:"user" yaml:"user"`
76+
Token string `env:"TEST_BITBUCKET_DATA_CENTER_TOKEN" json:"token" yaml:"token"`
77+
E2ERepository string `env:"TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY" json:"e2e_repository" yaml:"e2e_repository"`
78+
WebhookSecret string `env:"TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET" json:"webhook_secret" yaml:"webhook_secret"`
7979
}
8080

8181
// LoadConfig reads a YAML config file and sets environment variables for any

‎test/pkg/configfile/config_test.go‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ bitbucket_server:
178178
"TEST_GITEA_USERNAME", "TEST_GITEA_REPO_OWNER", "TEST_GITEA_SMEEURL",
179179
"TEST_BITBUCKET_CLOUD_API_URL", "TEST_BITBUCKET_CLOUD_USER",
180180
"TEST_BITBUCKET_CLOUD_TOKEN", "TEST_BITBUCKET_CLOUD_E2E_REPOSITORY",
181-
"TEST_BITBUCKET_SERVER_API_URL", "TEST_BITBUCKET_SERVER_USER",
182-
"TEST_BITBUCKET_SERVER_TOKEN", "TEST_BITBUCKET_SERVER_E2E_REPOSITORY",
183-
"TEST_BITBUCKET_SERVER_WEBHOOK_SECRET",
181+
"TEST_BITBUCKET_DATA_CENTER_API_URL", "TEST_BITBUCKET_DATA_CENTER_USER",
182+
"TEST_BITBUCKET_DATA_CENTER_TOKEN", "TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY",
183+
"TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET",
184184
}
185185
for _, env := range allEnvVars {
186186
t.Setenv(env, "")
@@ -190,42 +190,42 @@ bitbucket_server:
190190
assert.NilError(t, LoadConfig(configPath))
191191

192192
expected := map[string]string{
193-
"TEST_EL_URL": "https://ctrl.example.com",
194-
"TEST_EL_WEBHOOK_SECRET": "secret123",
195-
"TEST_NOCLEANUP": "true",
196-
"TEST_GITHUB_API_URL": "https://api.github.com",
197-
"TEST_GITHUB_TOKEN": "ghp_abc",
198-
"TEST_GITHUB_REPO_OWNER_GITHUBAPP": "org/repo",
199-
"TEST_GITHUB_REPO_OWNER_WEBHOOK": "org/repo-webhook",
200-
"TEST_GITHUB_REPO_INSTALLATION_ID": "12345",
201-
"TEST_GITHUB_PRIVATE_TASK_NAME": "task-remote",
202-
"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",
208-
"TEST_GITLAB_API_URL": "https://gitlab.com",
209-
"TEST_GITLAB_TOKEN": "glpat-xyz",
210-
"TEST_GITLAB_SECOND_TOKEN": "glpat-second",
211-
"TEST_GITLAB_GROUP": "pac-e2e-tests",
212-
"TEST_GITLAB_SECOND_GROUP": "pac-e2e-tests-second",
213-
"TEST_GITLAB_SMEEURL": "https://hook.pipelinesascode.com/gitlab-test",
214-
"TEST_GITEA_API_URL": "http://localhost:3000",
215-
"TEST_GITEA_INTERNAL_URL": "http://forgejo:3000",
216-
"TEST_GITEA_PASSWORD": "pac",
217-
"TEST_GITEA_USERNAME": "pac",
218-
"TEST_GITEA_REPO_OWNER": "pac/pac",
219-
"TEST_GITEA_SMEEURL": "https://smee.io/test",
220-
"TEST_BITBUCKET_CLOUD_API_URL": "https://api.bitbucket.org/2.0",
221-
"TEST_BITBUCKET_CLOUD_USER": "bbuser",
222-
"TEST_BITBUCKET_CLOUD_TOKEN": "bb-token",
223-
"TEST_BITBUCKET_CLOUD_E2E_REPOSITORY": "workspace/repo",
224-
"TEST_BITBUCKET_SERVER_API_URL": "https://bitbucket.example.com",
225-
"TEST_BITBUCKET_SERVER_USER": "bbsuser",
226-
"TEST_BITBUCKET_SERVER_TOKEN": "bbs-token",
227-
"TEST_BITBUCKET_SERVER_E2E_REPOSITORY": "project/repo",
228-
"TEST_BITBUCKET_SERVER_WEBHOOK_SECRET": "bbs-secret",
193+
"TEST_EL_URL": "https://ctrl.example.com",
194+
"TEST_EL_WEBHOOK_SECRET": "secret123",
195+
"TEST_NOCLEANUP": "true",
196+
"TEST_GITHUB_API_URL": "https://api.github.com",
197+
"TEST_GITHUB_TOKEN": "ghp_abc",
198+
"TEST_GITHUB_REPO_OWNER_GITHUBAPP": "org/repo",
199+
"TEST_GITHUB_REPO_OWNER_WEBHOOK": "org/repo-webhook",
200+
"TEST_GITHUB_REPO_INSTALLATION_ID": "12345",
201+
"TEST_GITHUB_PRIVATE_TASK_NAME": "task-remote",
202+
"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",
208+
"TEST_GITLAB_API_URL": "https://gitlab.com",
209+
"TEST_GITLAB_TOKEN": "glpat-xyz",
210+
"TEST_GITLAB_SECOND_TOKEN": "glpat-second",
211+
"TEST_GITLAB_GROUP": "pac-e2e-tests",
212+
"TEST_GITLAB_SECOND_GROUP": "pac-e2e-tests-second",
213+
"TEST_GITLAB_SMEEURL": "https://hook.pipelinesascode.com/gitlab-test",
214+
"TEST_GITEA_API_URL": "http://localhost:3000",
215+
"TEST_GITEA_INTERNAL_URL": "http://forgejo:3000",
216+
"TEST_GITEA_PASSWORD": "pac",
217+
"TEST_GITEA_USERNAME": "pac",
218+
"TEST_GITEA_REPO_OWNER": "pac/pac",
219+
"TEST_GITEA_SMEEURL": "https://smee.io/test",
220+
"TEST_BITBUCKET_CLOUD_API_URL": "https://api.bitbucket.org/2.0",
221+
"TEST_BITBUCKET_CLOUD_USER": "bbuser",
222+
"TEST_BITBUCKET_CLOUD_TOKEN": "bb-token",
223+
"TEST_BITBUCKET_CLOUD_E2E_REPOSITORY": "workspace/repo",
224+
"TEST_BITBUCKET_DATA_CENTER_API_URL": "https://bitbucket.example.com",
225+
"TEST_BITBUCKET_DATA_CENTER_USER": "bbsuser",
226+
"TEST_BITBUCKET_DATA_CENTER_TOKEN": "bbs-token",
227+
"TEST_BITBUCKET_DATA_CENTER_E2E_REPOSITORY": "project/repo",
228+
"TEST_BITBUCKET_DATA_CENTER_WEBHOOK_SECRET": "bbs-secret",
229229
}
230230

231231
for envVar, expectedVal := range expected {

0 commit comments

Comments
 (0)
⚡