Merge branch 'release/v3.34.1-3'

Author: mbehlendorf

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v3.34.1-3] - 2021-11-02
+### Changed
+- Updated cypress to version 8.6.0
+- Updated dogu-integration-test-library to version 1.0.0
+
+### Fixed
+- Service accounts had no support for redeployment of repositories. Now, every repository created with a service account allows redeploy.
+
 ## [v3.34.1-2] - 2021-10-18
 ### Added
 - Support for service accounts. For more information see [docs](docs/operations/Configure_Service_Accounts_en.md)

Dockerfile

@@ -2,7 +2,7 @@
 FROM registry.cloudogu.com/official/java:8u282-1
 LABEL maintainer="[email protected]" \
     NAME="official/nexus" \
-    VERSION="3.34.1-2"
+    VERSION="3.34.1-3"
 
 # The version of nexus to install
 ENV NEXUS_VERSION=3.34.1-01 \

Jenkinsfile

@@ -68,7 +68,8 @@ node('vagrant') {
             }
 
             stage('Integration Tests') {
-                ecoSystem.runCypressIntegrationTests([enableVideo      : params.EnableVideoRecording,
+                ecoSystem.runCypressIntegrationTests([cypressImage     : "cypress/included:8.6.0",
+                                                      enableVideo      : params.EnableVideoRecording,
                                                       enableScreenshots: params.EnableScreenshotRecording])
             }
 

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/nexus",
-  "Version": "3.34.1-2",
+  "Version": "3.34.1-3",
   "DisplayName": "Sonatype Nexus",
   "Description": "The Nexus Repository is like the local warehouse where all of the parts and finished goods used in your software supply chain are stored and distributed.",
   "Url": "http://www.sonatype.org/nexus",

integrationTests/cypress/integration/dogu_integration_test_lib/cas_browser.feature

@@ -21,7 +21,7 @@ Feature: Browser-based CAS login and logout functionality
     When the user opens the dogu start page
     And the user types in wrong login credentials
     And the user clicks the login button
-    Then the login page informs the user about not recognizing the given user account
+    Then the login page informs the user about invalid credentials
 
   @requires_testuser
   Scenario: logged in user can log out via logout button (front-channel)

integrationTests/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "cypress": "7.1.0",
+    "cypress": "8.6.0",
     "cypress-cucumber-preprocessor": "4.1.0",
-    "@cloudogu/dogu-integration-test-library": "0.2.2"
+    "@cloudogu/dogu-integration-test-library": "1.0.0"
   },
   "scripts": {
     "updateTests": "mkdir -p cypress/integration/dogu_integration_test_lib && cp -r node_modules/@cloudogu/dogu-integration-test-library/lib/integration/* cypress/integration/dogu_integration_test_lib"

integrationTests/yarn.lock

@@ -729,10 +729,10 @@
     "@babel/helper-validator-identifier" "^7.12.11"
     to-fast-properties "^2.0.0"
 
-"@cloudogu/dogu-integration-test-library@0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@cloudogu/dogu-integration-test-library/-/dogu-integration-test-library-0.2.2.tgz#12fa22e0682a13286a8df14b31607616b12d8ba3"
-  integrity sha512-LxxQ+3in53EeNo9ahPuG6o3RptymtNBMqRrK+YAyPBZgRelZ0/bPFd0lpSFvS4n8NO0y5TsCmbxgRik1GemEKQ==
+"@cloudogu/dogu-integration-test-library@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@cloudogu/dogu-integration-test-library/-/dogu-integration-test-library-1.0.0.tgz#1aa23a2cec638db8cecfdfaaa5769ca23891f093"
+  integrity sha512-J/zfwgvGTYezfGuTmaN2uGPWzm3W9WiVES0P6GirQCpzrtzFPtsw/CiJIuhFJAhQCDE5vuh723NyUZyHZ0IjSA==
 
 "@cypress/browserify-preprocessor@^3.0.1":
   version "3.0.1"
@@ -769,9 +769,9 @@
     figures "^1.7.0"
 
 "@cypress/request@^2.88.5":
-  version "2.88.5"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.5.tgz#8d7ecd17b53a849cfd5ab06d5abe7d84976375d7"
-  integrity sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==
+  version "2.88.6"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.6.tgz#a970dd675befc6bdf8a8921576c01f51cc5798e9"
+  integrity sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -786,13 +786,12 @@
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
     tough-cookie "~2.5.0"
     tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
+    uuid "^8.3.2"
 
 "@cypress/xvfb@^1.2.4":
   version "1.2.4"
@@ -3408,11 +3407,6 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -4568,10 +4562,10 @@ util@~0.10.1:
   dependencies:
     inherits "2.0.3"
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 [email protected], verror@^1.9.0:
   version "1.10.0"

resources/nexus_api.sh

@@ -30,7 +30,7 @@ function createRepositoryViaAPI() {
   curl --request POST -v\
     --user "${user}":"${pass}" \
     --header 'Content-Type: application/json' \
-    --data "{\"name\":\"${name}\",\"online\":true,\"storage\":{\"blobStoreName\":\"default\",\"strictContentTypeValidation\":true,\"writePolicy\":\"allow_once\"},\"cleanup\":{\"policyNames\":[\"string\"]},\"component\":{\"proprietaryComponents\":true},\"raw\":{\"contentDisposition\":\"ATTACHMENT\"}}" \
+    --data "{\"name\":\"${name}\",\"online\":true,\"storage\":{\"blobStoreName\":\"default\",\"strictContentTypeValidation\":true,\"writePolicy\":\"allow\"},\"cleanup\":{\"policyNames\":[\"string\"]},\"component\":{\"proprietaryComponents\":true},\"raw\":{\"contentDisposition\":\"ATTACHMENT\"}}" \
     --url "${NEXUS_V1_URL}"/repositories/"${format}"/"${type}"
 }