Skip to content

Commit cbae5f8

Browse files
asafgabaiasafgabai
committed
Add E2E tests
1 parent c6eb280 commit cbae5f8

File tree

6 files changed

+28
-31
lines changed

6 files changed

+28
-31
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: Tests
22
on:
33
push:
4-
branches:
5-
- '**'
6-
tags-ignore:
7-
- '**'
84
workflow_dispatch:
95
pull_request:
106
# Ensures that only the latest commit is running for each PR at a time.

‎e2e/application_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestCreateApp(t *testing.T) {
1919
userOwners := []string{"admin", "developer"}
2020
groupOwners := []string{"devops-team", "security-team"}
2121

22-
err := AppTrustCli.Exec("ac", appKey,
22+
err := AppTrustCli.Exec("app-create", appKey,
2323
"--project="+projectKey,
2424
"--application-name="+appName,
2525
"--desc="+description,
@@ -60,7 +60,7 @@ func TestUpdateApp(t *testing.T) {
6060
updatedUserOwners := []string{"app-admin", "frog"}
6161
updatedGroupOwners := []string{"dev-team", "security-team"}
6262

63-
err := AppTrustCli.Exec("au", appKey,
63+
err := AppTrustCli.Exec("app-update", appKey,
6464
"--application-name="+updatedAppName,
6565
"--desc="+updatedDescription,
6666
"--business-criticality="+updatedBusinessCriticality,
@@ -96,7 +96,7 @@ func TestDeleteApp(t *testing.T) {
9696
assert.Equal(t, appKey, app.ApplicationKey)
9797

9898
// Delete the application
99-
err = AppTrustCli.Exec("ad", appKey)
99+
err = AppTrustCli.Exec("app-delete", appKey)
100100
assert.NoError(t, err)
101101

102102
// Verify the application no longer exists

‎e2e/e2e_tests_utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ func deleteTestProject() {
6262

6363
func createBasicApplication(t *testing.T, appKey string) {
6464
projectKey := GetTestProjectKey(t)
65-
err := AppTrustCli.Exec("ac", appKey, "--project="+projectKey, "--application-name="+appKey)
65+
err := AppTrustCli.Exec("app-create", appKey, "--project="+projectKey, "--application-name="+appKey)
6666
assert.NoError(t, err)
6767
}
6868

6969
func deleteApplication(t *testing.T, appKey string) {
70-
err := AppTrustCli.Exec("ad", appKey)
70+
err := AppTrustCli.Exec("app-delete", appKey)
7171
assert.NoError(t, err)
7272
}
7373

7474
func deleteVersion(t *testing.T, appKey, version string) {
75-
err := AppTrustCli.Exec("vd", appKey, version)
75+
err := AppTrustCli.Exec("version-delete", appKey, version)
7676
assert.NoError(t, err)
7777
}
7878

‎e2e/package_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestBindPackage(t *testing.T) {
1818
testPackage := getTestPackage(t)
1919

2020
// Execute
21-
err := AppTrustCli.Exec("pb", appKey, testPackage.packageType, testPackage.packageName, testPackage.packageVersion)
21+
err := AppTrustCli.Exec("package-bind", appKey, testPackage.packageType, testPackage.packageName, testPackage.packageVersion)
2222
require.NoError(t, err)
2323

2424
// Assert
@@ -41,7 +41,7 @@ func TestUnbindPackage(t *testing.T) {
4141
testPackage := getTestPackage(t)
4242

4343
// First bind the package
44-
err := AppTrustCli.Exec("pb", appKey, testPackage.packageType, testPackage.packageName, testPackage.packageVersion)
44+
err := AppTrustCli.Exec("package-bind", appKey, testPackage.packageType, testPackage.packageName, testPackage.packageVersion)
4545
require.NoError(t, err)
4646

4747
// Verify it's bound
@@ -52,7 +52,7 @@ func TestUnbindPackage(t *testing.T) {
5252
assert.Len(t, bindings.Packages, 1)
5353

5454
// Unbind the package
55-
err = AppTrustCli.Exec("pu", appKey, testPackage.packageType, testPackage.packageName, testPackage.packageVersion)
55+
err = AppTrustCli.Exec("package-unbind", appKey, testPackage.packageType, testPackage.packageName, testPackage.packageVersion)
5656
require.NoError(t, err)
5757

5858
// Verify the package is no longer bound

‎e2e/system_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ import (
99
)
1010

1111
func TestPing(t *testing.T) {
12-
output := AppTrustCli.RunCliCmdWithOutput(t, "p")
12+
output := AppTrustCli.RunCliCmdWithOutput(t, "ping")
1313
assert.Contains(t, output, "OK")
1414
}

‎e2e/version_test.go‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestCreateVersion_Package(t *testing.T) {
2626
// Execute
2727
packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
2828
testPackage.packageType, testPackage.packageName, testPackage.packageVersion, testRepoKey)
29-
err := AppTrustCli.Exec("vc", appKey, version, packageFlag)
29+
err := AppTrustCli.Exec("version-create", appKey, version, packageFlag)
3030
require.NoError(t, err)
3131
defer deleteVersion(t, appKey, version)
3232

@@ -47,7 +47,7 @@ func TestCreateVersion_Artifact(t *testing.T) {
4747

4848
// Execute
4949
artifactFlag := fmt.Sprintf("--source-type-artifacts=path=%s", testPackage.packagePath)
50-
err := AppTrustCli.Exec("vc", appKey, version, artifactFlag)
50+
err := AppTrustCli.Exec("version-create", appKey, version, artifactFlag)
5151
require.NoError(t, err)
5252
defer deleteVersion(t, appKey, version)
5353

@@ -67,7 +67,7 @@ func TestCreateVersion_ApplicationVersion(t *testing.T) {
6767
sourceVersion := "1.0.2"
6868
packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
6969
testPackage.packageType, testPackage.packageName, testPackage.packageVersion, testRepoKey)
70-
err := AppTrustCli.Exec("vc", sourceAppKey, sourceVersion, packageFlag)
70+
err := AppTrustCli.Exec("version-create", sourceAppKey, sourceVersion, packageFlag)
7171
require.NoError(t, err)
7272
defer deleteVersion(t, sourceAppKey, sourceVersion)
7373

@@ -80,7 +80,7 @@ func TestCreateVersion_ApplicationVersion(t *testing.T) {
8080

8181
// Execute
8282
appVersionFlag := fmt.Sprintf("--source-type-application-versions=application-key=%s, version=%s", sourceAppKey, sourceVersion)
83-
err = AppTrustCli.Exec("vc", targetAppKey, targetVersion, appVersionFlag)
83+
err = AppTrustCli.Exec("version-create", targetAppKey, targetVersion, appVersionFlag)
8484
require.NoError(t, err)
8585
defer deleteVersion(t, targetAppKey, targetVersion)
8686

@@ -133,7 +133,7 @@ func TestCreateVersion_ReleaseBundle(t *testing.T) {
133133

134134
// Execute
135135
releaseBundleFlag := fmt.Sprintf("--source-type-release-bundles=name=%s, version=%s, project-key=%s", bundleName, bundleVersion, projectKey)
136-
err = AppTrustCli.Exec("vc", appKey, version, releaseBundleFlag)
136+
err = AppTrustCli.Exec("version-create", appKey, version, releaseBundleFlag)
137137
require.NoError(t, err)
138138
defer deleteVersion(t, appKey, version)
139139

@@ -156,7 +156,7 @@ func TestCreateVersion_Build(t *testing.T) {
156156

157157
// Execute
158158
buildInfoFlag := fmt.Sprintf("--source-type-builds=name=%s, id=%s", testPackage.buildName, testPackage.buildNumber)
159-
err := AppTrustCli.Exec("vc", appKey, version, buildInfoFlag)
159+
err := AppTrustCli.Exec("version-create", appKey, version, buildInfoFlag)
160160
require.NoError(t, err)
161161
defer deleteVersion(t, appKey, version)
162162

@@ -192,13 +192,13 @@ func TestUpdateVersion(t *testing.T) {
192192
// Create a version first
193193
packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
194194
testPackage.packageType, testPackage.packageName, testPackage.packageVersion, testRepoKey)
195-
err := AppTrustCli.Exec("vc", appKey, version, packageFlag)
195+
err := AppTrustCli.Exec("version-create", appKey, version, packageFlag)
196196
require.NoError(t, err)
197197
defer deleteVersion(t, appKey, version)
198198

199199
// Execute
200200
tag := "release-candidate"
201-
err = AppTrustCli.Exec("vu", appKey, version, "--tag="+tag)
201+
err = AppTrustCli.Exec("version-update", appKey, version, "--tag="+tag)
202202
require.NoError(t, err)
203203

204204
// Assert
@@ -223,7 +223,7 @@ func TestDeleteVersion(t *testing.T) {
223223
// Create a version first
224224
packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
225225
testPackage.packageType, testPackage.packageName, testPackage.packageVersion, testRepoKey)
226-
err := AppTrustCli.Exec("vc", appKey, version, packageFlag)
226+
err := AppTrustCli.Exec("version-create", appKey, version, packageFlag)
227227
require.NoError(t, err)
228228

229229
// Verify the version exists
@@ -234,7 +234,8 @@ func TestDeleteVersion(t *testing.T) {
234234
assert.Equal(t, version, versionContent.Version)
235235

236236
// Execute
237-
deleteVersion(t, appKey, version)
237+
err = AppTrustCli.Exec("version-delete", appKey, version)
238+
assert.NoError(t, err)
238239

239240
// Assert
240241
_, statusCode, err = getApplicationVersion(appKey, version)
@@ -254,13 +255,13 @@ func TestPromoteVersion(t *testing.T) {
254255
// Create a version first
255256
packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
256257
testPackage.packageType, testPackage.packageName, testPackage.packageVersion, testRepoKey)
257-
err := AppTrustCli.Exec("vc", appKey, version, packageFlag)
258+
err := AppTrustCli.Exec("version-create", appKey, version, packageFlag)
258259
require.NoError(t, err)
259260
defer deleteVersion(t, appKey, version)
260261

261262
// Execute
262263
targetStage := "DEV"
263-
err = AppTrustCli.Exec("vp", appKey, version, targetStage)
264+
err = AppTrustCli.Exec("version-promote", appKey, version, targetStage)
264265
require.NoError(t, err)
265266

266267
// Assert
@@ -285,12 +286,12 @@ func TestReleaseVersion(t *testing.T) {
285286
// Create a version first
286287
packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
287288
testPackage.packageType, testPackage.packageName, testPackage.packageVersion, testRepoKey)
288-
err := AppTrustCli.Exec("vc", appKey, version, packageFlag)
289+
err := AppTrustCli.Exec("version-create", appKey, version, packageFlag)
289290
require.NoError(t, err)
290291
defer deleteVersion(t, appKey, version)
291292

292293
// Execute
293-
err = AppTrustCli.Exec("vr", appKey, version)
294+
err = AppTrustCli.Exec("version-release", appKey, version)
294295
require.NoError(t, err)
295296

296297
// Assert
@@ -315,13 +316,13 @@ func TestRollbackVersion(t *testing.T) {
315316
// Create a version first
316317
packageFlag := fmt.Sprintf("--source-type-packages=type=%s, name=%s, version=%s, repo-key=%s",
317318
testPackage.packageType, testPackage.packageName, testPackage.packageVersion, testRepoKey)
318-
err := AppTrustCli.Exec("vc", appKey, version, packageFlag)
319+
err := AppTrustCli.Exec("version-create", appKey, version, packageFlag)
319320
require.NoError(t, err)
320321
defer deleteVersion(t, appKey, version)
321322

322323
// Promote to DEV
323324
targetStage := "DEV"
324-
err = AppTrustCli.Exec("vp", appKey, version, targetStage)
325+
err = AppTrustCli.Exec("version-promote", appKey, version, targetStage)
325326
require.NoError(t, err)
326327

327328
// Verify it's in DEV
@@ -331,7 +332,7 @@ func TestRollbackVersion(t *testing.T) {
331332
assert.Equal(t, targetStage, versionContent.CurrentStage)
332333

333334
// Execute
334-
err = AppTrustCli.Exec("vrb", appKey, version, targetStage)
335+
err = AppTrustCli.Exec("version-rollback", appKey, version, targetStage)
335336
require.NoError(t, err)
336337

337338
// Assert

0 commit comments

Comments
 (0)