Chore/upstream contribution #1383
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ter assets the dtr
ds-lcapellino
force-pushed
the
chore/upstream-contribution
branch
from
9717e62 to
1f7dcd3
Compare
…ter assets the dtr
…or register assets the dtr" This reverts commit 1588186.
…ter assets the dtr
…ter assets the dtr
…ter assets the dtr
ds-mwesener
reviewed
Jan 13, 2025
| @@ -89,7 +90,7 @@ SPDX-License-Identifier: Apache-2.0 | |||
| <junit-bom.version>5.10.3</junit-bom.version> | |||
| <awaitility.version>4.2.1</awaitility.version> | |||
| <!-- TODO https://github.com/eclipse-tractusx/traceability-foss/issues/978 update to the cx release version of irs lib IMPORTANT NO SNAPSHOT--> | |||
| <irs-client-lib.version>2.1.9</irs-client-lib.version> | |||
| <irs-client-lib.version>2.1.16</irs-client-lib.version> | |||
There was a problem hiding this comment.
Please recheck if this exists open source
ds-mwesener
reviewed
Jan 13, 2025
| throw new CreateEdcContractDefinitionException(e); | ||
| } | ||
|
|
||
| String submodelAssetId; | ||
| String submodelAssetIdToCreate = "urn:uuid:" + UUID.randomUUID(); | ||
| try { | ||
| submodelAssetId = edcAssetService.createSubmodelAsset(traceabilityProperties.getSubmodelBase(), submodelAssetIdToCreate); | ||
| log.info("Submodel Asset Id created :{}", submodelAssetId); | ||
| submodelAssetId = edcAssetService.createSubmodelAsset(submodelProperties.getBaseInternal(), submodelAssetIdToCreate); |
There was a problem hiding this comment.
Did you set the public url for the submodel, this is the case in the open source variant. Please check
ds-mwesener
reviewed
Jan 13, 2025
| } catch (Exception exception) { | ||
| log.warn("EDC Asset (Submodel) could not be created: {}", exception.getMessage()); | ||
| throw new CreateEdcAssetException(exception); | ||
| } | ||
|
|
||
| try { | ||
| String submodelContractId = edcContractDefinitionService.createContractDefinition(submodelAssetId, createdPolicyId); |
There was a problem hiding this comment.
I am not sure if the submodel server is returning the id on open source variant.
ds-mwesener
reviewed
Jan 13, 2025
| @@ -50,9 +51,9 @@ | |||
| @EnableJpaRepositories(basePackages = "org.eclipse.tractusx.traceability.*") | |||
| public class EdcConfiguration { | |||
|
|
|||
| @Value("${registry.urlWithPath}") | |||
There was a problem hiding this comment.
Helm Environments updated?
ds-mwesener
reviewed
Jan 13, 2025
| final RestTemplateBuilder restTemplateBuilder, | ||
| @Autowired RegistryProperties registryProperties) { | ||
| return oAuthRestTemplate(restTemplateBuilder, | ||
| registryProperties.getOauthProviderRegistrationId()) |
There was a problem hiding this comment.
The open source variant does not have authentication curently. How to deal with that.
ds-mwesener
reviewed
Jan 13, 2025
| public RestTemplate submodelRestTemplate(@Autowired SubmodelProperties submodelProperties, @Autowired FeignDefaultProperties feignDefaultProperties, | ||
| final RestTemplateBuilder restTemplateBuilder) { | ||
|
|
||
| return oAuthRestTemplate(restTemplateBuilder, submodelProperties.getOauthProviderRegistrationId()) |
There was a problem hiding this comment.
Submodel server does not have oauth in open source. How to deal with that.
ds-mwesener
reviewed
Jan 13, 2025
| @@ -20,7 +20,7 @@ | |||
| package org.eclipse.tractusx.traceability.submodel.domain.repository; | |||
|
|
|||
| public interface SubmodelServerRepository { | |||
| void saveSubmodel(String submodelId, String submodel); | |||
| String saveSubmodel(String submodel); | |||
There was a problem hiding this comment.
This change is not compliant with open source variant.
ds-mwesener
reviewed
Jan 13, 2025
| await() | ||
| .atMost(Durations.FIVE_MINUTES) | ||
| .pollInterval(1, TimeUnit.SECONDS) | ||
| .until(() -> { | ||
| try { | ||
| submodelRestTemplate.exchange("/" + submodelId, HttpMethod.POST, new HttpEntity<>(payload), Void.class); | ||
| log.info("Submodel created successfully with id: {}", submodelId); | ||
| submodelRestTemplate.exchange("/", HttpMethod.POST, new HttpEntity<>(submodelRequest), Void.class); |
ds-mwesener
reviewed
Jan 13, 2025
| public String saveSubmodel(String submodel) { | ||
| String submodelId; | ||
| try { | ||
| String submodelEnriched = SubmodelUtil.enrichWithSubmodelUuid(objectMapper, submodel); |
ds-mwesener
reviewed
Jan 13, 2025
| @UtilityClass | ||
| public class SubmodelUtil { | ||
|
|
||
| public static String enrichWithSubmodelUuid(final ObjectMapper objectMapper, String jsonString) throws Exception { |
ds-mwesener
reviewed
Jan 13, 2025
| @@ -1,4 +1,52 @@ | |||
| -- ${flyway:timestamp} | |||
| -- TODO remove after demo / discovery is working | |||
| INSERT INTO assets_as_built (id, | |||
ds-mwesener
reviewed
Jan 13, 2025
| import org.springframework.context.ApplicationContextInitializer; | ||
| import org.springframework.context.ConfigurableApplicationContext; | ||
|
|
||
| public class BmwBpnConfig { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR provides the feature https://cofinity-x.atlassian.net/browse/TRACEX-212 to upstream.
The upstream feature is eclipse-tractusx/sig-release#940.
Pre-review checks
Please ensure to do as many of the following checks as possible, before asking for committer review: