Merge pull request 'e2e-user-aus-gitops-nutzen' (#445) from e2e-user-aus-gitops-nutzen into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/445


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

alfa-client/apps/alfa-e2e/Jenkinsfile

@@ -203,14 +203,17 @@ pipeline {
             }
         }
 
-        stage('Run E2E-Tests') {
+//        stage('Run E2E-Tests') {
+//            when {
+//                expression { !SKIP_RUN }
+//            }
+//            failFast false
+
+//            parallel {
+                stage('E2E-EA') {
                     when {
                         expression { !SKIP_RUN }
                     }
-            failFast false
-
-            parallel {
-                stage('E2E-EA') {
                     steps {
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                             script {
@@ -238,6 +241,9 @@ pipeline {
                 }
 
                 stage('E2E-Main') {
+                    when {
+                        expression { !SKIP_RUN }
+                    }
                     steps {
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                             script {
@@ -263,8 +269,8 @@ pipeline {
                         }
                     }
                 }
-            }
-        }
+//            }
+//        }
 
         stage('Delete E2E Namespaces') {
             when {
@@ -452,9 +458,6 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
 
 		envValues.user_manager.put("image", ['tag': env.USER_MANAGER_IMAGE_TAG])
 		envValues.user_manager.put("helm", ['version': env.USER_MANAGER_HELM_CHART_VERSION, 'repoUrl': env.USER_MANAGER_HELM_REPO_URL])
-
-		envValues.alfa.sso.put("keycloak_groups", generateKeycloakGroupsForHelmChart())
-		envValues.alfa.sso.put("keycloak_users", generateKeycloakUserForHelmChart(userFolder))
 	}
 
     writeYaml file: "gitops/dev/namespace/namespaces/by-${bezeichner}-dev.yaml", data: envValues, overwrite: true
@@ -467,66 +470,6 @@ Void generateNamespaceYaml(String bezeichner, String valuesPathSuffix, String us
     }
 }
 
-List generateKeycloakUserForHelmChart(String userFolder) {
-    def helmUsers = []
-
-    readUsersFixtures(userFolder).each { username, userFixture ->
-        def user = [
-            "name"      : userFixture.name,
-            "password"  : userFixture.password,
-            "first_name": userFixture.get("firstName", ""),
-            "last_name" : userFixture.get("lastName", ""),
-            "email"     : userFixture.get("email", "")
-        ]
-
-        if (userFixture.containsKey("clientRoles")) {
-            user.put("client_roles", mapUserClientRoles(userFixture.clientRoles))
-        }
-
-        if (userFixture.containsKey("groups")) {
-            user.put("groups", userFixture.groups)
-        }
-
-        helmUsers.add(user)
-    }
-
-    return helmUsers
-}
-
-List mapUserClientRoles(userClientRoles) {
-    def clientRoles = []
-
-    for(clientRole in userClientRoles) {
-        clientRoles.add(['name': 'alfa', 'role': clientRole])
-    }
-
-    return clientRoles
-}
-
-List generateKeycloakGroupsForHelmChart() {
-    def groupFiles = sh (script: 'ls src/fixtures/group', returnStdout: true)
-
-    def helmGroups = []
-
-    groupFiles.split("\\n").each { groupFile ->
-        def groupJson = readJSON file: "src/fixtures/group/${groupFile}"
-        def group = ["name": groupJson.name]
-
-        groupJson.attributes.each { key, values ->
-            if (!group.containsKey("attributes")) {
-                group.put("attributes", [["name": key, "value": values]])
-            }
-            else {
-                group.attributes.add(["name": key, "value": values])
-            }
-        }
-
-        helmGroups.add(group)
-    }
-
-    return helmGroups
-}
-
 Void deleteOzgCloudStack(ozgCloudBezeichner) {
     for(bezeichner in ozgCloudBezeichner) {
         if (hasNamespaceFile(bezeichner)) {

alfa-client/apps/alfa-e2e/src/e2e/einheitlicher-ansprechpartner/vorgang-detail/vorgang-wiedereroeffnen.ea.cy.ts

@@ -106,11 +106,10 @@ describe('Vorgang wiedereroeffnen', () => {
         });
 
         it('should have status In Bearbeitung', () => {
-          vorgangPage
-            .getVorgangDetailHeader()
-            .getStatus()
-            .should('exist')
-            .should('have.text', vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG]);
+          haveText(
+            vorgangPage.getVorgangDetailHeader().getStatus(),
+            vorgangStatusLabelE2E[VorgangStatusE2E.IN_BEARBEITUNG],
+          );
         });
 
         it('back to vorgang list', () => {

alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-ea-dev.yaml

@@ -6,20 +6,25 @@ project:
   destinations:
     - namespace: '*'
       server: https://kubernetes.default.svc
+
 alfa:
   env:
     overrideSpringProfiles: 'oc,ea,e2e,dev'
   sso:
-    serverUrl: https://sso.dev.by.ozg-cloud.de
-    apiPassword: 'Test1234!'
     keycloak_clients:
       - client_name: alfa
         client_roles:
           - name: EINHEITLICHER_ANSPRECHPARTNER
+    keycloak_users:
+      - name: emil
+        first_name: Emil
+        last_name: Ansprechpartner
+        password: "Y9nk43yrQ_zzIPpfFU-I"
+        client_roles:
+          - name: alfa
+            role: EINHEITLICHER_ANSPRECHPARTNER
   ingress:
     use_staging_cert: true
-    className: openshift-default
-  baseUrl: dev.by.ozg-cloud.de
 
 vorgang_manager:
   env:
@@ -44,28 +49,8 @@ user_manager:
   ozgcloud:
     usersync:
       onstart: true
-    keycloak:
-      api:
-        password: 'Test1234!'
-  sso:
-    serverUrl: https://sso.dev.by.ozg-cloud.de
-    api_user:
-      name: usermanagerapiuser
-      first_name: UserManager
-      last_name: ApiUser
-      realm_roles:
-        - offline_access
-        - uma_authorization
-      client_roles:
-        - name: realm-management
-          role: view-users
-        - name: realm-management
-          role: manage-users
-  baseUrl: dev.by.ozg-cloud.de
-
   ingress:
     use_staging_cert: true
-    className: openshift-default
 
 smocker:
   enabled: false

alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml

@@ -9,13 +9,8 @@ project:
 alfa:
   env:
     overrideSpringProfiles: 'oc,e2e,dev'
-  sso:
-    serverUrl: https://sso.dev.by.ozg-cloud.de
-    apiPassword: 'Test1234!'
   ingress:
     use_staging_cert: true
-    className: openshift-default
-  baseUrl: dev.by.ozg-cloud.de
 
 vorgang_manager:
   env:
@@ -40,28 +35,8 @@ user_manager:
   ozgcloud:
     usersync:
       onstart: true
-    keycloak:
-      api:
-        password: 'Test1234!'
-  sso:
-    serverUrl: https://sso.dev.by.ozg-cloud.de
-    api_user:
-      name: usermanagerapiuser
-      first_name: UserManager
-      last_name: ApiUser
-      realm_roles:
-        - offline_access
-        - uma_authorization
-      client_roles:
-        - name: realm-management
-          role: view-users
-        - name: realm-management
-          role: manage-users
-  baseUrl: dev.by.ozg-cloud.de
-
   ingress:
     use_staging_cert: true
-    className: openshift-default
 
 smocker:
   enabled: false

alfa-client/apps/alfa-e2e/src/support/cypress.util.ts

@@ -41,7 +41,7 @@ export function notExist(element: any): void {
 }
 
 export function haveText(element: any, text: string): void {
-  element.should('have.text', text);
+  element.invoke("text").then((elementText) => elementText.trim()).should("equal", text);
 }
 
 export function haveValue(element: any, value: string): void {