Skip to content
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.

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

Release 3.5.0 of IRS #176

Merged
merged 93 commits into from
Sep 28, 2023
Merged

Release 3.5.0 of IRS #176

merged 93 commits into from
Sep 28, 2023

Conversation

ds-ext-kmassalski
Copy link
Contributor

@ds-ext-kmassalski ds-ext-kmassalski commented Sep 28, 2023

Changed

  • IRS now makes use of the value dspEndpoint in subprotocolBody of the Asset Administration Shell to request submodel data directly.

Fixed

  • Fixed a case where IRS submodel requests did not reuqest all EDC endpoints discovered by Discovery Finder
  • ESS
    • Updated investigation request body field incidentBPNs to incidentBPNSs.
    • Streamlined EDC notification flow and adjusted it to existing EDC client methods
    • Changed investigation from BPNL to BPNS (catenaXSiteId of PartSiteInformationAsPlanned)
    • Additional validation for validityPeriod of PartAsPlanned

# Conflicts:
#	irs-ess/src/main/java/org/eclipse/tractusx/ess/discovery/DiscoveryFinderRequest.java
#	irs-ess/src/main/java/org/eclipse/tractusx/ess/discovery/EdcAddressResponse.java
#	irs-ess/src/main/java/org/eclipse/tractusx/ess/discovery/EdcDiscoveryClient.java
#	irs-ess/src/main/java/org/eclipse/tractusx/ess/discovery/EdcDiscoveryFacade.java
#	irs-ess/src/test/java/org/eclipse/tractusx/ess/discovery/EdcDiscoveryClientImplTest.java
#	irs-ess/src/test/java/org/eclipse/tractusx/ess/discovery/EdcDiscoveryFacadeTest.java
…from PartSiteInformationAsPlanned and ValidityPeriod from PartAsPlanned
# Conflicts:
#	irs-ess/src/main/java/org/eclipse/tractusx/ess/service/EssService.java
ds-jhartmann and others added 27 commits September 26, 2023 09:46
…ng-highcharts

feat(impl):[TRI-1629] remove gatling highcharts
…holders

chore(workflows): Update secret placeholders for IRS DIL user
chore(dependencies): Add test scope to dependency scan
…n-tests-for-ESS

TRI-1523: Adjusted and tavern tests for ESS-investigation use cases
…ane-without-negotiation

Fix/tri 1646 irs calls dataplane without negotiation
feat(ess):[TRI-1523] Add state to BpnInvestigationJob which will be u…
Copy link
Contributor

@ds-jhartmann ds-jhartmann left a comment

Choose a reason for hiding this comment

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

LGTM

@ds-jhartmann ds-jhartmann merged commit bbcf9a7 into eclipse-tractusx:main Sep 28, 2023
17 of 19 checks passed
final String subprotocolBody = endpoint.getProtocolInformation().getSubprotocolBody();
final Optional<String> dspEndpoint = extractDspEndpoint(subprotocolBody);
if (dspEndpoint.isPresent()) {
log.debug("Using dspEndpoint of subprotocolBody '{}' to get submodel payload", subprotocolBody);

Check failure

Code scanning / CodeQL

Log Injection High

This log entry depends on a
user-provided value
.
() -> new ResponseStatusException(HttpStatus.BAD_REQUEST,
"Malformed EDC Notification - content without incidentBPN key."));
log.info("Received notification request on mock with id {} and incidentBPNSs {}",
notification.getHeader().getNotificationId(), incidentBPNSs);

Check failure

Code scanning / CodeQL

Log Injection High

This log entry depends on a
user-provided value
.
() -> new ResponseStatusException(HttpStatus.BAD_REQUEST,
"Malformed EDC Notification - content without incidentBPN key."));
log.info("Received notification request on mock with id {} and incidentBPNSs {}",
notification.getHeader().getNotificationId(), incidentBPNSs);

Check failure

Code scanning / CodeQL

Log Injection High

This log entry depends on a
user-provided value
.
.map(Object::toString);

final SupplyChainImpacted supplyChainImpacted = notificationResult.map(SupplyChainImpacted::fromString)
.orElse(SupplyChainImpacted.UNKNOWN);
log.debug("Received answer for Notification with id '{}' and investigation result '{}'.",
originalNotificationId, supplyChainImpacted);

Check failure

Code scanning / CodeQL

Log Injection High

This log entry depends on a
user-provided value
.
@@ -61,7 +61,7 @@
.map(EdcDiscoveryResult::connectorEndpoint))
.flatMap(List::stream)
.toList();
log.info("Discovered the following endpoints for BPN {}: {}", bpn, String.join(", ", endpoints));
log.info("Discovered the following endpoints for BPN '{}': '{}'", bpn, String.join(", ", endpoints));

Check failure

Code scanning / CodeQL

Log Injection High

This log entry depends on a
user-provided value
.
This log entry depends on a
user-provided value
.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants