Merge pull request #880 from catenax-ng/chore/530-cleanup-acceptedPol…

…icies-configuration

chore/530-cleanup-acceptedPolicies-configuration

CHANGELOG.md

@@ -8,6 +8,10 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 
 ## [Unreleased]
 
+## Changed
+
+-  Removed obsolete entries from acceptedPolicies configuration. #530
+
 ### Fixed
 
 - Update bouncycastle to 1.78 to fix CVE's.

charts/item-relationship-service/values.yaml

@@ -199,15 +199,9 @@ edc:
     # IRS will only negotiate contracts for offers with a policy as defined in the allowedNames list.
     # If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed.
     acceptedPolicies:
-      - leftOperand: "PURPOSE"
-        operator: "eq"
-        rightOperand: "ID 3.0 Trace"
       - leftOperand: "PURPOSE"
         operator: "eq"
         rightOperand: "ID 3.1 Trace"
-      - leftOperand: "PURPOSE"
-        operator: "eq"
-        rightOperand: R2_Traceability
       - leftOperand: "FrameworkAgreement.traceability"
         operator: "eq"
         rightOperand: "active"

docs/concept/#322-Provisioning-of-contractAgreementId-for-assets/#322-Provisioning-of-contractAgreementId-for-assets.md

@@ -377,7 +377,7 @@ policy store in order to receice further on assets with the specific policy.
           "odrl:operator": {
             "@id": "odrl:eq"
           },
-          "odrl:rightOperand": "ID 3.0 Trace"
+          "odrl:rightOperand": "ID 3.1 Trace"
         }
       }
       }

docs/src/uml-diagrams/data-sovereignty/data-sovereignty-sequence.puml

@@ -30,7 +30,7 @@ note left
                 },
                 "rightExpression": {
                   "edctype": "dataspaceconnector:literalexpression",
-                  "value": "ID 3.0 Trace"
+                  "value": "ID 3.1 Trace"
                 },
                 "operator": "EQ"
               }

irs-api/src/main/java/org/eclipse/tractusx/irs/ess/service/EdcRegistration.java

@@ -128,8 +128,8 @@ private void registerAsset(final String assetId, final String notificationType,
                     }
                 }
                 """.formatted(assetId, notificationType, essBaseUrl + path);
-        final var entity = restTemplate.exchange(edcProviderUrl + assetsPath, HttpMethod.POST,
-                toEntity(body), String.class);
+        final var entity = restTemplate.exchange(edcProviderUrl + assetsPath, HttpMethod.POST, toEntity(body),
+                String.class);
 
         if (entity.getStatusCode().is2xxSuccessful()) {
             log.info("Notification asset registered successfully.");
@@ -160,7 +160,7 @@ private void registerPolicy(final String policyId) {
                                   "odrl:operator": {
                                     "@id": "odrl:eq"
                                   },
-                                  "odrl:rightOperand": "ID 3.0 Trace"
+                                  "odrl:rightOperand": "ID 3.1 Trace"
                                 }
                               ]
                             }
@@ -169,8 +169,8 @@ private void registerPolicy(final String policyId) {
                       }
                   }
                 """.formatted(policyId);
-        final var entity = restTemplate.exchange(edcProviderUrl + policydefinitionsPath,
-                HttpMethod.POST, toEntity(body), String.class);
+        final var entity = restTemplate.exchange(edcProviderUrl + policydefinitionsPath, HttpMethod.POST,
+                toEntity(body), String.class);
 
         if (entity.getStatusCode().is2xxSuccessful()) {
             log.info("Notification policy registered successfully.");
@@ -194,8 +194,8 @@ private void registerContractDefinition(final String contractId, final String as
                 }
                 """.formatted(contractId, contractId, assetId);
 
-        final var entity = restTemplate.exchange(edcProviderUrl + contractdefinitionsPath,
-                HttpMethod.POST, toEntity(body), String.class);
+        final var entity = restTemplate.exchange(edcProviderUrl + contractdefinitionsPath, HttpMethod.POST,
+                toEntity(body), String.class);
         if (entity.getStatusCode().is2xxSuccessful()) {
             log.info("Notification contract definition registered successfully.");
         } else {

irs-api/src/main/resources/application.yml

@@ -162,15 +162,9 @@ irs-edc-client:
     # IRS will only negotiate contracts for offers with a policy as defined in the acceptedPolicies list.
     # If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed.
     acceptedPolicies:
-      - leftOperand: "PURPOSE"
-        operator: "eq"
-        rightOperand: "ID 3.0 Trace"
       - leftOperand: "PURPOSE"
         operator: "eq"
         rightOperand: "ID 3.1 Trace"
-      - leftOperand: "PURPOSE"
-        operator: "eq"
-        rightOperand: R2_Traceability
       - leftOperand: "FrameworkAgreement.traceability"
         operator: "eq"
         rightOperand: "active"

irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/configuration/JsonLdConfigurationTest.java

@@ -69,7 +69,7 @@ void shouldMapContstraints() throws JsonProcessingException {
                                                                           .leftExpression(
                                                                                   new LiteralExpression("idsc:PURPOSE"))
                                                                           .rightExpression(
-                                                                                  new LiteralExpression("ID 3.0 Trace"))
+                                                                                  new LiteralExpression("ID 3.1 Trace"))
                                                                           .build();
         final ObjectMapper objectMapper = new JsonLdConfiguration().objectMapper();
         final String s = objectMapper.writeValueAsString(atomicConstraint);

irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponseTest.java

@@ -50,7 +50,7 @@ void shouldParseEdcContractAgreementsResponse() throws JsonProcessingException {
                 						"odrl:operator": {
                 							"@id": "odrl:eq"
                 						},
-                						"odrl:rightOperand": "ID 3.0 Trace"
+                						"odrl:rightOperand": "ID 3.1 Trace"
                 					}
                 				}
                 			},

irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/PolicyCheckerServiceTest.java

@@ -71,7 +71,7 @@ void shouldRejectWrongPolicy() {
     @Test
     void shouldRejectWhenPolicyStoreIsEmpty() {
         // given
-        Policy policy = createAtomicConstraintPolicy(TestConstants.PURPOSE, TestConstants.ID_3_0_TRACE);
+        Policy policy = createAtomicConstraintPolicy(TestConstants.PURPOSE, TestConstants.ID_3_1_TRACE);
         when(policyStore.getAcceptedPolicies(any())).thenReturn(List.of());
         // when
         boolean result = policyCheckerService.isValid(policy, "bpn");
@@ -102,12 +102,12 @@ void shouldRejectAndConstraintsWhenOnlyOneMatch() {
     @Test
     void shouldAcceptAndConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetOfProvidedPolicy() {
         // given
-        final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ),
-                TestConstants.STATUS_ACTIVE);
+        final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY,
+                new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
         final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ),
                 TestConstants.STATUS_ACTIVE);
-        final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ),
-                TestConstants.STATUS_ACTIVE);
+        final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER,
+                new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
         final var policyList = List.of(
                 new AcceptedPolicy(policy("and-policy", List.of(constraint1, constraint2, constraint3), List.of()),
                         OffsetDateTime.now().plusYears(1)));
@@ -127,12 +127,12 @@ void shouldAcceptAndConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSet
     @Test
     void shouldAcceptOrConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetOfProvidedPolicy() {
         // given
-        final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ),
-                TestConstants.STATUS_ACTIVE);
+        final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY,
+                new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
         final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ),
                 TestConstants.STATUS_ACTIVE);
-        final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ),
-                TestConstants.STATUS_ACTIVE);
+        final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER,
+                new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
         final var policyList = List.of(
                 new AcceptedPolicy(policy("and-policy", List.of(), List.of(constraint1, constraint2, constraint3)),
                         OffsetDateTime.now().plusYears(1)));
@@ -152,12 +152,12 @@ void shouldAcceptOrConstraintsWhenAcceptedPolicyContainsMoreConstraintsSuperSetO
     @Test
     void shouldAcceptConstraintsWithDefaultPolicy() {
         // given
-        final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY, new Operator(OperatorType.EQ),
-                TestConstants.STATUS_ACTIVE);
+        final Constraint constraint1 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_TRACEABILITY,
+                new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
         final Constraint constraint2 = new Constraint(TestConstants.MEMBERSHIP, new Operator(OperatorType.EQ),
                 TestConstants.STATUS_ACTIVE);
-        final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER, new Operator(OperatorType.EQ),
-                TestConstants.STATUS_ACTIVE);
+        final Constraint constraint3 = new Constraint(TestConstants.FRAMEWORK_AGREEMENT_DISMANTLER,
+                new Operator(OperatorType.EQ), TestConstants.STATUS_ACTIVE);
 
         final var policyList = List.of(new AcceptedPolicy(
                 policy("default-policy", List.of(constraint1, constraint2, constraint3),

irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/policy/service/EdcPolicyDefinitionServiceTest.java

@@ -74,7 +74,7 @@ void setUp() {
     @Test
     void testCreatePolicyDefinitionRequest() throws JsonProcessingException, JSONException {
         // given
-        String policyName = "ID 3.0 Trace";
+        String policyName = "ID 3.1 Trace";
         String policyId = "4cc0bb57-2d64-4cfb-a13b-aceef3477b7e";
 
         // when
@@ -99,7 +99,7 @@ void testCreatePolicyDefinitionRequest() throws JsonProcessingException, JSONExc
                         						{
                         							"@type": "Constraint",
                         							"odrl:leftOperand": "PURPOSE",
-                        							"odrl:rightOperand": "ID 3.0 Trace",
+                        							"odrl:rightOperand": "ID 3.1 Trace",
                         							"odrl:operator": {
                         								"@id": "odrl:eq"
                         							}

irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/testutil/TestConstants.java

@@ -31,7 +31,6 @@ public class TestConstants {
     public static final String FRAMEWORK_AGREEMENT_DISMANTLER = "FrameworkAgreement.dismantler";
     public static final String FRAMEWORK_AGREEMENT_TEST = "FrameworkAgreement.test";
     public static final String MEMBERSHIP = "Membership";
-    public static final String ID_3_0_TRACE = "ID 3.0 Trace";
     public static final String ID_3_1_TRACE = "ID 3.1 Trace";
     public static final String STATUS_ACTIVE = "active";
     public static final String PURPOSE = "PURPOSE";

irs-edc-client/src/test/java/org/eclipse/tractusx/irs/edc/client/transformer/EdcTransformerTest.java

@@ -87,7 +87,7 @@ class EdcTransformerTest {
                                         "odrl:operator": {
                                             "@id": "odrl:eq"
                                         },
-                                        "odrl:rightOperand": "ID 3.0 Trace"
+                                        "odrl:rightOperand": "ID 3.1 Trace"
                                     }
                                 }
                             },
@@ -190,7 +190,7 @@ private static Policy createPolicy(final String assetId) {
                                                                                   new LiteralExpression("idsc:PURPOSE"))
                                                                           .operator(Operator.EQ)
                                                                           .rightExpression(
-                                                                                  new LiteralExpression("ID 3.0 Trace"))
+                                                                                  new LiteralExpression("ID 3.1 Trace"))
                                                                           .build();
         final OrConstraint orConstraint = OrConstraint.Builder.newInstance().constraint(atomicConstraint).build();
         final Permission permission = Permission.Builder.newInstance()

irs-policy-store/src/test/java/org/eclipse/tractusx/irs/policystore/services/PolicyStoreServiceTest.java

@@ -79,7 +79,7 @@
 class PolicyStoreServiceTest {
 
     private static final String BPN = "testBpn";
-    private static final String EXAMPLE_ALLOWED_NAME = "ID 3.0 Trace";
+    private static final String EXAMPLE_ALLOWED_NAME = "ID 3.1 Trace";
     private static final String EXAMPLE_ACCEPTED_LEFT_OPERAND = "PURPOSE";
     private static final String REGISTER_POLICY_EXAMPLE_PAYLOAD = PolicyStoreControllerTest.REGISTER_POLICY_EXAMPLE_PAYLOAD;
 

irs-registry-client/README.md

@@ -67,15 +67,9 @@ irs-edc-client:
     # IRS will only negotiate contracts for offers with a policy as defined in the acceptedPolicies list.
     # If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed.
     acceptedPolicies:
-      - leftOperand: "PURPOSE"
-        operator: "eq"
-        rightOperand: "ID 3.0 Trace"
       - leftOperand: "PURPOSE"
         operator: "eq"
         rightOperand: "ID 3.1 Trace"
-      - leftOperand: "PURPOSE"
-        operator: "eq"
-        rightOperand: R2_Traceability
       - leftOperand: "FrameworkAgreement.traceability"
         operator: "eq"
         rightOperand: "active"

local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json

@@ -1,11 +1,11 @@
 { 
   "policies": {
-    "ID 3.0 Trace": {
+    "ID 3.1 Trace": {
       "@context": {
         "odrl": "http://www.w3.org/ns/odrl/2/"
       },
       "@type": "PolicyDefinitionRequestDto",
-      "@id": "id-3.0-trace",
+      "@id": "id-3.1-trace",
       "policy": {
         "@type": "Policy",
         "odrl:permission": [
@@ -20,7 +20,7 @@
                   "odrl:operator": {
                     "@id": "odrl:eq"
                   },
-                  "odrl:rightOperand": "ID 3.0 Trace"
+                  "odrl:rightOperand": "ID 3.1 Trace"
                 }
               ]
             }

local/testing/testdata/CX_Testdata_v1.7.0_PartInstance-reduced.json

@@ -1,11 +1,11 @@
 {
   "policies": {
-    "ID 3.0 Trace": {
+    "ID 3.1 Trace": {
       "@context": {
         "odrl": "http://www.w3.org/ns/odrl/2/"
       },
       "@type": "PolicyDefinitionRequestDto",
-      "@id": "id-3.0-trace",
+      "@id": "id-3.1-trace",
       "policy": {
         "@type": "Policy",
         "odrl:permission": [
@@ -20,7 +20,7 @@
                   "odrl:operator": {
                     "@id": "odrl:eq"
                   },
-                  "odrl:rightOperand": "ID 3.0 Trace"
+                  "odrl:rightOperand": "ID 3.1 Trace"
                 }
               ]
             }

local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json

@@ -1,11 +1,11 @@
 {
   "policies": {
-    "ID 3.0 Trace": {
+    "ID 3.1 Trace": {
       "@context": {
         "odrl": "http://www.w3.org/ns/odrl/2/"
       },
       "@type": "PolicyDefinitionRequestDto",
-      "@id": "id-3.0-trace",
+      "@id": "id-3.1-trace",
       "policy": {
         "@type": "Policy",
         "odrl:permission": [
@@ -20,7 +20,7 @@
                   "odrl:operator": {
                     "@id": "odrl:eq"
                   },
-                  "odrl:rightOperand": "ID 3.0 Trace"
+                  "odrl:rightOperand": "ID 3.1 Trace"
                 },
                 {
                   "@type": "Constraint",

local/testing/testdata/README.md

@@ -52,12 +52,12 @@ An example policy can look like this:
 ```json
 {
   "policies": {
-    "ID 3.0 Trace": {
+    "ID 3.1 Trace": {
        "@context": {
           "odrl": "http://www.w3.org/ns/odrl/2/"
        },
        "@type": "PolicyDefinitionRequestDto",
-       "@id": "id-3.0-trace",
+       "@id": "id-3.1-trace",
        "policy": {
           "@type": "Policy",
           "odrl:permission": [
@@ -70,7 +70,7 @@ An example policy can look like this:
                          "@type": "Constraint",
                          "odrl:leftOperand": "idsc:PURPOSE",
                          "odrl:operator": "EQ",
-                         "odrl:rightOperand": "ID 3.0 Trace"
+                         "odrl:rightOperand": "ID 3.1 Trace"
                       }
                    ]
                 }
@@ -87,8 +87,8 @@ An example policy can look like this:
 
 There are two options to apply the policy.
 
-1. Use the parameter `-p id-3.0-trace` to apply this policy to every asset
-2. Add a field `policy: "id-3.0-trace"` to the top level of each asset you want to use this policy. Every other asset
+1. Use the parameter `-p id-3.1-trace` to apply this policy to every asset
+2. Add a field `policy: "id-3.1-trace"` to the top level of each asset you want to use this policy. Every other asset
    will get the default, empty policy.
 
 It is also possible to define more than one policy at the beginning and then use the `"policy": "<id>"` field to apply a

local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect-with-invalid-vehicles.json

@@ -1,11 +1,11 @@
 {
   "policies": {
-    "ID 3.0 Trace": {
+    "ID 3.1 Trace": {
       "@context": {
         "odrl": "http://www.w3.org/ns/odrl/2/"
       },
       "@type": "PolicyDefinitionRequestDto",
-      "@id": "id-3.0-trace",
+      "@id": "id-3.1-trace",
       "policy": {
         "@type": "Policy",
         "odrl:permission": [
@@ -20,7 +20,7 @@
                   "odrl:operator": {
                     "@id": "odrl:eq"
                   },
-                  "odrl:rightOperand": "ID 3.0 Trace"
+                  "odrl:rightOperand": "ID 3.1 Trace"
                 }
               ]
             }

local/testing/testdata/dil/IRS_Testdata_v1.0.0-DataIntegrity-IntegrityAspect.json

@@ -1,11 +1,11 @@
 {
   "policies": {
-    "ID 3.0 Trace": {
+    "ID 3.1 Trace": {
       "@context": {
         "odrl": "http://www.w3.org/ns/odrl/2/"
       },
       "@type": "PolicyDefinitionRequestDto",
-      "@id": "id-3.0-trace",
+      "@id": "id-3.1-trace",
       "policy": {
         "@type": "Policy",
         "odrl:permission": [
@@ -20,7 +20,7 @@
                   "odrl:operator": {
                     "@id": "odrl:eq"
                   },
-                  "odrl:rightOperand": "ID 3.0 Trace"
+                  "odrl:rightOperand": "ID 3.1 Trace"
                 }
               ]
             }