Skip to content

Commit 1e14bba

Browse files
bmg13bmg13
authored
deps: update edc-connector to 0.12.0 and tractusx-edc to 0.9.0 (#515)
* Fix e2e run tests action. * Bump terraform init version for e2e run tests action. * Small file change * Add ih modules. * Create correct images. * Remove redundant step. * Fix ih config human name. * Update edc version. * Fix request params. * Update tractusx version * Fix request params.
1 parent 1b051cb commit 1e14bba

8 files changed

Lines changed: 30 additions & 26 deletions

File tree

‎.github/workflows/run-end2end-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
--timeout=90s
7272
- name: "Load Docker Images"
7373
run: |-
74-
kind load docker-image --name mxd data-service-api tx-identityhub tx-identityhub-sts tx-catalog-server tx-sts
74+
kind load docker-image --name mxd data-service-api tx-identityhub tx-catalog-server tx-issuerservice
7575
7676
- name: "Terraform init"
7777
working-directory: ./mxd
@@ -99,4 +99,4 @@ jobs:
9999
100100
- name: "Destroy the KinD cluster"
101101
run: >-
102-
kind get clusters | xargs -n1 kind delete cluster --name
102+
kind get clusters | xargs -n1 kind delete cluster --name

‎mxd-runtimes/gradle/catalogserver.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
format.version = "1.1"
33

44
[versions]
5-
edc = "0.12.0-SNAPSHOT"
6-
tractusx = "0.8.0"
5+
edc = "0.12.0"
6+
tractusx = "0.9.0"
77
postgres = "42.7.3"
88

99
[libraries]

‎mxd-runtimes/gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ format.version = "1.1"
44
[versions]
55
awaitility = "4.2.2"
66
assertj = "3.25.3"
7-
edc = "0.12.0-SNAPSHOT"
8-
ih = "0.12.0-SNAPSHOT"
9-
tractusx = "0.8.0"
7+
edc = "0.12.0"
8+
ih = "0.12.0"
9+
tractusx = "0.9.0"
1010
tractusx-issuer = "0.1.0-SNAPSHOT"
1111
commons = "2.11.0"
1212
opentelemetry = "1.32.0"

‎mxd/modules/connector/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "helm_release" "connector" {
3030

3131
repository = "https://eclipse-tractusx.github.io/charts/dev"
3232
chart = "tractusx-connector"
33-
version = "0.8.0"
33+
version = "0.9.0"
3434

3535
values = [
3636
file("${path.module}/values.yaml"),

‎mxd/modules/identity-hub/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ resource "kubernetes_deployment" "identityhub" {
110110

111111
resource "kubernetes_config_map" "identityhub-config" {
112112
metadata {
113-
name = "${lower(var.humanReadableName)}-ih-config"
113+
name = "${lower(var.humanReadableName)}-config"
114114
namespace = var.namespace
115115
}
116116

‎mxd/outputs.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
#
1919

2020
output "bob-database-credentials" {
21-
value = local.alice-postgres
21+
value = local.bob-postgres
2222
}
2323

2424
output "alice-database-credentials" {
25-
value = local.bob-postgres
25+
value = local.alice-postgres
2626
}
2727

2828
output "bob-urls" {

‎mxd/postman/mxd-seed.json‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
"header": [],
194194
"body": {
195195
"mode": "raw",
196-
"raw": "{\n \"@context\": [\n \"https://w3id.org/edc/connector/management/v0.0.1\"\n ],\n \"@type\": \"PolicyDefinition\",\n \"@id\": \"require-membership\",\n \"policy\": {\n \"@type\": \"http://www.w3.org/ns/odrl/2/Set\",\n \"permission\": [\n {\n \"action\": \"use\",\n \"constraint\": {\n \"@type\": \"LogicalConstraint\",\n \"leftOperand\": \"Membership\",\n \"operator\": \"eq\",\n \"rightOperand\": \"active\"\n }\n }\n ]\n }\n}",
196+
"raw": "{\n \"@context\": [\n {\n \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\n },\n \"https://w3id.org/tractusx/policy/v1.0.0\",\n \"http://www.w3.org/ns/odrl.jsonld\"\n ],\n \"@type\": \"PolicyDefinitionRequestDto\",\n \"@id\": \"require-membership\",\n \"policy\": {\n \"@type\": \"http://www.w3.org/ns/odrl/2/Set\",\n \"permission\": [\n {\n \"action\": \"use\",\n \"constraint\": {\n \"@type\": \"LogicalConstraint\",\n \"leftOperand\": \"Membership\",\n \"operator\": \"eq\",\n \"rightOperand\": \"active\"\n }\n }\n ]\n }\n}",
197197
"options": {
198198
"raw": {
199199
"language": "json"
@@ -244,7 +244,7 @@
244244
"header": [],
245245
"body": {
246246
"mode": "raw",
247-
"raw": "{\n \"@context\": [\n \"https://w3id.org/edc/connector/management/v0.0.1\"\n ],\n \"@type\": \"PolicyDefinition\",\n \"@id\": \"require-deg\",\n \"policy\": {\n \"@type\": \"http://www.w3.org/ns/odrl/2/Set\",\n \"permission\": [\n {\n \"action\": \"use\",\n \"constraint\": {\n \"@type\": \"LogicalConstraint\",\n \"leftOperand\": \"FrameworkAgreement\",\n \"operator\": \"eq\",\n \"rightOperand\": \"DataExchangeGovernance\"\n }\n }\n ]\n }\n}",
247+
"raw": "{\n \"@context\": [\n {\n \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\n },\n \"https://w3id.org/tractusx/policy/v1.0.0\",\n \"http://www.w3.org/ns/odrl.jsonld\"\n ],\n \"@type\": \"PolicyDefinitionRequestDto\",\n \"@id\": \"require-deg\",\n \"policy\": {\n \"@type\": \"http://www.w3.org/ns/odrl/2/Set\",\n \"permission\": [\n {\n \"action\": \"use\",\n \"constraint\": {\n \"@type\": \"LogicalConstraint\",\n \"leftOperand\": \"FrameworkAgreement\",\n \"operator\": \"eq\",\n \"rightOperand\": \"DataExchangeGovernance\"\n }\n }\n ]\n }\n}",
248248
"options": {
249249
"raw": {
250250
"language": "json"
@@ -295,7 +295,7 @@
295295
"header": [],
296296
"body": {
297297
"mode": "raw",
298-
"raw": "{\n \"@context\": [\n \"https://w3id.org/edc/connector/management/v0.0.1\"\n ],\n \"@type\": \"PolicyDefinition\",\n \"@id\": \"require-dismantler\",\n \"policy\": {\n \"@type\": \"http://www.w3.org/ns/odrl/2/Set\",\n \"permission\": [\n {\n \"action\": \"use\",\n \"constraint\": {\n \"@type\": \"LogicalConstraint\",\n \"leftOperand\": \"Dismantler\",\n \"operator\": \"eq\",\n \"rightOperand\": \"active\"\n }\n }\n ]\n }\n}",
298+
"raw": "{\n \"@context\": [\n {\n \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\"\n },\n \"https://w3id.org/tractusx/policy/v1.0.0\",\n \"http://www.w3.org/ns/odrl.jsonld\"\n ],\n \"@type\": \"PolicyDefinitionRequestDto\",\n \"@id\": \"require-dismantler\",\n \"policy\": {\n \"@type\": \"http://www.w3.org/ns/odrl/2/Set\",\n \"permission\": [\n {\n \"action\": \"use\",\n \"constraint\": {\n \"@type\": \"LogicalConstraint\",\n \"leftOperand\": \"Dismantler\",\n \"operator\": \"eq\",\n \"rightOperand\": \"active\"\n }\n }\n ]\n }\n}",
299299
"options": {
300300
"raw": {
301301
"language": "json"
@@ -1160,21 +1160,21 @@
11601160
"header": [],
11611161
"body": {
11621162
"mode": "raw",
1163-
"raw": "{\n \"did\": \"{{CONSUMER_ID}}\",\n \"participantId\": \"{{CONSUMER_ID}}\",\n \"name\": \"{{CONSUMER_NAME}}\"\n}",
1163+
"raw": "{\n \"roles\":[\"admin\"],\n \"serviceEndpoints\":[\n {\n \"type\": \"IssuerService\",\n \"serviceEndpoint\": \"http://dataspace-issuer-service:10012/api/issuance/v1alpha/issuers/ZGlkOndlYjpkYXRhc3BhY2UtaXNzdWVyLXNlcnZpY2UlM0ExMDAxNjppc3N1ZXI=\",\n \"id\": \"issuer-service-1\"\n }\n ],\n \"active\": true,\n \"participantId\": \"{{CONSUMER_ID}}\",\n \"did\": \"{{CONSUMER_ID}}\",\n \"key\":{\n \"keyId\": \"{{CONSUMER_ID}}#key-1\",\n \"privateKeyAlias\": \"key-1\",\n \"keyGeneratorParams\":{\n \"algorithm\": \"EdDSA\"\n }\n }\n }",
11641164
"options": {
11651165
"raw": {
11661166
"language": "json"
11671167
}
11681168
}
11691169
},
11701170
"url": {
1171-
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants",
1171+
"raw": "{{ISSUER_CS_URL}}/api/identity/v1alpha/participants",
11721172
"host": [
1173-
"{{ISSUER_ADMIN_URL}}"
1173+
"{{ISSUER_CS_URL}}"
11741174
],
11751175
"path": [
11761176
"api",
1177-
"admin",
1177+
"identity",
11781178
"v1alpha",
11791179
"participants"
11801180
]
@@ -1202,21 +1202,21 @@
12021202
"header": [],
12031203
"body": {
12041204
"mode": "raw",
1205-
"raw": "{\n \"did\": \"{{PROVIDER_ID}}\",\n \"participantId\": \"{{PROVIDER_ID}}\",\n \"name\": \"{{PROVIDER_NAME}}\"\n}",
1205+
"raw": "{\n \"roles\":[\"admin\"],\n \"serviceEndpoints\":[\n {\n \"type\": \"IssuerService\",\n \"serviceEndpoint\": \"http://dataspace-issuer-service:10012/api/issuance/v1alpha/issuers/ZGlkOndlYjpkYXRhc3BhY2UtaXNzdWVyLXNlcnZpY2UlM0ExMDAxNjppc3N1ZXI=\",\n \"id\": \"issuer-service-1\"\n }\n ],\n \"active\": true,\n \"participantId\": \"{{PROVIDER_ID}}\",\n \"did\": \"{{PROVIDER_ID}}\",\n \"key\":{\n \"keyId\": \"{{PROVIDER_ID}}#key-1\",\n \"privateKeyAlias\": \"key-1\",\n \"keyGeneratorParams\":{\n \"algorithm\": \"EdDSA\"\n }\n }\n }",
12061206
"options": {
12071207
"raw": {
12081208
"language": "json"
12091209
}
12101210
}
12111211
},
12121212
"url": {
1213-
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants",
1213+
"raw": "{{ISSUER_CS_URL}}/api/identity/v1alpha/participants",
12141214
"host": [
1215-
"{{ISSUER_ADMIN_URL}}"
1215+
"{{ISSUER_CS_URL}}"
12161216
],
12171217
"path": [
12181218
"api",
1219-
"admin",
1219+
"identity",
12201220
"v1alpha",
12211221
"participants"
12221222
]
@@ -1252,14 +1252,16 @@
12521252
}
12531253
},
12541254
"url": {
1255-
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/attestations",
1255+
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants/{{PARTICIPANT_CONTEXT_ID_BASE64}}/attestations",
12561256
"host": [
12571257
"{{ISSUER_ADMIN_URL}}"
12581258
],
12591259
"path": [
12601260
"api",
12611261
"admin",
12621262
"v1alpha",
1263+
"participants",
1264+
"{{PARTICIPANT_CONTEXT_ID_BASE64}}",
12631265
"attestations"
12641266
]
12651267
},
@@ -1274,22 +1276,24 @@
12741276
"header": [],
12751277
"body": {
12761278
"mode": "raw",
1277-
"raw": "{\n \"attestations\": [\n \"name-attestation-def-1\"\n ],\n \"credentialType\": \"NameCredential\",\n \"dataModel\": \"V_1_1\",\n \"id\": \"name-credential-def-1\",\n \"jsonSchema\": \"{}\",\n \"jsonSchemaUrl\": \"https://example.com/schema/name-credential.json\",\n \"mappings\": [\n {\n \"input\": \"participant.name\",\n \"output\": \"credentialSubject.name\",\n \"required\": \"true\"\n },\n {\n \"input\": \"credential.id\",\n \"output\": \"credentialSubject.id\",\n \"required\": \"true\"\n }\n ],\n \"rules\": [\n {\n \"type\": \"expression\",\n \"configuration\": {\n \"claim\": \"onboarding.signedDocuments\",\n \"operator\": \"eq\",\n \"value\": true\n }\n }\n ]\n}",
1279+
"raw": "{\n \"attestations\": [\n \"name-attestation-def-1\"\n ],\n \"formats\": [\n \"VC1_0_JWT\"\n ],\n \"credentialType\": \"NameCredential\",\n \"validity\": \"1000000000000\",\n \"id\": \"name-credential-def-1\",\n \"jsonSchema\": \"{}\",\n \"jsonSchemaUrl\": \"https://example.com/schema/name-credential.json\",\n \"mappings\": [\n {\n \"input\": \"participant.name\",\n \"output\": \"credentialSubject.name\",\n \"required\": \"true\"\n },\n {\n \"input\": \"credential.id\",\n \"output\": \"credentialSubject.id\",\n \"required\": \"true\"\n }\n ],\n \"rules\": [\n {\n \"type\": \"expression\",\n \"configuration\": {\n \"claim\": \"onboarding.signedDocuments\",\n \"operator\": \"eq\",\n \"value\": true\n }\n }\n ]\n}",
12781280
"options": {
12791281
"raw": {
12801282
"language": "json"
12811283
}
12821284
}
12831285
},
12841286
"url": {
1285-
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/credentialdefinitions",
1287+
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants/{{PARTICIPANT_CONTEXT_ID_BASE64}}/credentialdefinitions",
12861288
"host": [
12871289
"{{ISSUER_ADMIN_URL}}"
12881290
],
12891291
"path": [
12901292
"api",
12911293
"admin",
12921294
"v1alpha",
1295+
"participants",
1296+
"{{PARTICIPANT_CONTEXT_ID_BASE64}}",
12931297
"credentialdefinitions"
12941298
]
12951299
},

‎mxd/seed_data.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
resource "kubernetes_job" "seed_connectors_via_mgmt_api" {
2525
// wait until the connectors are running, otherwise terraform may report an error
26-
depends_on = [module.alice-connector, module.bob-connector]
26+
depends_on = [module.alice-identityhub, module.bob-identityhub]
2727
metadata {
2828
name = "seed-connectors"
2929
namespace = kubernetes_namespace.mxd-ns.metadata.0.name

0 commit comments

Comments
 (0)