catenax-ng · dsmf · Apr 23, 2024 · Apr 23, 2024 · Apr 23, 2024 · Apr 23, 2024
diff --git a/.config/pmd-rules.xml b/.config/pmd-rules.xml
@@ -59,7 +59,7 @@
     <rule ref="category/java/documentation.xml/CommentSize">
         <properties>
             <property name="maxLines" value="23"/>
-            <property name="maxLineLength" value="120"/>
+            <property name="maxLineLength" value="100"/>
         </properties>
     </rule>
     <rule ref="category/java/documentation.xml/CommentRequired">

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,8 +8,14 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 ## [Unreleased]
 
+## Added
+
+- Cucumber test step definitions for Policy Store API (Happy Path) including some test helper utilities. #518
+- 
+
 ## [5.1.0] - 2024-05-06
 
+
 ### Changed
 
 - Removed obsolete entries from acceptedPolicies configuration. #530
@@ -632,8 +638,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 ### Unresolved
 - **Select Aspects you need**  You are able to select the needed aspects for which you want to collect the correct endpoint information.
 
-[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/5.1.0...HEAD
-[5.1.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/5.0.0...5.1.0
+[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/5.0.0...HEAD
 [5.0.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.9.0...5.0.0
 [4.9.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.8.0...4.9.0
 [4.8.0]: https://github.com/eclipse-tractusx/item-relationship-service/compare/4.7.0...4.8.0

diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/charts/item-relationship-service/CHANGELOG.md b/charts/item-relationship-service/CHANGELOG.md
@@ -6,16 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [7.1.0] - 2024-05-06
-
 ### Fixed
 
 - Fix for incomplete renaming of Helm chart (see #489)
-- Fixed missing Spring attribute #358
 
 
-### Changed
-- Update IRS version to 5.1.0
 
 ## [7.0.1] - 2024-04-17
 

diff --git a/charts/item-relationship-service/Chart.yaml b/charts/item-relationship-service/Chart.yaml
@@ -35,12 +35,12 @@ type: application
 # 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: 7.1.0
+version: 7.0.1
 # 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: "5.1.0"
+appVersion: "5.0.0"
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami

diff --git a/charts/item-relationship-service/templates/configmap-spring-app-config.yaml b/charts/item-relationship-service/templates/configmap-spring-app-config.yaml
@@ -57,11 +57,9 @@ data:
           client:
             registration:
               semantics:
-                authorization-grant-type: client_credentials
                 client-id: "${SEMANTICS_OAUTH2_CLIENT_ID}" # taken from secret ENV
                 client-secret: "${SEMANTICS_OAUTH2_CLIENT_SECRET}" # taken from secret ENV
               discovery:
-                authorization-grant-type: client_credentials
                 client-id: ${DISCOVERY_OAUTH2_CLIENT_ID} # taken from secret ENV
                 client-secret: ${DISCOVERY_OAUTH2_CLIENT_SECRET} # taken from secret ENV
             provider:

diff --git a/docs/src/api/irs-api.yaml b/docs/src/api/irs-api.yaml
@@ -3,7 +3,7 @@ info:
   description: The API of the Item Relationship Service (IRS) for retrieving item
     graphs along the value chain of CATENA-X partners.
   title: IRS API
-  version: 5.1.0
+  version: 5.0.0
 servers:
 - url: http://localhost:8080
 security:

diff --git a/irs-api/src/main/java/org/eclipse/tractusx/irs/IrsApplication.java b/irs-api/src/main/java/org/eclipse/tractusx/irs/IrsApplication.java
@@ -59,7 +59,7 @@ public class IrsApplication {
     /**
      * The IRS API version.
      */
-    public static final String API_VERSION = "5.1.0";
+    public static final String API_VERSION = "5.0.0";
 
     /**
      * The URL prefix for IRS API URLs.

diff --git a/irs-api/src/main/resources/application.yml b/irs-api/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
     oauth2:
       client:
         registration:
-          semantics:
+          semantics :
             authorization-grant-type: client_credentials
             client-id: ${SEMANTICS_OAUTH2_CLIENT_ID} # Semantic Hub OAuth2 client ID used to authenticate with the IAM
             client-secret: ${SEMANTICS_OAUTH2_CLIENT_SECRET} # Semantic Hub OAuth2 client secret used to authenticate with the IAM

diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsWireMockIntegrationTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/IrsWireMockIntegrationTest.java
@@ -28,8 +28,6 @@
 import static org.eclipse.tractusx.irs.WiremockSupport.createEndpointDataReference;
 import static org.eclipse.tractusx.irs.WiremockSupport.encodedAssetIds;
 import static org.eclipse.tractusx.irs.WiremockSupport.randomUUID;
-import static org.eclipse.tractusx.irs.component.enums.AspectType.AspectTypesConstants.BATCH;
-import static org.eclipse.tractusx.irs.component.enums.AspectType.AspectTypesConstants.SINGLE_LEVEL_BOM_AS_BUILT;
 import static org.eclipse.tractusx.irs.testing.wiremock.DiscoveryServiceWiremockSupport.DISCOVERY_FINDER_PATH;
 import static org.eclipse.tractusx.irs.testing.wiremock.DiscoveryServiceWiremockSupport.DISCOVERY_FINDER_URL;
 import static org.eclipse.tractusx.irs.testing.wiremock.DiscoveryServiceWiremockSupport.EDC_DISCOVERY_PATH;
@@ -60,6 +58,7 @@
 import org.eclipse.tractusx.irs.component.Jobs;
 import org.eclipse.tractusx.irs.component.RegisterJob;
 import org.eclipse.tractusx.irs.component.enums.JobState;
+import org.eclipse.tractusx.irs.data.StringMapper;
 import org.eclipse.tractusx.irs.edc.client.EndpointDataReferenceStorage;
 import org.eclipse.tractusx.irs.semanticshub.AspectModels;
 import org.eclipse.tractusx.irs.semanticshub.SemanticHubWireMockSupport;
@@ -112,6 +111,12 @@ static void startContainer() {
         WiremockSupport.successfulSemanticModelRequest();
     }
 
+    @AfterEach
+    void tearDown() {
+        cacheManager.getCacheNames()
+                    .forEach(cacheName -> Objects.requireNonNull(cacheManager.getCache(cacheName)).clear());
+    }
+
     @AfterAll
     static void stopContainer() {
         minioContainer.stop();
@@ -136,12 +141,6 @@ static void configureProperties(DynamicPropertyRegistry registry) {
         registry.add("resilience4j.retry.configs.default.waitDuration", () -> "1s");
     }
 
-    @AfterEach
-    void tearDown() {
-        cacheManager.getCacheNames()
-                    .forEach(cacheName -> Objects.requireNonNull(cacheManager.getCache(cacheName)).clear());
-    }
-
     @Test
     void shouldStartApplicationAndCollectSemanticModels() throws SchemaNotFoundException {
         // Arrange
@@ -265,6 +264,7 @@ void shouldStartRecursiveProcesses() {
         assertThat(jobHandle.getId()).isNotNull();
         waitForCompletion(jobHandle);
         final Jobs jobForJobId = irsService.getJobForJobId(jobHandle.getId(), false);
+        System.out.println(StringMapper.mapToString(jobForJobId));
 
         assertThat(jobForJobId.getJob().getState()).isEqualTo(JobState.COMPLETED);
         assertThat(jobForJobId.getShells()).hasSize(3);
@@ -280,9 +280,10 @@ private void successfulRegistryAndDataRequest(final String globalAssetId, final
             final String batchFileName, final String sbomFileName) {
 
         final String edcAssetId = WiremockSupport.randomUUIDwithPrefix();
-        final String batch = WiremockSupport.submodelRequest(edcAssetId, BATCH, batchAspectName, batchFileName);
+        final String batch = WiremockSupport.submodelRequest(edcAssetId, "Batch",
+                batchAspectName, batchFileName);
 
-        final String singleLevelBomAsBuilt = WiremockSupport.submodelRequest(edcAssetId, SINGLE_LEVEL_BOM_AS_BUILT,
+        final String singleLevelBomAsBuilt = WiremockSupport.submodelRequest(edcAssetId, "SingleLevelBomAsBuilt",
                 singleLevelBomAsBuiltAspectName, sbomFileName);
 
         final List<String> submodelDescriptors = List.of(batch, singleLevelBomAsBuilt);

diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/WiremockSupport.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/WiremockSupport.java
@@ -66,9 +66,7 @@ public static EndpointDataReference createEndpointDataReference(final String con
                                                                             .getBytes(StandardCharsets.UTF_8));
         final String jwtToken = "eyJhbGciOiJSUzI1NiJ9." + b64EncodedAuthCode + ".test";
         return EndpointDataReference.Builder.newInstance()
-                                            .contractId(contractAgreementId)
-                                            .authKey("Authorization")
-                                            .id("test")
+                                            .authKey("testkey")
                                             .authCode(jwtToken)
                                             .properties(
                                                     Map.of(JsonLdConfiguration.NAMESPACE_EDC_CID, contractAgreementId))

diff --git a/irs-cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestHelper.java b/irs-cucumber-tests/src/test/java/org/eclipse/tractusx/irs/cucumber/E2ETestHelper.java
@@ -0,0 +1,96 @@
+/********************************************************************************
+ * Copyright (c) 2022,2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ * Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+package org.eclipse.tractusx.irs.cucumber;
+
+import static io.restassured.RestAssured.given;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.function.Predicate;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import io.restassured.RestAssured;
+import io.restassured.filter.log.LogDetail;
+import io.restassured.filter.log.RequestLoggingFilter;
+import io.restassured.filter.log.ResponseLoggingFilter;
+import io.restassured.specification.RequestSpecification;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Common helper class for E2E tests.
+ */
+public class E2ETestHelper {
+
+    public static final ObjectMapper objectMapper;
+
+    static {
+        objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+    }
+
+    private static final boolean LOG_EVERY_REQUEST_AND_RESPONSE = true;
+
+    public static File getExpectedFile(final String fileName) {
+        return getFile("expected-files/" + fileName);
+    }
+
+    public static String getTemplateFileContent(final String fileName) throws IOException {
+        final File file = getTemplateFile(fileName);
+        byte[] bytes = Files.readAllBytes(file.toPath());
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
+
+    public static File getTemplateFile(final String fileName) {
+        return getFile("templates/" + fileName);
+    }
+
+    public static File getFile(final String path) {
+        final ClassLoader classLoader = E2ETestHelper.class.getClassLoader();
+        final URL ressource = classLoader.getResource(path);
+        return new File(ressource.getFile());
+    }
+
+    public static RequestSpecification givenAuthentication(
+            AuthenticationProperties.AuthenticationPropertiesBuilder authBuilder) {
+        final AuthenticationProperties authProperties = authBuilder.build();
+        return given().spec(authProperties.getNewAuthenticationRequestSpecification());
+    }
+
+    static Predicate<String> startingWith(final String prefix) {
+        return s -> StringUtils.startsWith(s, prefix);
+    }
+
+    public static void configureRequestAndResponseLogging() {
+        if (LOG_EVERY_REQUEST_AND_RESPONSE) {
+            final LogDetail logDetail = LogDetail.ALL;
+            final RequestLoggingFilter requestLoggingFilter = new RequestLoggingFilter(logDetail);
+            final ResponseLoggingFilter responseLoggingFilter = new ResponseLoggingFilter(logDetail);
+            RestAssured.filters(requestLoggingFilter, responseLoggingFilter);
+        } else {
+            RestAssured.enableLoggingOfRequestAndResponseIfValidationFails(LogDetail.ALL);
+        }
+    }
+}