Skip to content

Fix/bruno dtr setup #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 24, 2025
Merged

Fix/bruno dtr setup #967

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd4707b
fix: dtr framework policy in bruno
ReneSchroederLJ Sep 11, 2025
77deea5
fix: added missing access policy namespaces
ReneSchroederLJ Sep 11, 2025
f66b764
chore: updated changelog
ReneSchroederLJ Sep 11, 2025
263a611
fix: revert policy creation fix to preserve existing policy definitions
ReneSchroederLJ Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v3.4.1

The following Changelog lists the changes. Please refer to the [documentation](docs/README.md) for configuration needs and understanding the concept changes.

The **need for configuration updates** is **marked bold**.

### Added

- /

### Changed

- /

### Fixes

- fixed invalid framwork policy in the bruno DTR setup and added missing namespaces for access policies ([#967](https://github.com/eclipse-tractusx/puris/pull/967))

## v3.4.0

The following Changelog lists the changes. Please refer to the [documentation](docs/README.md) for configuration needs and understanding the concept changes.
Expand Down
4 changes: 2 additions & 2 deletions .../java/org/eclipse/tractusx/puris/backend/common/edc/logic/util/EdcRequestBodyBuilder.java
View file
Open in desktop
Copy link
Contributor

@tom-rm-meyer-ISST tom-rm-meyer-ISST Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't provide a migration in the documentation or somewhere. I would opt to exclude this change in this PR. How about you?

If we change it, we need some kind of guidance for migration + we then can enable the policy validation in the local deployment

Copy link
Member Author

@ReneSchroederLJ ReneSchroederLJ Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with you. This should be handled and properly documented separately. I've removed the change for now

Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ public JsonNode buildBpnAndMembershipRestrictedPolicy(Partner partner) {
List<PolicyConstraint> constraints = new ArrayList<>();

constraints.add(new PolicyConstraint(
"BusinessPartnerNumber",
TX_NAMESPACE + "BusinessPartnerNumber",
"eq",
partner.getBpnl()
));

constraints.add(new PolicyConstraint(
"Membership",
CX_POLICY_NAMESPACE + "Membership",
"eq",
"active"
));
Expand Down
4 changes: 2 additions & 2 deletions ...omer/00-EDC-Assets/01-DTR-Asset/01-Create Contract Def/02-Create DTR Framework Policy.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ body:json {
"@type" : "LogicalConstraint",
"and" : [ {
"@type" : "LogicalConstraint",
"leftOperand" : "cx-policy:Membership",
"leftOperand" : "cx-policy:FrameworkAgreement",
"operator" : "eq",
"rightOperand" : "active"
"rightOperand" : "DataExchangeGovernance:1.0"
}, {
"@type" : "LogicalConstraint",
"leftOperand" : "cx-policy:UsagePurpose",
Expand Down
12 changes: 6 additions & 6 deletions ...Usage/01-Customer/00-EDC-Assets/01-DTR-Asset/02-Contract as Supplier/01-Query Catalog.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ tests {
expect(res.getStatus()).to.equal(200);
});

var jsonData = res.getBody();
let jsonData = res.getBody();

var catalog = jsonData['dcat:dataset'];
var itemStockOffer = '';
let catalog = jsonData['dcat:dataset'];
let itemStockOffer = '';

offer = catalog["odrl:hasPolicy"]
offerId = offer["@id"]
assetId = catalog['id']
let offer = catalog["odrl:hasPolicy"]
const offerId = offer["@id"]
const assetId = catalog['id']

offer["offerId"] = offerId
delete offer["@id"]
Expand Down
2 changes: 1 addition & 1 deletion ...1-Customer/00-EDC-Assets/01-DTR-Asset/02-Contract as Supplier/03-Get Negotation by id.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ auth:apikey {

script:pre-request {
console.log("Waiting 5 seconds to let negotiation terminate");
await new Promise(resolve => setTimeout(resolve, 5000));
await (new Promise(resolve => setTimeout(resolve, 5000)));
}

tests {
Expand Down
10 changes: 5 additions & 5 deletions ...tomer) Identify Resources to Check, Update, Terminate/01-Identify own catalog entries.bru
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ body:json {
}

tests {
var jsonData = res.getBody();
let jsonData = res.getBody();

var catalog = jsonData['dcat:dataset'];
let catalog = jsonData['dcat:dataset'];

offer = catalog["odrl:hasPolicy"]
offerId = offer["@id"]
assetId = catalog['id']
let offer = catalog["odrl:hasPolicy"]
const offerId = offer["@id"]
const assetId = catalog['id']

const [encodedContractDefintionId] = offerId.split(':')
console.log(encodedContractDefintionId)
Expand Down
2 changes: 1 addition & 1 deletion local/tractus-x-edc/config/customer/puris-backend.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ puris.demandsubmodel.apiassetid=demandsubmodel-api-asset
puris.deliverysubmodel.apiassetid=deliverysubmodel-api-asset
puris.daysofsupplysubmodel.apiassetid=daysofsupplysubmodel-api-asset
puris.notification.apiassetid=notification-api-asset
puris.frameworkagreement.credential=Puris
puris.frameworkagreement.credential=DataExchangeGovernance
puris.frameworkagreement.version=1.0
puris.purpose.name=cx.puris.base
puris.purpose.version=1
Expand Down
2 changes: 1 addition & 1 deletion local/tractus-x-edc/config/supplier/puris-backend.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ puris.demandsubmodel.apiassetid=demandsubmodel-api-asset
puris.deliverysubmodel.apiassetid=deliverysubmodel-api-asset
puris.daysofsupplysubmodel.apiassetid=daysofsupplysubmodel-api-asset
puris.notification.apiassetid=notification-api-asset
puris.frameworkagreement.credential=Puris
puris.frameworkagreement.credential=DataExchangeGovernance
puris.frameworkagreement.version=1.0
puris.purpose.name=cx.puris.base
puris.purpose.version=1
Expand Down
Loading