Merge pull request #1792 from aziontech/dev

Deploy 2024-10-07
aziontech · Oct 7, 2024 · 26f6b88 · 26f6b88
2 parents a58e2d3 + 27de4e5
commit 26f6b88
Show file tree

Hide file tree

Showing 103 changed files with 1,625 additions and 371 deletions.
diff --git a/.github/workflows/cleanup_e2e_tests.yml b/.github/workflows/cleanup_e2e_tests.yml
@@ -0,0 +1,27 @@
+name: Run cleanup e2e tests
+
+on:
+  schedule:
+    - cron: '0 8 * * *'
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    name: Cleanup e2e tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Cleanup Prod
+        env:
+            PROD_CYPRESS_TOKEN: ${{ secrets.PROD_CYPRESS_TOKEN }}
+        run: node scripts/cleanup.js PROD
diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml
@@ -43,7 +43,7 @@ jobs:
             coverage/unit/sonar-report.xml
           retention-days: 1
 
-  run-dev-e2e-tests:
+  run-prod-e2e-tests:
     name: Run Dev E2E Tests
     runs-on: ubuntu-latest
     strategy:
@@ -61,15 +61,17 @@ jobs:
       - name: Run Cypress Tests
         uses: cypress-io/github-action@v6
         env:
-          DEV_CYPRESS_EMAIL: ${{ secrets.DEV_CYPRESS_EMAIL }}
-          DEV_CYPRESS_PASSWORD: ${{ secrets.DEV_CYPRESS_PASSWORD }}
+          PROD_CYPRESS_EMAIL: ${{ secrets.PROD_CYPRESS_EMAIL }}
+          PROD_CYPRESS_PASSWORD: ${{ secrets.PROD_CYPRESS_PASSWORD }}
+          VITE_ENVIRONMENT: "production"
         with:
           build: yarn build
           start: yarn dev --logLevel=warn
           browser: chrome
           wait-on: 'http://localhost:5173/'
           wait-on-timeout: 120
-          env: grepTags=@dev${{ matrix.group }}+-@xfail
+          config-file: cypress.config.prod.js
+          env: environment=prod,grepTags=@dev${{ matrix.group }}+-@xfail+-@dont_run_prod
 
       - name: Generate Specs JSON
         run: yarn generate-specs-json
@@ -106,7 +108,7 @@ jobs:
 
   download_and_merge:
     name: Download and Merge Coverage Reports
-    needs: run-dev-e2e-tests
+    needs: run-prod-e2e-tests
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.github/workflows/prod-e2e-tests.yml b/.github/workflows/prod-e2e-tests.yml
diff --git a/cypress.config.prod.js b/cypress.config.prod.js
@@ -4,7 +4,6 @@ import baseConfig from './cypress.config';
 
 const envOverride = {
   // TODO: remove this WORKAROUND for https://github.com/cypress-io/cypress/issues/20647,
-  baseUrl: 'http://console.azion.com',
   CYPRESS_EMAIL: process.env.PROD_CYPRESS_EMAIL,
   CYPRESS_PASSWORD: process.env.PROD_CYPRESS_PASSWORD,
 };

diff --git a/cypress.env.example.json b/cypress.env.example.json
@@ -1,10 +1,14 @@
 {
   "DEV_CYPRESS_EMAIL": "",
   "DEV_CYPRESS_PASSWORD": "",
+  "DEV_CYPRESS_TOKEN": "",
   "STAGE_CYPRESS_EMAIL": "",
   "STAGE_CYPRESS_PASSWORD": "",
+  "STAGE_CYPRESS_TOKEN": "",
   "PREVIEW_PROD_CYPRESS_EMAIL": "",
   "PREVIEW_PROD_CYPRESS_PASSWORD": "",
+  "PREVIEW_PROD_CYPRESS_TOKEN": "",
   "PROD_CYPRESS_EMAIL": "",
-  "PROD_CYPRESS_PASSWORD": ""
+  "PROD_CYPRESS_PASSWORD": "",
+  "PROD_CYPRESS_TOKEN": ""
 }
diff --git a/cypress/README.md b/cypress/README.md
@@ -116,10 +116,11 @@ For more details, see the official [@cypress/grep documentation](https://github.
 
 ### Tags Used in the Project
 
-| Tag   | Description                                         |
-|-------|-----------------------------------------------------|
-| @dev  | Runs the test in the DEV environment                |
-| @xfail| Prevents the test from running in workflows         |
+| Tag             | Description                                         |
+|-----------------|-----------------------------------------------------|
+| @dev            | Runs the test in the DEV environment                |
+| @xfail          | Prevents the test from running in workflows         |
+| @dont_run_prod  | Prevents the test from running in prod workflow     |
 
 ## Naming `data-testid`
 

diff --git a/cypress/e2e/domains/create-domain-edge-application.cy.js b/cypress/e2e/domains/create-domain-edge-application.cy.js
@@ -20,7 +20,7 @@ const createEdgeApplicationCase = () => {
   cy.get(selectors.domains.pageTitle(edgeAppName)).should('have.text', edgeAppName)
 }
 
-describe('Domains spec', { tags: ['@dev3'] }, () => {
+describe('Domains spec', { tags: ['@dev3', '@xfail'] }, () => {
   beforeEach(() => {
     cy.login()
   })

diff --git a/cypress/e2e/edge-dns/create-edge-dns-zone.cy.js b/cypress/e2e/edge-dns/create-edge-dns-zone.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev4'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-a.cy.js b/cypress/e2e/edge-dns/create-record-type-a.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev4'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-aaaa.cy.js b/cypress/e2e/edge-dns/create-record-type-aaaa.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev4'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-aname.cy.js b/cypress/e2e/edge-dns/create-record-type-aname.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev4'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev4', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-caa.cy.js b/cypress/e2e/edge-dns/create-record-type-caa.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-cname.cy.js b/cypress/e2e/edge-dns/create-record-type-cname.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-ds.cy.js b/cypress/e2e/edge-dns/create-record-type-ds.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-mx.cy.js b/cypress/e2e/edge-dns/create-record-type-mx.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-ns.cy.js b/cypress/e2e/edge-dns/create-record-type-ns.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-ptr.cy.js b/cypress/e2e/edge-dns/create-record-type-ptr.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-srv.cy.js b/cypress/e2e/edge-dns/create-record-type-srv.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-dns/create-record-type-txt.cy.js b/cypress/e2e/edge-dns/create-record-type-txt.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let zoneName = ''
 
-describe('Edge DNS spec', { tags: ['@dev5'] }, () => {
+describe('Edge DNS spec', { tags: ['@dev5', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     zoneName = generateUniqueName('DNSZone')

diff --git a/cypress/e2e/edge-firewall/create-edge-firewall-function.cy.js b/cypress/e2e/edge-firewall/create-edge-firewall-function.cy.js
@@ -4,7 +4,7 @@ import selectors from '../../support/selectors'
 
 let firewallName, functionInstanceName, ruleName
 
-describe('Edge Firewall spec', { tags: ['@dev5'] }, () => {
+describe('Edge Firewall spec', { tags: ['@dev5', '@xfail'] }, () => {
   beforeEach(() => {
     cy.login()
     firewallName = generateUniqueName('EdgeFirewall')

diff --git a/cypress/e2e/edge-firewall/create-edge-firewall-network-list.cy.js b/cypress/e2e/edge-firewall/create-edge-firewall-network-list.cy.js
@@ -23,7 +23,7 @@ const createASNNetworkListCase = () => {
   cy.verifyToast('success', 'Your network list has been created')
 }
 
-describe('Edge Firewall spec', { tags: ['@dev5'] }, () => {
+describe('Edge Firewall spec', { tags: ['@dev5', '@xfail'] }, () => {
   beforeEach(() => {
     cy.login()
     firewallName = generateUniqueName('EdgeFirewall')

diff --git a/cypress/e2e/network-lists/create-network-list-asn.cy.js b/cypress/e2e/network-lists/create-network-list-asn.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let networkListName
 
-describe('Network Lists spec', { tags: ['@dev6'] }, () => {
+describe('Network Lists spec', { tags: ['@dev6', '@xfail'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('Network Lists')

diff --git a/cypress/e2e/network-lists/create-network-list-countries.cy.js b/cypress/e2e/network-lists/create-network-list-countries.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let networkListName
 
-describe('Network Lists spec', { tags: ['@dev6'] }, () => {
+describe('Network Lists spec', { tags: ['@dev6', '@xfail'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('Network Lists')

diff --git a/cypress/e2e/variables/create-secret.cy.js b/cypress/e2e/variables/create-secret.cy.js
@@ -4,7 +4,7 @@ import selectors from '../../support/selectors'
 let variableKey
 let variableValue
 
-describe('Variables spec', { tags: ['@dev2'] }, () => {
+describe('Variables spec', { tags: ['@dev2', '@xfail'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('Variables')

diff --git a/cypress/e2e/waf/create-allowed-rule-conditional-query-string.cy.js b/cypress/e2e/waf/create-allowed-rule-conditional-query-string.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')

diff --git a/cypress/e2e/waf/create-allowed-rule-conditional-request-body.cy.js b/cypress/e2e/waf/create-allowed-rule-conditional-request-body.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')

diff --git a/cypress/e2e/waf/create-allowed-rule-conditional-request-header.cy.js b/cypress/e2e/waf/create-allowed-rule-conditional-request-header.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')

diff --git a/cypress/e2e/waf/create-allowed-rule-file-name.cy.js b/cypress/e2e/waf/create-allowed-rule-file-name.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')

diff --git a/cypress/e2e/waf/create-allowed-rule-path-zone.cy.js b/cypress/e2e/waf/create-allowed-rule-path-zone.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')

diff --git a/cypress/e2e/waf/create-allowed-rule-raw-body.cy.js b/cypress/e2e/waf/create-allowed-rule-raw-body.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')

diff --git a/cypress/e2e/waf/create-waf-rule.cy.js b/cypress/e2e/waf/create-waf-rule.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')

diff --git a/cypress/e2e/waf/edit-waf-rule.cy.js b/cypress/e2e/waf/edit-waf-rule.cy.js
@@ -3,7 +3,7 @@ import selectors from '../../support/selectors'
 
 let wafName
 
-describe('WAF spec', { tags: ['@dev7'] }, () => {
+describe('WAF spec', { tags: ['@dev7', '@dont_run_prod'] }, () => {
   beforeEach(() => {
     cy.login()
     cy.openProduct('WAF Rules')