Merge branch 'release/v1.10.0-1'

Author: cbeyer42

.dockerignore

@@ -1,4 +1,5 @@
 **/app.vagrant/**
 **/app/node_modules/**
+**/app/**/node_modules/**
 **/app/target/**
 **/usermgt.iml

.gitignore

@@ -27,3 +27,4 @@ app/.project
 *.iml
 **/target/**
 **/build/tmp/**
+.npmrc

CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.10.0-1] - 2023-04-20
+### Changed
+- Rewrite frontend with React (#77)
+- Extend search endpoint to pass a list of excluded values (#77)
+- Update documentation with current screenshots and better explanations (#81)
+- Update cypress-version for integration-tests (#78)
+
+### Added
+- New integration-tests for rewritten frontend (#78)
+
 ## [v1.9.0-1] - 2022-11-14
 ### Changed
 - Add Backend Endpoint for the User Import via CSV-File (#69)

Dockerfile

@@ -1,14 +1,20 @@
-FROM openjdk:8u302-jdk as builder
-COPY app/ /usermgt
+FROM timbru31/java-node:8-jdk-18 as builder
+COPY app/pom.xml /usermgt/pom.xml
+COPY app/mvnw /usermgt/mvnw
+COPY app/.mvn /usermgt/.mvn
 RUN set -x \
- && cd /usermgt \
- && ./mvnw package
+    && cd /usermgt \
+    && ./mvnw dependency:resolve-plugins dependency:resolve
 
+COPY app/ /usermgt
+RUN set -x \
+     && cd /usermgt \
+     && ./mvnw package
 
 FROM registry.cloudogu.com/official/java:8u302-3
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.9.0-1" \
+   VERSION="1.10.0-1" \
    maintainer="[email protected]"
 
 # mark as webapp for nginx
@@ -59,7 +65,7 @@ COPY resources /
 EXPOSE 8080
 
 # healtcheck
-HEALTHCHECK CMD doguctl healthy usermgt || exit 1
+HEALTHCHECK --interval=5s CMD doguctl healthy usermgt || exit 1
 
 # execution
 CMD /startup.sh

Jenkinsfile

@@ -30,13 +30,11 @@ node('docker') {
     GitHub github = new GitHub(this, git)
     Changelog changelog = new Changelog(this)
 
-    // Workaround SUREFIRE-1588 on Debian/Ubuntu. Should be fixed in Surefire 3.0.0
-    mvn.additionalArgs = '-DargLine="-Djdk.net.URLClassPath.disableClassPathURLCheck=true"'
-
     stage('Checkout') {
         checkout scm
         //  Don't remove folders starting in "." like * .m2 (maven), .npm, .cache, .local (bower)
         git.clean('".*/"')
+        createNpmrcFile("jenkins")
     }
 
     stage('Lint') {
@@ -51,7 +49,7 @@ node('docker') {
 
     // Run inside of docker container, because karma always starts on port 9876 which might lead to errors when two
     // builds run concurrently (e.g. feature branch, PR and develop)
-    new Docker(this).image('openjdk:8-jdk')
+    new Docker(this).image('timbru31/java-node:8-jdk-18')
             .mountJenkinsUser()
             .inside {
 
@@ -62,7 +60,7 @@ node('docker') {
             }
 
             stage('Unit Test') {
-                mvn 'test'
+                mvn 'test jacoco:report'
             }
         }
     }
@@ -147,11 +145,11 @@ node('docker') {
 
       stage('Integration Tests') {
          echo "run integration tests."
-         ecoSystem.runCypressIntegrationTests([
-                 cypressImage: "cypress/included:8.6.0",
-                 enableVideo: params.EnableVideoRecording,
-                 enableScreenshots    : params.EnableScreenshotRecording,
-          ])
+          ecoSystem.runCypressIntegrationTests([
+                  cypressImage: "cypress/included:12.9.0",
+                  enableVideo: params.EnableVideoRecording,
+                  enableScreenshots    : params.EnableScreenshotRecording,
+           ])
       }
 
       if (params.TestDoguUpgrade != null && params.TestDoguUpgrade){
@@ -203,6 +201,7 @@ node('docker') {
     } finally {
       stage('Clean') {
         ecoSystem.destroy()
+        sh "rm -f ${WORKSPACE}/app/src/main/ui/.npmrc"
       }
     }
 
@@ -237,3 +236,37 @@ def executeShellTests() {
         junit allowEmptyResults: true, testResults: 'target/shell_test_reports/*.xml'
     }
 }
+
+void createNpmrcFile(credentialsId) {
+    withCredentials([usernamePassword(credentialsId: "${credentialsId}", usernameVariable: 'TARGET_USER', passwordVariable: 'TARGET_PSW')]) {
+        withEnv(["HOME=${env.WORKSPACE}"]) {
+            String NPM_TOKEN = """${sh(
+                    returnStdout: true,
+                    script: 'echo -n "${TARGET_USER}:${TARGET_PSW}" | openssl base64'
+            )}""".trim()
+            writeFile encoding: 'UTF-8', file: 'app/src/main/ui/.npmrc', text: """
+    @cloudogu:registry=https://ecosystem.cloudogu.com/nexus/repository/npm-releases/
+    [email protected]
+    always-auth=true
+    _auth=${NPM_TOKEN}
+        """.trim()
+        }
+    }
+}
+
+/**
+ * Wrapper around dogu build calls to apply credentials to authenticate against private github repositories.
+ * @param user name
+ * @param password or user token
+ * @param closure
+ */
+void useConfig(String userName, String token, Closure closure) {
+    try {
+        createNpmrcFile("jenkins")
+        closure.call()
+    } catch (err) {
+        throw err
+    } finally {
+        sh "rm -f ${WORKSPACE}/app/src/main/ui/.npmrc"
+    }
+}

Makefile

@@ -1,9 +1,12 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.9.0-1
+VERSION=1.10.0-1
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""
+NPM_REGISTRY_RELEASE=https://ecosystem.cloudogu.com/nexus/repository/npm-releases/
+NPM_REGISTRY_RC=https://ecosystem.cloudogu.com/nexus/repository/npm-releasecandidates/
+UI_SRC=app/src/main/ui
 MAKEFILES_VERSION=4.2.0
 .DEFAULT_GOAL:=default
 
@@ -13,3 +16,24 @@ include build/make/release.mk
 include bats.mk
 
 default: dogu-release
+
+.PHONY info:
+info:
+	@echo Generating .npmrc file
+	@echo This will overwrite the existing file including the previosly generated credentials
+
+.PHONY gen-npmrc-release:
+gen-npmrc-release: info
+	@rm -f .npmrc
+	@echo "[email protected]" >> ${UI_SRC}/.npmrc
+	@echo "always-auth=true" >> ${UI_SRC}/.npmrc
+	@echo "_auth=$(shell bash -c 'read -p "Username: " usrname;read -s -p "Password: " pwd;echo -n "$$usrname:$$pwd" | openssl base64')" >> ${UI_SRC}/.npmrc
+	@echo "@cloudogu:registry=${NPM_REGISTRY_RELEASE}" >> ${UI_SRC}/.npmrc
+
+.PHONY gen-npmrc-prerelease:
+gen-npmrc-prerelease: info
+	@rm -f .npmrc
+	@echo "[email protected]" >> ${UI_SRC}/.npmrc
+	@echo "always-auth=true" >> ${UI_SRC}/.npmrc
+	@echo "_auth=$(shell bash -c 'read -p "Username: " usrname;read -s -p "Password: " pwd;echo -n "$$usrname:$$pwd" | openssl base64')" >> ${UI_SRC}/.npmrc
+	@echo "@cloudogu:registry=${NPM_REGISTRY_RC}" >> ${UI_SRC}/.npmrc