Merge branch 'release/v1.26.1-7'

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.26.1-7] - 2024-08-29
+### Changed
+- Update warp menu to v2.0.0 (#104)
+- Make static asset urls dependent of the current warp menu version to invalidate caches
+
 ## [v1.26.1-6] - 2024-08-27
 ### Changed
 - [#102] Redesign dogu-starting-page

Dockerfile

@@ -2,13 +2,12 @@ FROM registry.cloudogu.com/official/base:3.20.2-1 as builder
 LABEL maintainer="[email protected]"
 
 # dockerfile is based on https://github.com/dockerfile/nginx and https://github.com/bellycard/docker-loadbalancer
-
 ENV NGINX_VERSION=1.26.1 \
     NGINX_TAR_SHA256="f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b" \
     CES_CONFD_VERSION=0.9.0 \
     CES_CONFD_TAR_SHA256="8507f40824562b8d2c1f32afb43ce1aad576a82febd2f97bd2cf31b0753a8cbd" \
-    WARP_MENU_VERSION=1.7.3 \
-    WARP_MENU_TAR_SHA256="b3ed4b50b1b9a739a4430d88975b5e3030c5e542c0739ed6b72d7eb8fd9a7b18" \
+    WARP_MENU_VERSION=2.0.0 \
+    WARP_MENU_TAR_SHA256="51a1010ec0f82b634999e48976d7fec98e6eb574a4401a841cd53f8cd0e14040" \
     CES_ABOUT_VERSION="0.5.0" \
     CES_ABOUT_TAR_SHA256="c4664340a248d9c2d9333a9a9df7aa9141ebeb40c051d65f78c57f2439b6f07d" \
     CES_THEME_VERSION=0.7.0 \
@@ -61,9 +60,11 @@ RUN wget --progress=bar:force:noscroll -O /tmp/theme.zip https://github.com/clou
 FROM registry.cloudogu.com/official/base:3.20.2-1
 LABEL maintainer="[email protected]" \
       NAME="official/nginx" \
-      VERSION="1.26.1-6"
+      VERSION="1.26.1-7"
 
-ENV CES_MAINTENANCE_MODE=false
+ENV CES_MAINTENANCE_MODE=false \
+    # Used in template to invalidate caches - do not remove. The release script will auto update this line
+    VERSION="1.26.1-7"
 
 RUN set -x -o errexit \
  && set -o nounset \

Jenkinsfile

@@ -76,7 +76,7 @@ node('vagrant') {
             }
 
             stage('Integration tests') {
-                ecoSystem.runCypressIntegrationTests([cypressImage     : "cypress/included:8.6.0",
+                ecoSystem.runCypressIntegrationTests([cypressImage     : "cypress/included:13.14.0",
                                                       enableVideo      : params.EnableVideoRecording,
                                                       enableScreenshots: params.EnableScreenshotRecording])
             }
@@ -99,7 +99,7 @@ node('vagrant') {
 
                 stage('Integration Tests - After Upgrade'){
                     // Run integration tests again to verify that the upgrade was successful
-                    ecoSystem.runCypressIntegrationTests([cypressImage     : "cypress/included:8.6.0",
+                    ecoSystem.runCypressIntegrationTests([cypressImage     : "cypress/included:13.14.0",
                                                           enableVideo      : params.EnableVideoRecording,
                                                           enableScreenshots: params.EnableScreenshotRecording])
                 }

docs/gui/release_notes_de.md

@@ -0,0 +1,10 @@
+# Release Notes
+
+Im Folgenden finden Sie die Release Notes für das Nginx-Dogu.
+
+Technische Details zu einem Release finden Sie im zugehörigen [Changelog](https://docs.cloudogu.com/de/docs/dogus/nginx/CHANGELOG/).
+
+## Release 1.26.1-6
+
+* Verbesserung der Barrierefreiheit des Warp-Menüs durch Hinzufügen des neuen Designs
+* Das Warp-Menü ist jetzt über das Whitelabeling-Dogu whitelabelbar

docs/gui/release_notes_en.md

@@ -0,0 +1,10 @@
+# Release Notes
+
+Below you will find the release notes for the Nginx-Dogu.
+
+Technical details on a release can be found in the corresponding [Changelog](https://docs.cloudogu.com/de/docs/dogus/nginx/CHANGELOG/).
+
+## Release 1.26.1-6
+
+* Improved accessibility of the warp menu by adding the new design
+* Warp menu is now whitelabelable via the whitelabeling dogu

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/nginx",
-  "Version": "1.26.1-6",
+  "Version": "1.26.1-7",
   "DisplayName": "Nginx",
   "Description": "Nginx WebServer.",
   "Logo": "https://cloudogu.com/images/dogus/nginx.png",

integrationTests/cypress.config.ts

@@ -0,0 +1,45 @@
+import { defineConfig } from "cypress";
+// @ts-ignore
+import createBundler from "@bahmutov/cypress-esbuild-preprocessor";
+import { addCucumberPreprocessorPlugin } from "@badeball/cypress-cucumber-preprocessor";
+import createEsbuildPlugin from "@badeball/cypress-cucumber-preprocessor/esbuild";
+
+async function setupNodeEvents(on, config) {
+    // This is required for the preprocessor to be able to generate JSON reports after each run, and more,
+    await addCucumberPreprocessorPlugin(on, config);
+
+    on(
+        "file:preprocessor",
+        createBundler({
+            plugins: [createEsbuildPlugin(config)],
+        })
+    );
+
+    return config;
+}
+
+module.exports = defineConfig({
+    e2e: {
+        pageLoadTimeout: 60000,
+
+        retries: {
+            runMode: 3,
+            openMode: 3,
+        },
+
+        baseUrl: "https://192.168.56.10",
+
+        env: {
+            casPath: "/cas",
+            nameOfCustomPageLinkInWarpMenu: "Privacy Policies",
+            customHTMLPath: "/static/privacy_policies.html",
+            AdminGroup: "CesAdministrators",
+        },
+
+        videoCompression: false,
+        specPattern: ["cypress/e2e/**/*.feature"],
+
+        setupNodeEvents,
+    }
+
+});

integrationTests/cypress/support/e2e.ts

@@ -0,0 +1,8 @@
+
+
+declare global {
+    namespace Cypress {
+        interface Chainable {
+        }
+    }
+}

integrationTests/cypress/support/step_definitions/given.ts

@@ -0,0 +1,6 @@
+import {Given} from "@badeball/cypress-cucumber-preprocessor";
+
+Given(/^the warp menu is open$/, function () {
+    cy.visit(Cypress.config().baseUrl + Cypress.env('casPath'));
+    cy.get("#warp-menu-shadow-host").shadow().find("#warp-toggle").click({force: true});
+});

integrationTests/cypress/support/step_definitions/then.ts

@@ -0,0 +1,20 @@
+import {Then} from "@badeball/cypress-cucumber-preprocessor";
+
+Then(/^the user opens the warp menu$/, function () {
+    cy.get("#warp-menu-shadow-host").shadow().find("#warp-toggle").click({force: true});
+});
+
+Then(/^the user checks link corresponding to the custom page$/, function () {
+    cy.get("#warp-menu-shadow-host").shadow().find(`a[role=menuitem][href="${Cypress.env('customHTMLPath')}"]`)
+        .should('have.attr', 'target', '_blank')
+        .contains(Cypress.env('nameOfCustomPageLinkInWarpMenu'));
+});
+
+Then("a static HTML custom page gets displayed", function () {
+    cy.visit(Cypress.config().baseUrl + Cypress.env('customHTMLPath'));
+});
+
+Then(/^the warp menu category 'Support' contains a link to docs and no link to platform or the about page$/, function () {
+    cy.get("#warp-menu-shadow-host").shadow().find('[id^=warpc][id$=support]').parent().children('ul').children().should('have.length', 1)
+    cy.get("#warp-menu-shadow-host").shadow().find('[id^=warpc][id$=support]').parent().children('ul').children('li').contains("Cloudogu EcoSystem documentation")
+});

integrationTests/cypress/support/step_definitions/when.js → integrationTests/cypress/support/step_definitions/when.ts

@@ -1,6 +1,4 @@
-const {
-    When
-} = require("cypress-cucumber-preprocessor/steps");
+import {When} from "@badeball/cypress-cucumber-preprocessor";
 
 When(/^the user opens the always existing cas ui$/, function () {
     cy.visit(Cypress.config().baseUrl + Cypress.env('casPath'));

integrationTests/cypress/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["cypress", "node"]
+  },
+  "include": ["**/*.ts"]
+}

integrationTests/package.json

@@ -1,6 +1,10 @@
 {
-  "devDependencies": {
-    "cypress": "8.6.0",
-    "cypress-cucumber-preprocessor": "4.1.0"
+  "dependencies": {
+    "cypress": "13.14.0",
+    "cypress-cucumber-preprocessor": "4.1.0",
+    "@badeball/cypress-cucumber-preprocessor": "^20.1.0",
+    "@bahmutov/cypress-esbuild-preprocessor": "^2.2.1",
+    "esbuild": "^0.23.0",
+    "typescript": "^5.5.3"
   }
 }

integrationTests/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+  },
+  "files": ["*.ts"]
+}