From ca08607ee9f3286469756183077416ad6bde5b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Silva?= <ffjs1993@gmail.com>
Date: Wed, 3 Jul 2024 12:28:11 +0100
Subject: [PATCH] fix: E2E RBAC tentative (#474)

---
 .github/workflows/dev-fe-e2e.yaml            | 24 ++++++++++----------
 ui/apps/everest/.e2e/global.setup.ts         |  2 +-
 ui/apps/everest/.e2e/utils/backup-storage.ts |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/dev-fe-e2e.yaml b/.github/workflows/dev-fe-e2e.yaml
index c3de6b053..ca8952ddb 100644
--- a/.github/workflows/dev-fe-e2e.yaml
+++ b/.github/workflows/dev-fe-e2e.yaml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
-          cache: 'pnpm'
+          cache: "pnpm"
           cache-dependency-path: ui/pnpm-lock.yaml
 
       - name: Set up Helm
@@ -112,10 +112,10 @@ jobs:
           --skip-wizard \
           --namespaces pg-only
 
-      - name: Create Everest test user
+      - name: Get Everest admin password
         shell: bash
         run: |
-          ./bin/everestctl accounts create -u ${{ secrets.CI_USER }} -p ${{ secrets.CI_PASSWORD }}
+          echo "EVEREST_ADMIN_PASSWORD=$(./bin/everestctl accounts initial-admin-password)" >> $GITHUB_ENV
 
       - name: Expose Everest API Server
         shell: bash
@@ -138,15 +138,15 @@ jobs:
       - name: Run integration tests
         shell: bash
         env:
-          EVEREST_LOCATION_BUCKET_NAME: 'bucket-1'
-          EVEREST_LOCATION_ACCESS_KEY: 'minioadmin'
-          EVEREST_LOCATION_SECRET_KEY: 'minioadmin'
-          EVEREST_LOCATION_REGION: 'us-east-1'
-          EVEREST_LOCATION_URL: 'https://minio.minio.svc.cluster.local'
-          CI_USER: '${{ secrets.CI_USER }}'
-          CI_PASSWORD: '${{ secrets.CI_PASSWORD }}'
-          MONITORING_USER: 'admin'
-          MONITORING_PASSWORD: 'admin'
+          EVEREST_LOCATION_BUCKET_NAME: "bucket-1"
+          EVEREST_LOCATION_ACCESS_KEY: "minioadmin"
+          EVEREST_LOCATION_SECRET_KEY: "minioadmin"
+          EVEREST_LOCATION_REGION: "us-east-1"
+          EVEREST_LOCATION_URL: "https://minio.minio.svc.cluster.local"
+          CI_USER: "admin"
+          CI_PASSWORD: "${{ env.EVEREST_ADMIN_PASSWORD }}"
+          MONITORING_USER: "admin"
+          MONITORING_PASSWORD: "admin"
         run: |
           cd ui
           pnpm --filter "@percona/everest" e2e
diff --git a/ui/apps/everest/.e2e/global.setup.ts b/ui/apps/everest/.e2e/global.setup.ts
index a46de3a23..bbcb14d41 100644
--- a/ui/apps/everest/.e2e/global.setup.ts
+++ b/ui/apps/everest/.e2e/global.setup.ts
@@ -75,7 +75,7 @@ setup('Backup storages', async ({ request }) => {
             url: EVEREST_LOCATION_URL,
             region: EVEREST_LOCATION_REGION,
             verifyTLS: false,
-            forcePathStyle: false,
+            forcePathStyle: true,
           },
           headers: {
             Authorization: `Bearer ${token}`,
diff --git a/ui/apps/everest/.e2e/utils/backup-storage.ts b/ui/apps/everest/.e2e/utils/backup-storage.ts
index 666a9314f..ff3f5ce3d 100644
--- a/ui/apps/everest/.e2e/utils/backup-storage.ts
+++ b/ui/apps/everest/.e2e/utils/backup-storage.ts
@@ -29,7 +29,7 @@ export const createBackupStorageFn = async (
     url: EVEREST_LOCATION_URL,
     region: EVEREST_LOCATION_REGION,
     verifyTLS: false,
-    forcePathStyle: false,
+    forcePathStyle: true,
   };
 
   const response = await request.post('/v1/backup-storages/', {