From 019679423a0a98ab08700a0e169759e0ae5f9cc1 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 10:49:06 -0600 Subject: [PATCH 01/31] feat: Helm test-lib library and enhanced helm testing --- chart/Chart.lock | 6 +++++ chart/Chart.yaml | 4 +++ chart/charts/bb-test-lib-0.4.0.tgz | Bin 0 -> 2369 bytes chart/templates/tests/test-api.yaml | 7 ++++++ chart/templates/tests/test-ui.yaml | 7 ++++++ chart/tests/cypress/cypress.json | 5 ++++ chart/tests/cypress/twistlock-health.spec.js | 13 ++++++++++ chart/tests/scrips/twistlock-api.sh | 23 ++++++++++++++++++ tests/cypress.json | 8 ------ .../integration/twistlock-health.spec.js | 6 ----- tests/test-values.yml | 13 ++++++++++ 11 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 chart/Chart.lock create mode 100644 chart/charts/bb-test-lib-0.4.0.tgz create mode 100644 chart/templates/tests/test-api.yaml create mode 100644 chart/templates/tests/test-ui.yaml create mode 100644 chart/tests/cypress/cypress.json create mode 100644 chart/tests/cypress/twistlock-health.spec.js create mode 100644 chart/tests/scrips/twistlock-api.sh delete mode 100644 tests/cypress.json delete mode 100644 tests/cypress/integration/twistlock-health.spec.js diff --git a/chart/Chart.lock b/chart/Chart.lock new file mode 100644 index 0000000..8e78aed --- /dev/null +++ b/chart/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: bb-test-lib + repository: oci://registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates + version: 0.4.0 +digest: sha256:c2ceab9ff826dad5860080d5880796e4b9a6fb0b3b9734c45ccb5b6cecb8ed7d +generated: "2021-05-24T10:17:10.3305634-06:00" diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 8f810a3..78d12c8 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,3 +2,7 @@ apiVersion: v2 name: twistlock version: 0.0.4-bb.0 appVersion: 21.04.412 +dependencies: + - name: bb-test-lib + version: "0.4.0" + repository: "oci://registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates" \ No newline at end of file diff --git a/chart/charts/bb-test-lib-0.4.0.tgz b/chart/charts/bb-test-lib-0.4.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..47269ecab02fec984f282a766ce13a2f7df2b98e GIT binary patch literal 2369 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 { + cy.visit(Cypress.env('twistlock_url')); + cy.title().should('eq', 'Prisma Cloud'); + }); + + it('Create admin user', () => { + cy.get('input[ng-model="user.username"]').type("admin") + cy.get('input[ng-model="user.password"]').type(Cypress.env('twistlock_password')) + cy.get('button[type="submit"]').click() + cy.title().should('eq', 'Prisma Cloud'); + }); +}) diff --git a/chart/tests/scrips/twistlock-api.sh b/chart/tests/scrips/twistlock-api.sh new file mode 100644 index 0000000..101c5cd --- /dev/null +++ b/chart/tests/scrips/twistlock-api.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -ex + +echo "Hitting Twistlock API endpoint..." +curl -sISk -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/" &>/dev/null || export TW_DOWN="true" +if [[ ${TW_DOWN} == "true" ]]; then + echo "Test 1 Failure: Cannot hit Twistlock endpoint." + echo "Debug information (curl response):" + echo $(curl -k -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/") + exit 1 +fi +echo "Test 1 Success: Twistlock API is up." + +echo "Hitting Twistlock API Version endpoint..." +version_response=$(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version" 2>/dev/null) +current_version=$(echo ${version_response} | xargs) +if [ ! ${desired_version} == ${current_version} ]; then + echo "Test 2 Failure: Twistlock version does not match." + echo "Debug information (curl response):" + echo $(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version") + exit 1 +fi +echo "Test 2 Success: Twistlock Version Matches." diff --git a/tests/cypress.json b/tests/cypress.json deleted file mode 100644 index 81dd4b8..0000000 --- a/tests/cypress.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "pluginsFile": false, - "supportFile": false, - "fixturesFolder": false, - "env": { - "twistlock_url": "twistlock.bigbang.dev" - } -} diff --git a/tests/cypress/integration/twistlock-health.spec.js b/tests/cypress/integration/twistlock-health.spec.js deleted file mode 100644 index 7b2114c..0000000 --- a/tests/cypress/integration/twistlock-health.spec.js +++ /dev/null @@ -1,6 +0,0 @@ -describe('Basic Twistlock Up', function() { - it('Check console is accessible', () => { - cy.visit(Cypress.env('twistlock_url')); - cy.title().should('eq', 'Prisma Cloud'); - }); -}) diff --git a/tests/test-values.yml b/tests/test-values.yml index 26bab16..07fc36c 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -7,3 +7,16 @@ imagePullSecrets: console: persistence: size: 5Gi + +bbtests: + cypress: + artifacts: true + envs: + twistlock_url: "twistlock.{{ .Values.hostname }}" + twistlock_password: "admin" + scripts: + image: registry1.dso.mil/ironbank/stedolan/jq:1.6 + envs: + twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" + desired_version: "{{ .Values.console.image.tag }}" + api_auth: "YWRtaW46YWRtaW4=" -- GitLab From dee89bb10a2c821ce95ee8601a72d0982bca2596 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 11:00:14 -0600 Subject: [PATCH 02/31] fix: twistlock_url env var --- tests/test-values.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 07fc36c..e40593d 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,7 +12,7 @@ bbtests: cypress: artifacts: true envs: - twistlock_url: "twistlock.{{ .Values.hostname }}" + twistlock_url: "https://twistlock.{{ .Values.hostname }}" twistlock_password: "admin" scripts: image: registry1.dso.mil/ironbank/stedolan/jq:1.6 -- GitLab From 675e57ab1cc583382678177f9a348912d6c21d15 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 11:03:28 -0600 Subject: [PATCH 03/31] fix: Correct cypress env vars --- tests/test-values.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index e40593d..36a63e2 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,8 +12,8 @@ bbtests: cypress: artifacts: true envs: - twistlock_url: "https://twistlock.{{ .Values.hostname }}" - twistlock_password: "admin" + cypress_twistlock_url: "https://twistlock.{{ .Values.hostname }}" + cypress_twistlock_password: "admin" scripts: image: registry1.dso.mil/ironbank/stedolan/jq:1.6 envs: -- GitLab From 1acd7c56b7c1c46a5c282fb22cafce0236356444 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 11:19:47 -0600 Subject: [PATCH 04/31] fix: test-values cypress url to cluster address not external one --- tests/test-values.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 36a63e2..b74035f 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,7 +12,7 @@ bbtests: cypress: artifacts: true envs: - cypress_twistlock_url: "https://twistlock.{{ .Values.hostname }}" + cypress_twistlock_url: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" cypress_twistlock_password: "admin" scripts: image: registry1.dso.mil/ironbank/stedolan/jq:1.6 -- GitLab From f26e6a78c73f087268cdd02d70f87b527be6cb34 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 11:31:08 -0600 Subject: [PATCH 05/31] fix: Syntax for cypress spec.js --- chart/tests/cypress/twistlock-health.spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 77965dd..9618bbd 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,13 +1,13 @@ describe('Twistlock Healthcheck', function() { - it('Check console is accessible', () => { + it('Check console is accessible', function() { cy.visit(Cypress.env('twistlock_url')); cy.title().should('eq', 'Prisma Cloud'); - }); + }) - it('Create admin user', () => { + it('Create admin user', function() { cy.get('input[ng-model="user.username"]').type("admin") cy.get('input[ng-model="user.password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() cy.title().should('eq', 'Prisma Cloud'); - }); + }) }) -- GitLab From 907a3950e320d6e8e7923e803eb90d38042ae84c Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 11:44:05 -0600 Subject: [PATCH 06/31] Upping bb-test-lib version --- chart/Chart.lock | 6 +++--- chart/Chart.yaml | 2 +- chart/charts/bb-test-lib-0.4.0.tgz | Bin 2369 -> 0 bytes chart/charts/bb-test-lib-0.5.2.tgz | Bin 0 -> 2475 bytes 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 chart/charts/bb-test-lib-0.4.0.tgz create mode 100644 chart/charts/bb-test-lib-0.5.2.tgz diff --git a/chart/Chart.lock b/chart/Chart.lock index 8e78aed..41f0596 100644 --- a/chart/Chart.lock +++ b/chart/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: bb-test-lib repository: oci://registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates - version: 0.4.0 -digest: sha256:c2ceab9ff826dad5860080d5880796e4b9a6fb0b3b9734c45ccb5b6cecb8ed7d -generated: "2021-05-24T10:17:10.3305634-06:00" + version: 0.5.2 +digest: sha256:6c39110f76dc0327492bfd243a76c074ca0f5f4127953c3a167a288c14850a05 +generated: "2021-05-24T11:43:27.25637-06:00" diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 78d12c8..ac4a1f7 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -4,5 +4,5 @@ version: 0.0.4-bb.0 appVersion: 21.04.412 dependencies: - name: bb-test-lib - version: "0.4.0" + version: 0.5.2 repository: "oci://registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates" \ No newline at end of file diff --git a/chart/charts/bb-test-lib-0.4.0.tgz b/chart/charts/bb-test-lib-0.4.0.tgz deleted file mode 100644 index 47269ecab02fec984f282a766ce13a2f7df2b98e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2369 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 literal 0 HcmV?d00001 -- GitLab From 924a37d1988fee40d35bed3f9b8b5e3384c4b7b0 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 11:58:58 -0600 Subject: [PATCH 07/31] fix: cypress --- chart/tests/cypress/twistlock-health.spec.js | 3 ++- tests/test-values.yml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 9618bbd..64628e2 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,10 +1,11 @@ describe('Twistlock Healthcheck', function() { it('Check console is accessible', function() { - cy.visit(Cypress.env('twistlock_url')); + cy.visit(Cypress.env('url')); cy.title().should('eq', 'Prisma Cloud'); }) it('Create admin user', function() { + cy.visit(Cypress.env('url')) cy.get('input[ng-model="user.username"]').type("admin") cy.get('input[ng-model="user.password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() diff --git a/tests/test-values.yml b/tests/test-values.yml index b74035f..932f62a 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,10 +12,9 @@ bbtests: cypress: artifacts: true envs: - cypress_twistlock_url: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" + cypress_url: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" cypress_twistlock_password: "admin" scripts: - image: registry1.dso.mil/ironbank/stedolan/jq:1.6 envs: twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" desired_version: "{{ .Values.console.image.tag }}" -- GitLab From 5a77c48423126dca3509b305eef0506c3e9ceeda Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 12:16:55 -0600 Subject: [PATCH 08/31] fix: syntax --- chart/tests/cypress/twistlock-health.spec.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 64628e2..8207c4e 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,14 +1,13 @@ describe('Twistlock Healthcheck', function() { it('Check console is accessible', function() { - cy.visit(Cypress.env('url')); - cy.title().should('eq', 'Prisma Cloud'); + cy.visit(Cypress.env('url')) + cy.title().should('eq', 'Prisma Cloud') }) it('Create admin user', function() { - cy.visit(Cypress.env('url')) cy.get('input[ng-model="user.username"]').type("admin") cy.get('input[ng-model="user.password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() - cy.title().should('eq', 'Prisma Cloud'); + cy.title().should('eq', 'Prisma Cloud') }) }) -- GitLab From b0efe9f506e5f3ade8126b3de1ab110d829e49eb Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 12:38:29 -0600 Subject: [PATCH 09/31] Setting to single cypress function --- chart/tests/cypress/twistlock-health.spec.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 8207c4e..b8d0582 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,10 +1,6 @@ describe('Twistlock Healthcheck', function() { - it('Check console is accessible', function() { - cy.visit(Cypress.env('url')) - cy.title().should('eq', 'Prisma Cloud') - }) - it('Create admin user', function() { + cy.visit(Cypress.env('url')) cy.get('input[ng-model="user.username"]').type("admin") cy.get('input[ng-model="user.password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() -- GitLab From 02879bad40cb4abd0175823d737e873fb9fea591 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 13:06:49 -0600 Subject: [PATCH 10/31] fix: More cypress syntax updates --- chart/tests/cypress/twistlock-health.spec.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index b8d0582..5ed9301 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,8 +1,15 @@ describe('Twistlock Healthcheck', function() { + it('Check console is accessible', function() { + cy.visit(Cypress.env('url')); + cy.title().should('eq', 'Prisma Cloud'); + cy.visit(Cypress.env('url')) + cy.title().should('eq', 'Prisma Cloud') + }) + it('Create admin user', function() { cy.visit(Cypress.env('url')) - cy.get('input[ng-model="user.username"]').type("admin") - cy.get('input[ng-model="user.password"]').type(Cypress.env('twistlock_password')) + cy.get('input[type="text"]').type("admin") + cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() cy.title().should('eq', 'Prisma Cloud') }) -- GitLab From dc3e495a7807af7b5f9742c502ae965c401eda85 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 13:07:12 -0600 Subject: [PATCH 11/31] fix: cypress syntax --- chart/tests/cypress/twistlock-health.spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 5ed9301..f18d498 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,7 +1,5 @@ describe('Twistlock Healthcheck', function() { it('Check console is accessible', function() { - cy.visit(Cypress.env('url')); - cy.title().should('eq', 'Prisma Cloud'); cy.visit(Cypress.env('url')) cy.title().should('eq', 'Prisma Cloud') }) -- GitLab From 2f0a07ead8bae242f6c7fc96067ddf36b81cc7fe Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 13:21:20 -0600 Subject: [PATCH 12/31] Adding debugging env var for cypress --- tests/test-values.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test-values.yml b/tests/test-values.yml index 932f62a..7196cc2 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -14,6 +14,7 @@ bbtests: envs: cypress_url: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" cypress_twistlock_password: "admin" + DEBUG: "cypress:*" scripts: envs: twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" -- GitLab From b0dc5d97622be740690a8513cd7b6cdfc9fa1e19 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 13:31:53 -0600 Subject: [PATCH 13/31] Trying more things --- chart/tests/cypress/twistlock-health.spec.js | 2 +- tests/test-values.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index f18d498..1116e04 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,11 +1,11 @@ describe('Twistlock Healthcheck', function() { it('Check console is accessible', function() { cy.visit(Cypress.env('url')) + cy.url().should('match', #!/login) cy.title().should('eq', 'Prisma Cloud') }) it('Create admin user', function() { - cy.visit(Cypress.env('url')) cy.get('input[type="text"]').type("admin") cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() diff --git a/tests/test-values.yml b/tests/test-values.yml index 7196cc2..bb0428d 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,7 +12,7 @@ bbtests: cypress: artifacts: true envs: - cypress_url: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" + cypress_url: https://twistlock-console.twistlock.svc.cluster.local:8083 cypress_twistlock_password: "admin" DEBUG: "cypress:*" scripts: -- GitLab From 7979b1255289aa587597af23bc62e2d5702680f3 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 13:35:33 -0600 Subject: [PATCH 14/31] fix: quotes --- chart/tests/cypress/twistlock-health.spec.js | 2 +- tests/test-values.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 1116e04..4a4c503 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,7 +1,7 @@ describe('Twistlock Healthcheck', function() { it('Check console is accessible', function() { cy.visit(Cypress.env('url')) - cy.url().should('match', #!/login) + cy.url().should('match', '#!/login') cy.title().should('eq', 'Prisma Cloud') }) diff --git a/tests/test-values.yml b/tests/test-values.yml index bb0428d..1e07574 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -14,7 +14,6 @@ bbtests: envs: cypress_url: https://twistlock-console.twistlock.svc.cluster.local:8083 cypress_twistlock_password: "admin" - DEBUG: "cypress:*" scripts: envs: twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" -- GitLab From 67206967643338a977b97435c19a0e3390531612 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 13:44:01 -0600 Subject: [PATCH 15/31] no second title check for cypress --- chart/tests/cypress/twistlock-health.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 4a4c503..07ef716 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -9,6 +9,5 @@ describe('Twistlock Healthcheck', function() { cy.get('input[type="text"]').type("admin") cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() - cy.title().should('eq', 'Prisma Cloud') }) }) -- GitLab From 37aeef58fb6867ebcf38a2dfd8d2e7f26b11d545 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 14:00:23 -0600 Subject: [PATCH 16/31] Pivoting to create user via API Script --- chart/tests/cypress/twistlock-health.spec.js | 5 ++--- chart/tests/scrips/twistlock-api.sh | 12 ++++++++++-- tests/test-values.yml | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index 07ef716..f2d85e9 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -1,13 +1,12 @@ describe('Twistlock Healthcheck', function() { it('Check console is accessible', function() { cy.visit(Cypress.env('url')) - cy.url().should('match', '#!/login') cy.title().should('eq', 'Prisma Cloud') }) - it('Create admin user', function() { + /*it('Create admin user', function() { cy.get('input[type="text"]').type("admin") cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() - }) + })*/ }) diff --git a/chart/tests/scrips/twistlock-api.sh b/chart/tests/scrips/twistlock-api.sh index 101c5cd..77f1a3f 100644 --- a/chart/tests/scrips/twistlock-api.sh +++ b/chart/tests/scrips/twistlock-api.sh @@ -11,13 +11,21 @@ if [[ ${TW_DOWN} == "true" ]]; then fi echo "Test 1 Success: Twistlock API is up." +echo "Creating admin user for further testing" +curl -sISk -H 'Content-Type: application/json' -XPOST -d '{"username": "admin", "password": "${twistlock_password}"}' "${twistlock_host}/api/v1/signup" &>/dev/null || export SIGNUP_FAILED="true" +if [[ ${SIGNUP_FAILED} == "true" ]]; then + echo "Test 2 Failure: Could not create admin user." + exit 1 +fi +echo "Test 2 Success: Twistlock API is up." + echo "Hitting Twistlock API Version endpoint..." version_response=$(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version" 2>/dev/null) current_version=$(echo ${version_response} | xargs) if [ ! ${desired_version} == ${current_version} ]; then - echo "Test 2 Failure: Twistlock version does not match." + echo "Test 3 Failure: Twistlock version does not match." echo "Debug information (curl response):" echo $(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version") exit 1 fi -echo "Test 2 Success: Twistlock Version Matches." +echo "Test 3 Success: Twistlock Version Matches." diff --git a/tests/test-values.yml b/tests/test-values.yml index 1e07574..338cb3e 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -13,9 +13,9 @@ bbtests: artifacts: true envs: cypress_url: https://twistlock-console.twistlock.svc.cluster.local:8083 - cypress_twistlock_password: "admin" scripts: envs: twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" desired_version: "{{ .Values.console.image.tag }}" + twistlock_password: "admin" api_auth: "YWRtaW46YWRtaW4=" -- GitLab From a1ecd2c038e8193b3346056d3f3e3acd5de3d166 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 14:04:44 -0600 Subject: [PATCH 17/31] fix: Correct folder spelling --- chart/tests/{scrips/twistlock-api.sh => scripts/check-api.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename chart/tests/{scrips/twistlock-api.sh => scripts/check-api.sh} (100%) diff --git a/chart/tests/scrips/twistlock-api.sh b/chart/tests/scripts/check-api.sh similarity index 100% rename from chart/tests/scrips/twistlock-api.sh rename to chart/tests/scripts/check-api.sh -- GitLab From a2f3d2dfaf752051b530029b0f919327f01553b6 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 14:11:12 -0600 Subject: [PATCH 18/31] idk anymore :crosses_fingers: --- tests/test-values.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test-values.yml b/tests/test-values.yml index 338cb3e..45808b1 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -19,3 +19,4 @@ bbtests: desired_version: "{{ .Values.console.image.tag }}" twistlock_password: "admin" api_auth: "YWRtaW46YWRtaW4=" + -- GitLab From 0fe4ac7a0997a3fbee132eb8faf921b955f43254 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 14:18:28 -0600 Subject: [PATCH 19/31] Adding bbtests.scripts.image --- tests/test-values.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test-values.yml b/tests/test-values.yml index 45808b1..d895d21 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -14,6 +14,7 @@ bbtests: envs: cypress_url: https://twistlock-console.twistlock.svc.cluster.local:8083 scripts: + image: registry1.dso.mil/ironbank/stedolan/jq:1.6 envs: twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" desired_version: "{{ .Values.console.image.tag }}" -- GitLab From d5e9e3c3c686962062b9ad2dc4d57cc9827c8448 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 14:32:41 -0600 Subject: [PATCH 20/31] No env vars in curl -d JSON input --- chart/tests/scripts/check-api.sh | 4 ++-- tests/test-values.yml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/chart/tests/scripts/check-api.sh b/chart/tests/scripts/check-api.sh index 77f1a3f..798c069 100644 --- a/chart/tests/scripts/check-api.sh +++ b/chart/tests/scripts/check-api.sh @@ -12,7 +12,7 @@ fi echo "Test 1 Success: Twistlock API is up." echo "Creating admin user for further testing" -curl -sISk -H 'Content-Type: application/json' -XPOST -d '{"username": "admin", "password": "${twistlock_password}"}' "${twistlock_host}/api/v1/signup" &>/dev/null || export SIGNUP_FAILED="true" +curl -sISk -H 'Content-Type: application/json' -XPOST -d '{"username": "admin", "password": "admin"}' "${twistlock_host}/api/v1/signup" &>/dev/null || export SIGNUP_FAILED="true" if [[ ${SIGNUP_FAILED} == "true" ]]; then echo "Test 2 Failure: Could not create admin user." exit 1 @@ -20,7 +20,7 @@ fi echo "Test 2 Success: Twistlock API is up." echo "Hitting Twistlock API Version endpoint..." -version_response=$(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version" 2>/dev/null) +version_response=$(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic YWRtaW46YWRtaW4=' "${twistlock_host}/api/v1/version" 2>/dev/null) current_version=$(echo ${version_response} | xargs) if [ ! ${desired_version} == ${current_version} ]; then echo "Test 3 Failure: Twistlock version does not match." diff --git a/tests/test-values.yml b/tests/test-values.yml index d895d21..ef46628 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -18,6 +18,4 @@ bbtests: envs: twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" desired_version: "{{ .Values.console.image.tag }}" - twistlock_password: "admin" - api_auth: "YWRtaW46YWRtaW4=" -- GitLab From c3613fc6e1ed3aefd011bb94bfb3369eba79d4ef Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 14:48:31 -0600 Subject: [PATCH 21/31] updating testing script --- chart/tests/scripts/check-api.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/chart/tests/scripts/check-api.sh b/chart/tests/scripts/check-api.sh index 798c069..a521dd3 100644 --- a/chart/tests/scripts/check-api.sh +++ b/chart/tests/scripts/check-api.sh @@ -12,20 +12,16 @@ fi echo "Test 1 Success: Twistlock API is up." echo "Creating admin user for further testing" -curl -sISk -H 'Content-Type: application/json' -XPOST -d '{"username": "admin", "password": "admin"}' "${twistlock_host}/api/v1/signup" &>/dev/null || export SIGNUP_FAILED="true" -if [[ ${SIGNUP_FAILED} == "true" ]]; then - echo "Test 2 Failure: Could not create admin user." - exit 1 -fi -echo "Test 2 Success: Twistlock API is up." +curl -k -H 'Content-Type: application/json' -XPOST -d '{"username": "admin", "password": "admin"}' "${twistlock_host}/api/v1/signup" &>/dev/null +echo "Created admin user for further testing." echo "Hitting Twistlock API Version endpoint..." version_response=$(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic YWRtaW46YWRtaW4=' "${twistlock_host}/api/v1/version" 2>/dev/null) current_version=$(echo ${version_response} | xargs) if [ ! ${desired_version} == ${current_version} ]; then - echo "Test 3 Failure: Twistlock version does not match." + echo "Test 2 Failure: Twistlock version does not match." echo "Debug information (curl response):" echo $(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version") exit 1 fi -echo "Test 3 Success: Twistlock Version Matches." +echo "Test 2 Success: Twistlock Version Matches." -- GitLab From 2272f580c3bdac135d03153db35a30cc75c9306f Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 15:02:12 -0600 Subject: [PATCH 22/31] feat: Finalizing helm testing --- chart/tests/cypress/twistlock-health.spec.js | 3 +- chart/tests/scripts/check-api.sh | 29 ++++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js index f2d85e9..6b64e72 100644 --- a/chart/tests/cypress/twistlock-health.spec.js +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -4,7 +4,8 @@ describe('Twistlock Healthcheck', function() { cy.title().should('eq', 'Prisma Cloud') }) - /*it('Create admin user', function() { + /* Below section should work, but times out because either one of Cypress or Twistlock doesn't play nice. + it('Create admin user', function() { cy.get('input[type="text"]').type("admin") cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() diff --git a/chart/tests/scripts/check-api.sh b/chart/tests/scripts/check-api.sh index a521dd3..c49f607 100644 --- a/chart/tests/scripts/check-api.sh +++ b/chart/tests/scripts/check-api.sh @@ -11,17 +11,18 @@ if [[ ${TW_DOWN} == "true" ]]; then fi echo "Test 1 Success: Twistlock API is up." -echo "Creating admin user for further testing" -curl -k -H 'Content-Type: application/json' -XPOST -d '{"username": "admin", "password": "admin"}' "${twistlock_host}/api/v1/signup" &>/dev/null -echo "Created admin user for further testing." - -echo "Hitting Twistlock API Version endpoint..." -version_response=$(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic YWRtaW46YWRtaW4=' "${twistlock_host}/api/v1/version" 2>/dev/null) -current_version=$(echo ${version_response} | xargs) -if [ ! ${desired_version} == ${current_version} ]; then - echo "Test 2 Failure: Twistlock version does not match." - echo "Debug information (curl response):" - echo $(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version") - exit 1 -fi -echo "Test 2 Success: Twistlock Version Matches." +# A license is required to do more +#echo "Creating admin user for further testing" +#curl -k -H 'Content-Type: application/json' -XPOST -d '{"username": "admin", "password": "admin"}' "${twistlock_host}/api/v1/signup" &>/dev/null +#echo "Created admin user for further testing." +# +#echo "Hitting Twistlock API Version endpoint..." +#version_response=$(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic YWRtaW46YWRtaW4=' "${twistlock_host}/api/v1/version" 2>/dev/null) +#current_version=$(echo ${version_response} | xargs) +#if [ ! ${desired_version} == ${current_version} ]; then +# echo "Test 2 Failure: Twistlock version does not match." +# echo "Debug information (curl response):" +# echo $(curl -k -H 'Content-Type: application/json' -H 'Authorization: Basic "${api_auth}"' "${twistlock_host}/api/v1/version") +# exit 1 +#fi +#echo "Test 2 Success: Twistlock Version Matches." -- GitLab From 04e2f7685b1895d6e00174cbdb9c4f6ba58b5f56 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 16:29:14 -0600 Subject: [PATCH 23/31] feat: Re-structuring helm tests --- .../tests/cypress/01-twistlock-health-check.spec.js | 6 ++++++ chart/tests/cypress/02-create-admin-user.spec.js | 12 ++++++++++++ chart/tests/cypress/twistlock-health.spec.js | 13 ------------- tests/test-values.yml | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 chart/tests/cypress/01-twistlock-health-check.spec.js create mode 100644 chart/tests/cypress/02-create-admin-user.spec.js delete mode 100644 chart/tests/cypress/twistlock-health.spec.js diff --git a/chart/tests/cypress/01-twistlock-health-check.spec.js b/chart/tests/cypress/01-twistlock-health-check.spec.js new file mode 100644 index 0000000..eaf77b0 --- /dev/null +++ b/chart/tests/cypress/01-twistlock-health-check.spec.js @@ -0,0 +1,6 @@ +describe('Twistlock Page Check', () => { + it('Check console is accessible', () => { + cy.visit('/') + cy.title().should('eq', 'Prisma Cloud') + }) +}) diff --git a/chart/tests/cypress/02-create-admin-user.spec.js b/chart/tests/cypress/02-create-admin-user.spec.js new file mode 100644 index 0000000..1f90050 --- /dev/null +++ b/chart/tests/cypress/02-create-admin-user.spec.js @@ -0,0 +1,12 @@ +Cypress.on('uncaught:exception', (err, runnable) => { + // returning false here prevents Cypress from failing the test + return false + }) + + describe('Create Initial User', () => { + it('Create admin user', () => { + cy.get('input[type="text"]').type("admin") + cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) + cy.get('button[type="submit"]').click() + }) + }) \ No newline at end of file diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js deleted file mode 100644 index 6b64e72..0000000 --- a/chart/tests/cypress/twistlock-health.spec.js +++ /dev/null @@ -1,13 +0,0 @@ -describe('Twistlock Healthcheck', function() { - it('Check console is accessible', function() { - cy.visit(Cypress.env('url')) - cy.title().should('eq', 'Prisma Cloud') - }) - - /* Below section should work, but times out because either one of Cypress or Twistlock doesn't play nice. - it('Create admin user', function() { - cy.get('input[type="text"]').type("admin") - cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) - cy.get('button[type="submit"]').click() - })*/ -}) diff --git a/tests/test-values.yml b/tests/test-values.yml index ef46628..3bfd55d 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,7 +12,7 @@ bbtests: cypress: artifacts: true envs: - cypress_url: https://twistlock-console.twistlock.svc.cluster.local:8083 + cypress_baseUrl: "https://twistlock-console.twistlock.svc.cluster.local:8083" scripts: image: registry1.dso.mil/ironbank/stedolan/jq:1.6 envs: -- GitLab From 1caef02105c30d729c36405cd591f20bb9a9adf7 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 16:36:29 -0600 Subject: [PATCH 24/31] Adding visit to second cypress spec --- chart/tests/cypress/02-create-admin-user.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/chart/tests/cypress/02-create-admin-user.spec.js b/chart/tests/cypress/02-create-admin-user.spec.js index 1f90050..3c30209 100644 --- a/chart/tests/cypress/02-create-admin-user.spec.js +++ b/chart/tests/cypress/02-create-admin-user.spec.js @@ -5,6 +5,7 @@ Cypress.on('uncaught:exception', (err, runnable) => { describe('Create Initial User', () => { it('Create admin user', () => { + cy.visit('/#!/login') cy.get('input[type="text"]').type("admin") cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() -- GitLab From 80431b1132ea7249b67d9d3b49d52fc06b509bb0 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 16:46:34 -0600 Subject: [PATCH 25/31] test: Updating to non-ssl port --- tests/test-values.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 3bfd55d..4fd2d6d 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,7 +12,7 @@ bbtests: cypress: artifacts: true envs: - cypress_baseUrl: "https://twistlock-console.twistlock.svc.cluster.local:8083" + cypress_baseUrl: "http://twistlock-console.twistlock.svc.cluster.local:8081" scripts: image: registry1.dso.mil/ironbank/stedolan/jq:1.6 envs: -- GitLab From f5ea971f514744095c6a7b105f24281b41183e04 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Mon, 24 May 2021 16:55:15 -0600 Subject: [PATCH 26/31] feat: Testing adding waits for cypress --- chart/tests/cypress/01-twistlock-health-check.spec.js | 1 + chart/tests/cypress/02-create-admin-user.spec.js | 1 + 2 files changed, 2 insertions(+) diff --git a/chart/tests/cypress/01-twistlock-health-check.spec.js b/chart/tests/cypress/01-twistlock-health-check.spec.js index eaf77b0..465f88c 100644 --- a/chart/tests/cypress/01-twistlock-health-check.spec.js +++ b/chart/tests/cypress/01-twistlock-health-check.spec.js @@ -1,6 +1,7 @@ describe('Twistlock Page Check', () => { it('Check console is accessible', () => { cy.visit('/') + cy.wait(3000) cy.title().should('eq', 'Prisma Cloud') }) }) diff --git a/chart/tests/cypress/02-create-admin-user.spec.js b/chart/tests/cypress/02-create-admin-user.spec.js index 3c30209..bf5f61b 100644 --- a/chart/tests/cypress/02-create-admin-user.spec.js +++ b/chart/tests/cypress/02-create-admin-user.spec.js @@ -6,6 +6,7 @@ Cypress.on('uncaught:exception', (err, runnable) => { describe('Create Initial User', () => { it('Create admin user', () => { cy.visit('/#!/login') + cy.wait(5000) cy.get('input[type="text"]').type("admin") cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) cy.get('button[type="submit"]').click() -- GitLab From 78a66fa37f394b97b8ba87bfe4bd21f92a6ffe91 Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Tue, 25 May 2021 09:42:19 -0600 Subject: [PATCH 27/31] Adding cy visit timeouts --- chart/tests/cypress/01-twistlock-health-check.spec.js | 2 +- chart/tests/cypress/02-create-admin-user.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/tests/cypress/01-twistlock-health-check.spec.js b/chart/tests/cypress/01-twistlock-health-check.spec.js index 465f88c..1022488 100644 --- a/chart/tests/cypress/01-twistlock-health-check.spec.js +++ b/chart/tests/cypress/01-twistlock-health-check.spec.js @@ -1,6 +1,6 @@ describe('Twistlock Page Check', () => { it('Check console is accessible', () => { - cy.visit('/') + cy.visit('/', { timeout: 5000 }) cy.wait(3000) cy.title().should('eq', 'Prisma Cloud') }) diff --git a/chart/tests/cypress/02-create-admin-user.spec.js b/chart/tests/cypress/02-create-admin-user.spec.js index bf5f61b..420bd53 100644 --- a/chart/tests/cypress/02-create-admin-user.spec.js +++ b/chart/tests/cypress/02-create-admin-user.spec.js @@ -5,7 +5,7 @@ Cypress.on('uncaught:exception', (err, runnable) => { describe('Create Initial User', () => { it('Create admin user', () => { - cy.visit('/#!/login') + cy.visit('/#!/login', { timeout: 5000 }) cy.wait(5000) cy.get('input[type="text"]').type("admin") cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) -- GitLab From 132b21b0cffdbe576e08264c794faf87ba81149e Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Tue, 25 May 2021 10:12:46 -0600 Subject: [PATCH 28/31] feat: Reverting cypress configs to basic testing --- .../cypress/01-twistlock-health-check.spec.js | 7 ------- chart/tests/cypress/02-create-admin-user.spec.js | 14 -------------- chart/tests/cypress/twistlock-health.spec.js | 13 +++++++++++++ 3 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 chart/tests/cypress/01-twistlock-health-check.spec.js delete mode 100644 chart/tests/cypress/02-create-admin-user.spec.js create mode 100644 chart/tests/cypress/twistlock-health.spec.js diff --git a/chart/tests/cypress/01-twistlock-health-check.spec.js b/chart/tests/cypress/01-twistlock-health-check.spec.js deleted file mode 100644 index 1022488..0000000 --- a/chart/tests/cypress/01-twistlock-health-check.spec.js +++ /dev/null @@ -1,7 +0,0 @@ -describe('Twistlock Page Check', () => { - it('Check console is accessible', () => { - cy.visit('/', { timeout: 5000 }) - cy.wait(3000) - cy.title().should('eq', 'Prisma Cloud') - }) -}) diff --git a/chart/tests/cypress/02-create-admin-user.spec.js b/chart/tests/cypress/02-create-admin-user.spec.js deleted file mode 100644 index 420bd53..0000000 --- a/chart/tests/cypress/02-create-admin-user.spec.js +++ /dev/null @@ -1,14 +0,0 @@ -Cypress.on('uncaught:exception', (err, runnable) => { - // returning false here prevents Cypress from failing the test - return false - }) - - describe('Create Initial User', () => { - it('Create admin user', () => { - cy.visit('/#!/login', { timeout: 5000 }) - cy.wait(5000) - cy.get('input[type="text"]').type("admin") - cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) - cy.get('button[type="submit"]').click() - }) - }) \ No newline at end of file diff --git a/chart/tests/cypress/twistlock-health.spec.js b/chart/tests/cypress/twistlock-health.spec.js new file mode 100644 index 0000000..251bb65 --- /dev/null +++ b/chart/tests/cypress/twistlock-health.spec.js @@ -0,0 +1,13 @@ +describe('Twistlock Healthcheck', function() { + it('Check console is accessible', function() { + cy.visit('/', { timeout: 5000 }) + cy.title().should('eq', 'Prisma Cloud') + }) + + /* Below section should work, but times out because either one of Cypress or Twistlock doesn't play nice. + it('Create admin user', function() { + cy.get('input[type="text"]').type("admin") + cy.get('input[type="password"]').type(Cypress.env('twistlock_password')) + cy.get('button[type="submit"]').click() + })*/ +}) -- GitLab From f58c8a739c0720ed9c4a34678ed1678cc0bb970a Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Tue, 25 May 2021 10:20:45 -0600 Subject: [PATCH 29/31] feat: Finalizing bbtests test-values portion --- tests/test-values.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 4fd2d6d..57726de 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -12,10 +12,9 @@ bbtests: cypress: artifacts: true envs: - cypress_baseUrl: "http://twistlock-console.twistlock.svc.cluster.local:8081" + cypress_baseUrl: "http://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8081" scripts: image: registry1.dso.mil/ironbank/stedolan/jq:1.6 envs: twistlock_host: "https://{{ .Release.Name }}-console.{{ .Release.Namespace }}.svc.cluster.local:8083" desired_version: "{{ .Values.console.image.tag }}" - -- GitLab From dcf4debcbe8bbe6b9185b2a451ba49707c24f50d Mon Sep 17 00:00:00 2001 From: "garcia.ryan" Date: Tue, 1 Jun 2021 10:12:37 -0600 Subject: [PATCH 30/31] feat: Migrating to gluon library --- chart/Chart.lock | 10 +++++----- chart/Chart.yaml | 6 +++--- chart/charts/bb-test-lib-0.5.2.tgz | Bin 2475 -> 0 bytes chart/charts/gluon-0.1.1.tgz | Bin 0 -> 2691 bytes chart/templates/tests/test-api.yaml | 4 ++-- chart/templates/tests/test-ui.yaml | 6 +++--- tests/test-values.yml | 1 + 7 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 chart/charts/bb-test-lib-0.5.2.tgz create mode 100644 chart/charts/gluon-0.1.1.tgz diff --git a/chart/Chart.lock b/chart/Chart.lock index 41f0596..507aa7a 100644 --- a/chart/Chart.lock +++ b/chart/Chart.lock @@ -1,6 +1,6 @@ dependencies: -- name: bb-test-lib - repository: oci://registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates - version: 0.5.2 -digest: sha256:6c39110f76dc0327492bfd243a76c074ca0f5f4127953c3a167a288c14850a05 -generated: "2021-05-24T11:43:27.25637-06:00" +- name: gluon + repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon + version: 0.1.1 +digest: sha256:cf1107c00a11cde8074a39624643312fe85ee11250bb7d9380e3787bde0af0f7 +generated: "2021-06-01T10:06:05.8383699-06:00" diff --git a/chart/Chart.yaml b/chart/Chart.yaml index ac4a1f7..559431d 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -3,6 +3,6 @@ name: twistlock version: 0.0.4-bb.0 appVersion: 21.04.412 dependencies: - - name: bb-test-lib - version: 0.5.2 - repository: "oci://registry.dso.mil/platform-one/big-bang/pipeline-templates/pipeline-templates" \ No newline at end of file + - name: gluon + version: 0.1.1 + repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon diff --git a/chart/charts/bb-test-lib-0.5.2.tgz b/chart/charts/bb-test-lib-0.5.2.tgz deleted file mode 100644 index 2045d9ca5f02c5d182a0b1654b9dc1838bd6caa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2475 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 diff --git a/chart/charts/gluon-0.1.1.tgz b/chart/charts/gluon-0.1.1.tgz new file mode 100644 index 0000000000000000000000000000000000000000..b4a4878dae126348cdee9d80977a15121ba59f9f GIT binary patch literal 2691 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 literal 0 HcmV?d00001 diff --git a/chart/templates/tests/test-api.yaml b/chart/templates/tests/test-api.yaml index d5b61c1..37e825e 100644 --- a/chart/templates/tests/test-api.yaml +++ b/chart/templates/tests/test-api.yaml @@ -1,7 +1,7 @@ -{{- include "bb-test-lib.script-configmap.overrides" (list . "twistlock-test.script-configmap") }} +{{- include "gluon.tests.script-configmap.overrides" (list . "twistlock-test.script-configmap") }} {{- define "twistlock-test.script-configmap" }} {{- end }} --- -{{- include "bb-test-lib.script-runner.overrides" (list . "twistlock-test.script-runner") -}} +{{- include "gluon.tests.script-runner.overrides" (list . "twistlock-test.script-runner") -}} {{- define "twistlock-test.script-runner" -}} {{- end }} diff --git a/chart/templates/tests/test-ui.yaml b/chart/templates/tests/test-ui.yaml index f9976d7..c308e60 100644 --- a/chart/templates/tests/test-ui.yaml +++ b/chart/templates/tests/test-ui.yaml @@ -1,7 +1,7 @@ -{{- include "bb-test-lib.cypress-configmap.overrides" (list . "twistlock-test.cypress-configmap") }} +{{- include "gluon.tests.cypress-configmap.overrides" (list . "twistlock-test.cypress-configmap") }} {{- define "twistlock-test.cypress-configmap" }} {{- end }} --- -{{- include "bb-test-lib.cypress-runner.overrides" (list . "twistlock-test.cypress-runner") -}} +{{- include "gluon.tests.cypress-runner.overrides" (list . "twistlock-test.cypress-runner") -}} {{- define "twistlock-test.cypress-runner" -}} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/tests/test-values.yml b/tests/test-values.yml index 57726de..40a6f0c 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -9,6 +9,7 @@ console: size: 5Gi bbtests: + enabled: true cypress: artifacts: true envs: -- GitLab From 86d54be995617a3e44641dc7e1634ab8ac4bf282 Mon Sep 17 00:00:00 2001 From: Josh Wolf Date: Tue, 1 Jun 2021 15:21:36 -0600 Subject: [PATCH 31/31] bump chart --- chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 559431d..571ee7b 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: twistlock -version: 0.0.4-bb.0 +version: 0.0.4-bb.3 appVersion: 21.04.412 dependencies: - name: gluon -- GitLab