Skip to content

deps: update edc-connector to 0.12.0 and tractusx-edc to 0.9.0 #515

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
rafaelmag110 merged 12 commits into from
Mar 21, 2025
Merged

deps: update edc-connector to 0.12.0 and tractusx-edc to 0.9.0 #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f330bc0
Fix e2e run tests action.
bmg13 Feb 28, 2025
ed236e6
Bump terraform init version for e2e run tests action.
bmg13 Feb 28, 2025
5f330fc
Small file change
bmg13 Feb 28, 2025
93ab0cb
Add ih modules.
bmg13 Mar 3, 2025
d09879c
Merge branch 'main' of github.com:eclipse-tractusx/tutorial-resources…
bmg13 Mar 13, 2025
f8fc329
Create correct images.
bmg13 Mar 13, 2025
318cbfe
Remove redundant step.
bmg13 Mar 13, 2025
4775c02
Fix ih config human name.
bmg13 Mar 18, 2025
3d03e1d
Update edc version.
bmg13 Mar 19, 2025
a63cf48
Fix request params.
bmg13 Mar 20, 2025
9f2e6aa
Update tractusx version
bmg13 Mar 20, 2025
5f2c6a1
Fix request params.
bmg13 Mar 20, 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
4 changes: 2 additions & 2 deletions .github/workflows/run-end2end-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
--timeout=90s
- name: "Load Docker Images"
run: |-
kind load docker-image --name mxd data-service-api tx-identityhub tx-identityhub-sts tx-catalog-server tx-sts
kind load docker-image --name mxd data-service-api tx-identityhub tx-catalog-server tx-issuerservice

- name: "Terraform init"
working-directory: ./mxd
Expand Down Expand Up @@ -99,4 +99,4 @@ jobs:

- name: "Destroy the KinD cluster"
run: >-
kind get clusters | xargs -n1 kind delete cluster --name
kind get clusters | xargs -n1 kind delete cluster --name
4 changes: 2 additions & 2 deletions mxd-runtimes/gradle/catalogserver.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
format.version = "1.1"

[versions]
edc = "0.12.0-SNAPSHOT"
tractusx = "0.8.0"
edc = "0.12.0"
tractusx = "0.9.0"
postgres = "42.7.3"

[libraries]
Expand Down
6 changes: 3 additions & 3 deletions mxd-runtimes/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ format.version = "1.1"
[versions]
awaitility = "4.2.2"
assertj = "3.25.3"
edc = "0.12.0-SNAPSHOT"
ih = "0.12.0-SNAPSHOT"
tractusx = "0.8.0"
edc = "0.12.0"
ih = "0.12.0"
tractusx = "0.9.0"
tractusx-issuer = "0.1.0-SNAPSHOT"
commons = "2.11.0"
opentelemetry = "1.32.0"
Expand Down
2 changes: 1 addition & 1 deletion mxd/modules/connector/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource "helm_release" "connector" {

repository = "https://eclipse-tractusx.github.io/charts/dev"
chart = "tractusx-connector"
version = "0.8.0"
version = "0.9.0"

values = [
file("${path.module}/values.yaml"),
Expand Down
2 changes: 1 addition & 1 deletion mxd/modules/identity-hub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ resource "kubernetes_deployment" "identityhub" {

resource "kubernetes_config_map" "identityhub-config" {
metadata {
name = "${lower(var.humanReadableName)}-ih-config"
name = "${lower(var.humanReadableName)}-config"
namespace = var.namespace
}

Expand Down
4 changes: 2 additions & 2 deletions mxd/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
#

output "bob-database-credentials" {
value = local.alice-postgres
value = local.bob-postgres
}

output "alice-database-credentials" {
value = local.bob-postgres
value = local.alice-postgres
}

output "bob-urls" {
Expand Down
32 changes: 18 additions & 14 deletions mxd/postman/mxd-seed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
"header": [],
"body": {
"mode": "raw",
"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}",
"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}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -244,7 +244,7 @@
"header": [],
"body": {
"mode": "raw",
"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}",
"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}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -295,7 +295,7 @@
"header": [],
"body": {
"mode": "raw",
"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}",
"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}",
"options": {
"raw": {
"language": "json"
Expand Down Expand Up @@ -1160,21 +1160,21 @@
"header": [],
"body": {
"mode": "raw",
"raw": "{\n \"did\": \"{{CONSUMER_ID}}\",\n \"participantId\": \"{{CONSUMER_ID}}\",\n \"name\": \"{{CONSUMER_NAME}}\"\n}",
"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 }",
"options": {
"raw": {
"language": "json"
}
}
},
"url": {
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants",
"raw": "{{ISSUER_CS_URL}}/api/identity/v1alpha/participants",
"host": [
"{{ISSUER_ADMIN_URL}}"
"{{ISSUER_CS_URL}}"
],
"path": [
"api",
"admin",
"identity",
"v1alpha",
"participants"
]
Expand Down Expand Up @@ -1202,21 +1202,21 @@
"header": [],
"body": {
"mode": "raw",
"raw": "{\n \"did\": \"{{PROVIDER_ID}}\",\n \"participantId\": \"{{PROVIDER_ID}}\",\n \"name\": \"{{PROVIDER_NAME}}\"\n}",
"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 }",
"options": {
"raw": {
"language": "json"
}
}
},
"url": {
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants",
"raw": "{{ISSUER_CS_URL}}/api/identity/v1alpha/participants",
"host": [
"{{ISSUER_ADMIN_URL}}"
"{{ISSUER_CS_URL}}"
],
"path": [
"api",
"admin",
"identity",
"v1alpha",
"participants"
]
Expand Down Expand Up @@ -1252,14 +1252,16 @@
}
},
"url": {
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/attestations",
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants/{{PARTICIPANT_CONTEXT_ID_BASE64}}/attestations",
"host": [
"{{ISSUER_ADMIN_URL}}"
],
"path": [
"api",
"admin",
"v1alpha",
"participants",
"{{PARTICIPANT_CONTEXT_ID_BASE64}}",
"attestations"
]
},
Expand All @@ -1274,22 +1276,24 @@
"header": [],
"body": {
"mode": "raw",
"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}",
"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}",
"options": {
"raw": {
"language": "json"
}
}
},
"url": {
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/credentialdefinitions",
"raw": "{{ISSUER_ADMIN_URL}}/api/admin/v1alpha/participants/{{PARTICIPANT_CONTEXT_ID_BASE64}}/credentialdefinitions",
"host": [
"{{ISSUER_ADMIN_URL}}"
],
"path": [
"api",
"admin",
"v1alpha",
"participants",
"{{PARTICIPANT_CONTEXT_ID_BASE64}}",
"credentialdefinitions"
]
},
Expand Down
2 changes: 1 addition & 1 deletion mxd/seed_data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

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