Merge pull request #57 from catenax-ng/release-2.0.8

Release 2.0.8

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [2.0.8] - 2023-06-16
+
+### Changed
+- Changed the secret values
+
 ## [2.0.7] - 2023-05-12
 
 ### Fixed
@@ -14,7 +19,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - fix #49 - user input not validated @dvasunin (#51)
 - fix #33 - SKI and AKI validated as user input @dvasunin (#53)
 
-
 ## [2.0.6] - 2023-05-08
 
 ### Changed

README.md

@@ -10,8 +10,8 @@ of the DAPS are not disclosed to the requester.
 
 ### Software Version
 ```shell
-Helm version is v2.0.6
-Application version is v2.0.6
+Helm version is v2.0.8
+Application version is v2.0.8
 ```
 
 # Solution Strategy 

charts/daps-reg-service/Chart.yaml

@@ -38,11 +38,11 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.7
+version: 2.0.8
 
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 2.0.7
+appVersion: 2.0.8

charts/daps-reg-service/README.md

@@ -1,6 +1,6 @@
 # daps-reg-service
 
-![Version: 2.0.6](https://img.shields.io/badge/Version-2.0.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.6](https://img.shields.io/badge/AppVersion-2.0.6-informational?style=flat-square)
+![Version: 2.0.8](https://img.shields.io/badge/Version-2.0.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.8](https://img.shields.io/badge/AppVersion-2.0.8-informational?style=flat-square)
 
 Daps regisgter service is used to register the EDC connector into DAPS
 

charts/daps-reg-service/values-beta.yaml

@@ -50,7 +50,7 @@ drs:
   secret:
     clientId: "<path:essential-services/data/daps-beta#clientId>"
     clientSecret: "<path:essential-services/data/daps-beta#clientSecret>"
-    apiUri: "<path:essential-services/data/daps-reg-svc-beta#apiUri>"
-    tokenUri: "<path:essential-services/data/daps-reg-svc-beta#tokenUri>"
+    apiUri: "<path:essential-services/data/daps-register-svc-beta#apiUri>"
+    tokenUri: "<path:essential-services/data/daps-register-svc-beta#tokenUri>"
     daps_jwks: "<path:essential-services/data/daps-register-svc-beta#daps_jwks>"
     jwkSetUri: "<path:essential-services/data/daps-register-svc-beta#jwk-set-uri>"

charts/daps-reg-service/values-dev.yaml

@@ -50,7 +50,8 @@ drs:
   secret:
     clientId: "<path:essential-services/data/daps#clientId>"
     clientSecret: "<path:essential-services/data/daps#clientSecret>"
-    apiUri: "<path:essential-services/data/daps-register-svc#apiUri>"
-    tokenUri: "<path:essential-services/data/daps-register-svc#tokenUri>"
-    daps_jwks: "<path:essential-services/data/daps-register-svc#daps_jwks>"
-    jwkSetUri: "<path:essential-services/data/daps-register-svc#jwk-set-uri>"
+    apiUri: "<path:essential-services/data/daps-register-svc-dev#apiUri>"
+    tokenUri: "<path:essential-services/data/daps-register-svc-dev#tokenUri>"
+    daps_jwks: "<path:essential-services/data/daps-register-svc-dev#daps_jwks>"
+    jwkSetUri: "<path:essential-services/data/daps-register-svc-dev#jwk-set-uri>"
+

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>org.eclipse.tractusx</groupId>
 	<artifactId>dapsreg</artifactId>
-	<version>2.0.6</version>
+	<version>2.0.8</version>
 	<name>dapsreg</name>
 	<description>client registration to the DAPS</description>
 	<properties>

src/test/java/org/eclipse/tractusx/dapsreg/DapsUtilTests.java

@@ -25,13 +25,17 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.io.Resources;
 import org.eclipse.tractusx.dapsreg.util.Certutil;
+import org.eclipse.tractusx.dapsreg.util.AttributeValidator;
 import org.eclipse.tractusx.dapsreg.util.JsonUtil;
+import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 
 import jakarta.annotation.PostConstruct;
+import org.springframework.web.server.ResponseStatusException;
+
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
@@ -48,6 +52,9 @@ class DapsUtilTests {
 	@Autowired
 	ObjectMapper mapper;
 
+	@Autowired
+	AttributeValidator attributeValidator;
+
 	@PostConstruct
 	public void init() {
 		mapper.enable(SerializationFeature.INDENT_OUTPUT);
@@ -71,6 +78,16 @@ void utilTest() throws IOException, CertificateException, NoSuchAlgorithmExcepti
 		}
 	}
 
+	@Test
+	void testPatternPositive() {
+		attributeValidator.validate("https://asdfg.qwe.com/VVV@p_pp1234()+-;");
+	}
+
+	@Test
+	void testPatternNegative() {
+		Assert.assertThrows(ResponseStatusException.class, () -> attributeValidator.validate("</>\\aa"));
+	}
+
 	private String toString(JsonNode json) throws IOException {
 		return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(json);
 	}