Skip to content

Commit 27e12db

Browse files
wistefanwistefan
authored
Merge 43c3f16 into 4d532fb 
2 parents 4d532fb + 43c3f16 commit 27e12db

File tree

17 files changed

+450
-83
lines changed

17 files changed

+450
-83
lines changed

‎charts/data-space-connector/Chart.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: data-space-connector
33
description: Umbrella Chart for the FIWARE Data Space Connector, combining all essential parts to be used by a participant.
44
type: application
5-
version: 24.0.4
5+
version: 24.1.0
66
dependencies:
77
- name: postgresql
88
condition: postgresql.enabled
@@ -11,15 +11,15 @@ dependencies:
1111
# authentication
1212
- name: vcverifier
1313
condition: vcverifier.enabled
14-
version: 4.0.0
14+
version: 4.1.2
1515
repository: https://fiware.github.io/helm-charts
1616
- name: credentials-config-service
1717
condition: credentials-config-service.enabled
1818
version: 2.1.12
1919
repository: https://fiware.github.io/helm-charts
2020
- name: trusted-issuers-list
2121
condition: trusted-issuers-list.enabled
22-
version: 0.7.0
22+
version: 0.10.3
2323
repository: https://fiware.github.io/helm-charts
2424
- name: mysql
2525
condition: mysql.enabled
@@ -33,7 +33,7 @@ dependencies:
3333
# authorization
3434
- name: odrl-pap
3535
condition: odrl-pap.enabled
36-
version: 0.3.0
36+
version: 2.0.2
3737
repository: https://fiware.github.io/helm-charts
3838
- name: apisix
3939
condition: apisix.enabled
@@ -62,7 +62,7 @@ dependencies:
6262
repository: https://fiware.github.io/helm-charts
6363
- name: contract-management
6464
condition: contract-management.enabled
65-
version: 1.0.8
65+
version: 3.2.0
6666
repository: https://fiware.github.io/helm-charts
6767
# marketplace
6868
- name: business-api-ecosystem

‎charts/data-space-connector/values.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,8 +814,11 @@ contract-management:
814814
## URL for the Rainbow service
815815
url: http://rainbow:8080
816816
quote:
817-
## URL for the Rainbow service
817+
## URL for the Quote API
818818
url: http://tm-forum-api:8080
819+
odrl:
820+
## URL to the ODRL-PAP
821+
url: http://odrl-pap:8080
819822

820823
# -- configuration for the did-helper, should only be used for demonstrational deployments, see https://github.com/wistefan/did-helper
821824
did:

‎doc/deployment-integration/local-deployment/LOCAL.MD‎

Lines changed: 382 additions & 68 deletions
Large diffs are not rendered by default.

‎it/src/test/java/org/fiware/dataspace/it/components/StepDefinitions.java‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.io.IOException;
2323
import java.io.InputStream;
24+
import java.net.URI;
2425
import java.security.Security;
2526
import java.time.Duration;
2627
import java.util.*;
@@ -422,8 +423,24 @@ public void createManagedKubernetesOffering() throws Exception {
422423
.productSpecCharacteristicValue(
423424
List.of(
424425
new CharacteristicValueSpecificationVO()
425-
.value("Endpoint of the K8S service.")))
426-
));
426+
.value("Endpoint of the K8S service."))),
427+
new ProductSpecificationCharacteristicVO()
428+
.id("credentialsConfig")
429+
.name("Credentials Config for the Target Service")
430+
.valueType("credentialsConfiguration")
431+
.atSchemaLocation(URI.create("https://raw.githubusercontent.com/FIWARE/contract-management/refs/heads/main/schemas/credentials/credentialConfigCharacteristic.json"))
432+
.productSpecCharacteristicValue(
433+
List.of(
434+
new CharacteristicValueSpecificationVO()
435+
.value(Map.of(
436+
"credentialsType", "OperatorCredential",
437+
"claims", List.of(
438+
Map.of("name", "roles",
439+
"path", "$.roles[?(@.target==\\\"" + getDid(MPOperationsEnvironment.DID_PROVIDER_ADDRESS) + "\\\")].names[*]",
440+
"allowedValues", List.of("OPERATOR"))))
441+
)
442+
))));
443+
427444
RequestBody specificationRequestBody = RequestBody.create(OBJECT_MAPPER.writeValueAsString(pscVo), okhttp3.MediaType.parse(MediaType.APPLICATION_JSON));
428445
Request specificationRequest = new Request.Builder()
429446
.post(specificationRequestBody)
@@ -502,7 +519,23 @@ public void createReportsOffering() throws Exception {
502519
.productSpecCharacteristicValue(
503520
List.of(
504521
new CharacteristicValueSpecificationVO()
505-
.value("Endpoint of the reporting service.")))
522+
.value("Endpoint of the reporting service."))),
523+
new ProductSpecificationCharacteristicVO()
524+
.id("credentialsConfig")
525+
.name("Credentials Config for the Target Service")
526+
.valueType("credentialsConfiguration")
527+
.atSchemaLocation(URI.create("https://raw.githubusercontent.com/FIWARE/contract-management/refs/heads/main/schemas/credentials/credentialConfigCharacteristic.json"))
528+
.productSpecCharacteristicValue(
529+
List.of(
530+
new CharacteristicValueSpecificationVO()
531+
.value(Map.of(
532+
"credentialsType", "OperatorCredential",
533+
"claims", List.of(
534+
Map.of("name", "roles",
535+
"path", "$.roles[?(@.target==\\\"" + getDid(MPOperationsEnvironment.DID_PROVIDER_ADDRESS) + "\\\")].names[*]",
536+
"allowedValues", List.of("OPERATOR"))))
537+
)
538+
))
506539
));
507540
RequestBody specificationRequestBody = RequestBody.create(OBJECT_MAPPER.writeValueAsString(pscVo), okhttp3.MediaType.parse(MediaType.APPLICATION_JSON));
508541
Request specificationRequest = new Request.Builder()
@@ -787,7 +820,7 @@ public void createK8SCluster() throws Exception {
787820

788821
createdEntities.add("urn:ngsi-ld:K8SCluster:fancy-marketplace");
789822
}
790-
823+
791824
@Then("Fancy Marketplace' employee can access the EnergyReport.")
792825
public void accessTheEnergyReport() throws Exception {
793826
String accessToken = getAccessTokenForFancyMarketplace(USER_CREDENTIAL, DEFAULT_SCOPE, MPOperationsEnvironment.PROVIDER_API_ADDRESS);

‎it/src/test/java/org/fiware/dataspace/it/components/model/Claim.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.fiware.dataspace.it.components.model;
2+
3+
public class Claim {
4+
}

‎it/src/test/java/org/fiware/dataspace/it/components/model/CredentialConfig.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.fiware.dataspace.it.components.model;
2+
3+
public class CredentialConfig {
4+
}

‎it/src/test/resources/policies/allowAgreementRead.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"skos": "http://www.w3.org/2004/02/skos/core#"
99
},
1010
"@id": "https://mp-operation.org/policy/common/type",
11+
"odrl:uid": "https://mp-operation.org/policy/common/agreementRead",
1112
"@type": "odrl:Policy",
1213
"odrl:permission": {
1314
"odrl:assigner": {

‎it/src/test/resources/policies/allowCatalogRead.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"skos": "http://www.w3.org/2004/02/skos/core#"
99
},
1010
"@id": "https://mp-operation.org/policy/common/type",
11+
"odrl:uid": "https://mp-operation.org/policy/common/catalogRead",
1112
"@type": "odrl:Policy",
1213
"odrl:permission": {
1314
"odrl:assigner": {

‎it/src/test/resources/policies/allowProductOffering.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"skos": "http://www.w3.org/2004/02/skos/core#"
99
},
1010
"@id": "https://mp-operation.org/policy/common/type",
11+
"odrl:uid": "https://mp-operation.org/policy/common/productOffering",
1112
"@type": "odrl:Policy",
1213
"odrl:permission": {
1314
"odrl:assigner": {

‎it/src/test/resources/policies/allowProductOrder.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"skos": "http://www.w3.org/2004/02/skos/core#"
99
},
1010
"@id": "https://mp-operation.org/policy/common/type",
11+
"odrl:uid": "https://mp-operation.org/policy/common/productOrder",
1112
"@type": "odrl:Policy",
1213
"odrl:permission": {
1314
"odrl:assigner": {

0 commit comments

Comments
 (0)