Merge branch 'release/v1.20.0-2'

Author: jelemux

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.20.0-2] - 2025-02-13
+### Added
+- [#193] Add missing keys to dogu descriptor
+
+### Changed
+- If root log level is set to an invalid value, the script exits with an error message.
+
 ## [v1.20.0-1] - 2025-01-27
 ### Changed
 - Update ces-build-lib to 4.0.1 and dogu-build-lib to v3.0.0 [#189]

Dockerfile

@@ -75,7 +75,7 @@ FROM registry.cloudogu.com/official/java:8u432-1
 ARG TOMCAT_VERSION
 
 LABEL NAME="official/usermgt" \
-   VERSION="1.20.0-1" \
+   VERSION="1.20.0-2" \
    maintainer="hello@cloudogu.com"
 
 # mark as webapp for nginx

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=usermgt
-VERSION=1.20.0-1
+VERSION=1.20.0-2
 # overwrite ADDITIONAL_LDFLAGS to disable static compilation
 # this should fix https://github.com/golang/go/issues/13470
 ADDITIONAL_LDFLAGS=""

batsTests/logging.bats

@@ -110,18 +110,16 @@ teardown() {
   assert_equal "$(mock_get_call_num "${doguctl}")" "1"
   assert_equal "$(mock_get_call_args "${doguctl}" "1")" "validate logging/root"
 }
-@test "validateDoguLogLevel() should fail on invalid log levels, warn about it, and remove bad config key" {
+@test "validateDoguLogLevel() should fail on invalid log levels, print an error message and exit with code 1" {
   source /workspace/resources/logging.sh
   mock_set_status "${doguctl}" 42
 
   run validateDoguLogLevel
 
   assert_failure
-  assert_equal "$(mock_get_call_num "${doguctl}")" "2"
+  assert_equal "$(mock_get_call_num "${doguctl}")" "1"
   assert_equal "$(mock_get_call_args "${doguctl}" "1")" "validate logging/root"
-  assert_equal "$(mock_get_call_args "${doguctl}" "2")" "config --rm logging/root"
-  assert_line "WARNING: The loglevel configured in logging/root is invalid."
-  assert_line "WARNING: Removing misconfigured value."
+  assert_line "ERROR: The loglevel configured in logging/root is invalid."
 }
 
 @test "renderLoggingProperties() should call doguctl to render logging.properties" {

docs/gui/release_notes_de.md

@@ -6,6 +6,9 @@ Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https
 
 ## [Unreleased]
 
+## [v1.20.0-2] - 2025-02-13
+Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
+
 ## [v1.20.0-1] - 2025-01-27
 Wir haben nur technische Änderungen vorgenommen. Näheres finden Sie in den Changelogs.
 

docs/gui/release_notes_en.md

@@ -6,6 +6,9 @@ Technical details on a release can be found in the corresponding [Changelog](htt
 
 ## [Unreleased]
 
+## [v1.20.0-2] - 2025-02-13
+We have only made technical changes. You can find more details in the changelogs.
+
 ## [v1.20.0-1] - 2025-01-27
 We have only made technical changes. You can find more details in the changelogs.
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/usermgt",
-  "Version": "1.20.0-1",
+  "Version": "1.20.0-2",
   "DisplayName": "User Management",
   "Description": "User and Group Management.",
   "Category": "Administration Apps",
@@ -49,6 +49,40 @@
     }
   ],
   "Configuration": [
+    {
+      "Name": "container_config/cpu_core_limit",
+      "Description": "Limits the container's CPU core usage. Use a positive floating value describing a fraction of 1 CPU core. When you define a value of '0.5', you are requesting half as much CPU time compared to if you asked for '1.0' CPU.",
+      "Optional": true
+    },
+    {
+      "Name": "container_config/cpu_core_request",
+      "Description": "Requests the container's minimal CPU core requirement. Use a positive floating value describing a fraction of 1 CPU core. When you define a value of '0.5', you are requesting half as much CPU time compared to if you asked for '1.0' CPU.",
+      "Optional": true
+    },
+    {
+      "Name": "container_config/memory_request",
+      "Description": "Requests the container's minimal memory requirement. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
+    {
+      "Name": "container_config/storage_limit",
+      "Description": "Limits the container's ephemeral storage usage. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
+    {
+      "Name": "container_config/storage_request",
+      "Description": "Requests the container's minimal ephemeral storage requirement. Use a positive integer value followed by one of these units [b,k,m,g] (byte, kibibyte, mebibyte, gibibyte).",
+      "Optional": true,
+      "Validation": {
+        "Type": "BINARY_MEASUREMENT"
+      }
+    },
     {
       "Name": "pwd_reset_selected_by_default",
       "Description": "Specifies whether the checkbox for the password change at the next login attribute should be preselected by default ",
@@ -65,31 +99,37 @@
     {
       "Name": "mail/sender",
       "Description": "Email address to use as sender of the User Management dogu",
+      "Default": "no-reply@cloudogu.com",
       "Optional": true
     },
     {
       "Name": "mail/import/subject",
       "Description": "The subject of the mail, which is send when a user is imported via the csv import feature",
+      "Default": "Ihr neuer Cloudogu Ecosystem Account",
       "Optional": true
     },
     {
-      "Name": "mail/import/content",
+      "Name": "mail/import/message",
       "Description": "The content of the mail, which is send when a User is imported via the csv import feature. Within the content the placeholders ${username} and ${password} need to be included.",
+      "Default": "Willkommen im Cloudogu Ecosystem!\n\nDies ist Ihr Benutzeraccount:\n\nBenutzername: ${username}\nPasswort: ${password}\n\nBei der ersten Anmeldung müssen Sie das Passwort ändern.",
       "Optional": true
     },
     {
       "Name": "mail/import/max_retries",
       "Description": "The number of maximum retries to send a mail, before an error occurs",
+      "Default": "10",
       "Optional": true
     },
     {
       "Name": "mail/import/max_retry_delay",
       "Description": "The maximum delay for sending an email as part of a retry. By using a backoff strategy, the waiting time increases for each failed send until max_retry_delay is reached before the mail is sent again.",
+      "Default": "3600",
       "Optional": true
     },
     {
       "Name": "mail/import/retry_interval",
       "Description": "The interval in which failed mails will be checked to be sent again.",
+      "Default": "30",
       "Optional": true
     },
     {

package.json

@@ -3,5 +3,5 @@
     "cypress": "^13.13.1",
     "yarn": "^1.22.22"
   },
-  "version": "1.20.0-1"
+  "version": "1.20.0-2"
 }

resources/logging.sh

@@ -59,9 +59,8 @@ function validateDoguLogLevel() {
   doguctl validate "${DEFAULT_LOGGING_KEY}" || validateExitCode=$?
 
   if [[ ${validateExitCode} -ne 0 ]]; then
-    echo "WARNING: The loglevel configured in ${DEFAULT_LOGGING_KEY} is invalid."
-    echo "WARNING: Removing misconfigured value."
-    doguctl config --rm "${DEFAULT_LOGGING_KEY}"
+    echo "ERROR: The loglevel configured in ${DEFAULT_LOGGING_KEY} is invalid."
+    exit 1
   fi
 
   return

resources/startup.sh

@@ -47,12 +47,6 @@ copyConfigurationResources() {
   cp -rf "${APP_CONFIG_RESOURCE_SRC}"/* "${UNIVERSEADM_HOME}"
 }
 
-buildMailAddress() {
-  GLOBAL_MAIL_ADDRESS="$(doguctl config --global --default "info@cloudogu.com" mail_address)"
-  MAIL_ADDRESS="$(doguctl config --default "${GLOBAL_MAIL_ADDRESS}" mail_address)"
-  export MAIL_ADDRESS
-}
-
 renderTemplates() {
   determinePwdMinLength
 
@@ -107,7 +101,6 @@ runMain() {
 
   encryptLdapPassword
   copyConfigurationResources
-  buildMailAddress
   renderTemplates
   createGuiConfiguration
   createTrustStore