From f330bc0220063c89486061aa64dbb43896a5c2b2 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Fri, 28 Feb 2025 11:00:51 +0000 Subject: [PATCH 01/11] Fix e2e run tests action. --- .github/workflows/run-end2end-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/run-end2end-tests.yml b/.github/workflows/run-end2end-tests.yml index a50d33e7..c7678aed 100644 --- a/.github/workflows/run-end2end-tests.yml +++ b/.github/workflows/run-end2end-tests.yml @@ -68,6 +68,9 @@ jobs: run: |- kind load docker-image --name mxd data-service-api tx-identityhub tx-identityhub-sts tx-catalog-server tx-sts + - name: Setup Terraform + uses: hashicorp/setup-terraform@v2 + - name: "Terraform init" working-directory: mxd run: |- From ed236e698f62706cc2f301d7b578e47b3b8b0079 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Fri, 28 Feb 2025 11:03:53 +0000 Subject: [PATCH 02/11] Bump terraform init version for e2e run tests action. --- .github/workflows/run-end2end-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-end2end-tests.yml b/.github/workflows/run-end2end-tests.yml index c7678aed..353bd696 100644 --- a/.github/workflows/run-end2end-tests.yml +++ b/.github/workflows/run-end2end-tests.yml @@ -68,8 +68,8 @@ jobs: run: |- kind load docker-image --name mxd data-service-api tx-identityhub tx-identityhub-sts tx-catalog-server tx-sts - - name: Setup Terraform - uses: hashicorp/setup-terraform@v2 + - name: "Setup Terraform" + uses: hashicorp/setup-terraform@v3 - name: "Terraform init" working-directory: mxd From 5f330fcae1003f81907516f37e15e225dcf1a5e3 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Fri, 28 Feb 2025 11:50:31 +0000 Subject: [PATCH 03/11] Small file change --- .github/workflows/run-end2end-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-end2end-tests.yml b/.github/workflows/run-end2end-tests.yml index 353bd696..e8ddfdc2 100644 --- a/.github/workflows/run-end2end-tests.yml +++ b/.github/workflows/run-end2end-tests.yml @@ -97,4 +97,4 @@ jobs: - name: "Destroy the KinD cluster" run: >- - kind get clusters | xargs -n1 kind delete cluster --name \ No newline at end of file + kind get clusters | xargs -n1 kind delete cluster --name From 93ab0cba544487768b1eed68ba4fb9cc078c4e9c Mon Sep 17 00:00:00 2001 From: bmg13 Date: Mon, 3 Mar 2025 18:25:36 +0000 Subject: [PATCH 04/11] Add ih modules. --- mxd/seed_data.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxd/seed_data.tf b/mxd/seed_data.tf index d95f7d11..76091dc3 100644 --- a/mxd/seed_data.tf +++ b/mxd/seed_data.tf @@ -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-connector, module.alice-identityhub, module.bob-connector, module.bob-identityhub] metadata { name = "seed-connectors" namespace = kubernetes_namespace.mxd-ns.metadata.0.name From f8fc329e4c712624f921b3fa3314f7d38c5384aa Mon Sep 17 00:00:00 2001 From: bmg13 Date: Thu, 13 Mar 2025 17:05:20 +0000 Subject: [PATCH 05/11] Create correct images. --- .github/workflows/run-end2end-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-end2end-tests.yml b/.github/workflows/run-end2end-tests.yml index f4354695..c5589e88 100644 --- a/.github/workflows/run-end2end-tests.yml +++ b/.github/workflows/run-end2end-tests.yml @@ -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: "Setup Terraform" uses: hashicorp/setup-terraform@v3 From 318cbfede843a090deb0df187cb50a76afabd954 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Thu, 13 Mar 2025 17:12:11 +0000 Subject: [PATCH 06/11] Remove redundant step. --- .github/workflows/run-end2end-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/run-end2end-tests.yml b/.github/workflows/run-end2end-tests.yml index c5589e88..52125ef9 100644 --- a/.github/workflows/run-end2end-tests.yml +++ b/.github/workflows/run-end2end-tests.yml @@ -73,9 +73,6 @@ jobs: run: |- kind load docker-image --name mxd data-service-api tx-identityhub tx-catalog-server tx-issuerservice - - name: "Setup Terraform" - uses: hashicorp/setup-terraform@v3 - - name: "Terraform init" working-directory: ./mxd run: |- From 4775c02222e9e33c98afc2bbf725e676da257c17 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Tue, 18 Mar 2025 16:38:16 +0000 Subject: [PATCH 07/11] Fix ih config human name. --- mxd/modules/identity-hub/main.tf | 2 +- mxd/outputs.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mxd/modules/identity-hub/main.tf b/mxd/modules/identity-hub/main.tf index 97a8e90e..43d2646e 100644 --- a/mxd/modules/identity-hub/main.tf +++ b/mxd/modules/identity-hub/main.tf @@ -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 } diff --git a/mxd/outputs.tf b/mxd/outputs.tf index 521a9ce1..5c618bc5 100644 --- a/mxd/outputs.tf +++ b/mxd/outputs.tf @@ -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" { From 3d03e1d8fef7f1184d6c4b1e674788151dcb6a27 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Wed, 19 Mar 2025 17:34:44 +0000 Subject: [PATCH 08/11] Update edc version. --- mxd-runtimes/gradle/catalogserver.versions.toml | 2 +- mxd-runtimes/gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mxd-runtimes/gradle/catalogserver.versions.toml b/mxd-runtimes/gradle/catalogserver.versions.toml index 9cc4d423..9aaaa96a 100644 --- a/mxd-runtimes/gradle/catalogserver.versions.toml +++ b/mxd-runtimes/gradle/catalogserver.versions.toml @@ -2,7 +2,7 @@ format.version = "1.1" [versions] -edc = "0.12.0-SNAPSHOT" +edc = "0.12.0" tractusx = "0.8.0" postgres = "42.7.3" diff --git a/mxd-runtimes/gradle/libs.versions.toml b/mxd-runtimes/gradle/libs.versions.toml index 0ba129e5..d3ced0db 100644 --- a/mxd-runtimes/gradle/libs.versions.toml +++ b/mxd-runtimes/gradle/libs.versions.toml @@ -4,8 +4,8 @@ format.version = "1.1" [versions] awaitility = "4.2.2" assertj = "3.25.3" -edc = "0.12.0-SNAPSHOT" -ih = "0.12.0-SNAPSHOT" +edc = "0.12.0" +ih = "0.12.0" tractusx = "0.8.0" tractusx-issuer = "0.1.0-SNAPSHOT" commons = "2.11.0" From a63cf4897b37c37012abf808197a90c820c17e37 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Thu, 20 Mar 2025 10:27:34 +0000 Subject: [PATCH 09/11] Fix request params. --- mxd/postman/mxd-seed.json | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/mxd/postman/mxd-seed.json b/mxd/postman/mxd-seed.json index f5585dea..77980aad 100644 --- a/mxd/postman/mxd-seed.json +++ b/mxd/postman/mxd-seed.json @@ -17,7 +17,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -68,7 +68,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -119,7 +119,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -170,7 +170,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -221,7 +221,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -272,7 +272,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -323,7 +323,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new contract definition) or 409 Conflict (if contract deifinition already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -374,7 +374,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new contract definition) or 409 Conflict (if contract deifinition already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -450,7 +450,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -501,7 +501,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -552,7 +552,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -603,7 +603,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -654,7 +654,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new contract definition) or 409 Conflict (if contract deifinition already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", "});" ], "type": "text/javascript", @@ -885,7 +885,7 @@ "script": { "exec": [ "pm.test(\"Response status code is 200 or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([200, 404, 409]);", "});", "", "var jsonData = pm.response.json();", @@ -943,7 +943,7 @@ "script": { "exec": [ "pm.test(\"Response status code is 204 or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([204, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([204, 404, 409]);", "});" ], "type": "text/javascript", @@ -998,7 +998,7 @@ "script": { "exec": [ "pm.test(\"Response status code is 204 or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([204, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([204, 404, 409]);", "});" ], "type": "text/javascript", @@ -1179,7 +1179,7 @@ "participants" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" }, "response": [] }, @@ -1221,7 +1221,7 @@ "participants" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" }, "response": [] }, @@ -1263,7 +1263,7 @@ "attestations" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/attestations' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestationType\": \"demo\",\n \"configuration\": {\n },\n \"id\": \"demo-attestation-def-1\"\n}'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/attestations' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestationType\": \"demo\",\n \"configuration\": {\n },\n \"id\": \"demo-attestation-def-1\"\n}'" }, "response": [] }, @@ -1293,7 +1293,7 @@ "credentialdefinitions" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/credentialdefinitions' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestations\": [\n \"demo-attestation-def-1\"\n ],\n \"credentialType\": \"DemoCredential\",\n \"dataModel\": \"V_1_1\",\n \"id\": \"demo-credential-def-1\",\n \"jsonSchema\": \"\",\n \"jsonSchemaUrl\": \"https://example.com/schema/demo-credential.json\",\n \"mappings\": [\n {\n \"input\": \"name\",\n \"output\": \"credentialSubject.name\",\n \"required\": \"true\"\n }\n ],\n \"rules\": []\n }'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/credentialdefinitions' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestations\": [\n \"demo-attestation-def-1\"\n ],\n \"credentialType\": \"DemoCredential\",\n \"dataModel\": \"V_1_1\",\n \"id\": \"demo-credential-def-1\",\n \"jsonSchema\": \"\",\n \"jsonSchemaUrl\": \"https://example.com/schema/demo-credential.json\",\n \"mappings\": [\n {\n \"input\": \"name\",\n \"output\": \"credentialSubject.name\",\n \"required\": \"true\"\n }\n ],\n \"rules\": []\n }'" }, "response": [] } @@ -1331,7 +1331,7 @@ "packages": {}, "exec": [ "pm.test(\"Response status code is 20x or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200,201,204, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([200,201,204, 404, 409]);", "});" ] } From 9f2e6aae6c16576c58fe2c9b0c4701aeb0267ad3 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Thu, 20 Mar 2025 10:32:30 +0000 Subject: [PATCH 10/11] Update tractusx version --- mxd-runtimes/gradle/catalogserver.versions.toml | 2 +- mxd-runtimes/gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mxd-runtimes/gradle/catalogserver.versions.toml b/mxd-runtimes/gradle/catalogserver.versions.toml index 9aaaa96a..834b4935 100644 --- a/mxd-runtimes/gradle/catalogserver.versions.toml +++ b/mxd-runtimes/gradle/catalogserver.versions.toml @@ -3,7 +3,7 @@ format.version = "1.1" [versions] edc = "0.12.0" -tractusx = "0.8.0" +tractusx = "0.9.0" postgres = "42.7.3" [libraries] diff --git a/mxd-runtimes/gradle/libs.versions.toml b/mxd-runtimes/gradle/libs.versions.toml index d3ced0db..45c2b380 100644 --- a/mxd-runtimes/gradle/libs.versions.toml +++ b/mxd-runtimes/gradle/libs.versions.toml @@ -6,7 +6,7 @@ awaitility = "4.2.2" assertj = "3.25.3" edc = "0.12.0" ih = "0.12.0" -tractusx = "0.8.0" +tractusx = "0.9.0" tractusx-issuer = "0.1.0-SNAPSHOT" commons = "2.11.0" opentelemetry = "1.32.0" From 5f2c6a1b6abe384615c275abf3a84b806a3cc696 Mon Sep 17 00:00:00 2001 From: bmg13 Date: Thu, 20 Mar 2025 15:49:18 +0000 Subject: [PATCH 11/11] Fix request params. --- mxd/modules/connector/main.tf | 2 +- mxd/postman/mxd-seed.json | 74 ++++++++++++++++++----------------- mxd/seed_data.tf | 2 +- 3 files changed, 41 insertions(+), 37 deletions(-) diff --git a/mxd/modules/connector/main.tf b/mxd/modules/connector/main.tf index a8f179e0..869bd3a0 100644 --- a/mxd/modules/connector/main.tf +++ b/mxd/modules/connector/main.tf @@ -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"), diff --git a/mxd/postman/mxd-seed.json b/mxd/postman/mxd-seed.json index 77980aad..d729225e 100644 --- a/mxd/postman/mxd-seed.json +++ b/mxd/postman/mxd-seed.json @@ -17,7 +17,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -68,7 +68,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -119,7 +119,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -170,7 +170,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -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" @@ -221,7 +221,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -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" @@ -272,7 +272,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -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" @@ -323,7 +323,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new contract definition) or 409 Conflict (if contract deifinition already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -374,7 +374,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new contract definition) or 409 Conflict (if contract deifinition already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -450,7 +450,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -501,7 +501,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new asset) or 409 Conflict (if asset already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -552,7 +552,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -603,7 +603,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new policy) or 409 Conflict (if policy already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -654,7 +654,7 @@ "script": { "exec": [ "pm.test(\"Status code is 204 No Content (if new contract definition) or 409 Conflict (if contract deifinition already exists)\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 204, 404, 409])", + " pm.expect(pm.response.code).to.be.oneOf([200, 204, 409])", "});" ], "type": "text/javascript", @@ -885,7 +885,7 @@ "script": { "exec": [ "pm.test(\"Response status code is 200 or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200, 404, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([200, 409]);", "});", "", "var jsonData = pm.response.json();", @@ -943,7 +943,7 @@ "script": { "exec": [ "pm.test(\"Response status code is 204 or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([204, 404, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([204, 409]);", "});" ], "type": "text/javascript", @@ -998,7 +998,7 @@ "script": { "exec": [ "pm.test(\"Response status code is 204 or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([204, 404, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([204, 409]);", "});" ], "type": "text/javascript", @@ -1160,7 +1160,7 @@ "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" @@ -1168,18 +1168,18 @@ } }, "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" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" }, "response": [] }, @@ -1202,7 +1202,7 @@ "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" @@ -1210,18 +1210,18 @@ } }, "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" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/participants' \\\n-H 'Content-Type: application/json' \\\n-d '{ \"did\": \"did:web:localhost%3A7083\", \"participantId\": \"did:web:localhost%3A7083\", \"name\": \"Consumer Participant\"}'" }, "response": [] }, @@ -1252,7 +1252,7 @@ } }, "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}}" ], @@ -1260,10 +1260,12 @@ "api", "admin", "v1alpha", + "participants", + "{{PARTICIPANT_CONTEXT_ID_BASE64}}", "attestations" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/attestations' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestationType\": \"demo\",\n \"configuration\": {\n },\n \"id\": \"demo-attestation-def-1\"\n}'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/attestations' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestationType\": \"demo\",\n \"configuration\": {\n },\n \"id\": \"demo-attestation-def-1\"\n}'" }, "response": [] }, @@ -1274,7 +1276,7 @@ "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" @@ -1282,7 +1284,7 @@ } }, "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}}" ], @@ -1290,10 +1292,12 @@ "api", "admin", "v1alpha", + "participants", + "{{PARTICIPANT_CONTEXT_ID_BASE64}}", "credentialdefinitions" ] }, - "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10015/api/admin/v1alpha/credentialdefinitions' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestations\": [\n \"demo-attestation-def-1\"\n ],\n \"credentialType\": \"DemoCredential\",\n \"dataModel\": \"V_1_1\",\n \"id\": \"demo-credential-def-1\",\n \"jsonSchema\": \"\",\n \"jsonSchemaUrl\": \"https://example.com/schema/demo-credential.json\",\n \"mappings\": [\n {\n \"input\": \"name\",\n \"output\": \"credentialSubject.name\",\n \"required\": \"true\"\n }\n ],\n \"rules\": []\n }'" + "description": "Generated from cURL: curl -sL -X POST 'http://localhost:10013/api/admin/v1alpha/credentialdefinitions' \\\n-H 'Content-Type: application/json' \\\n-d '{\n \"attestations\": [\n \"demo-attestation-def-1\"\n ],\n \"credentialType\": \"DemoCredential\",\n \"dataModel\": \"V_1_1\",\n \"id\": \"demo-credential-def-1\",\n \"jsonSchema\": \"\",\n \"jsonSchemaUrl\": \"https://example.com/schema/demo-credential.json\",\n \"mappings\": [\n {\n \"input\": \"name\",\n \"output\": \"credentialSubject.name\",\n \"required\": \"true\"\n }\n ],\n \"rules\": []\n }'" }, "response": [] } @@ -1331,7 +1335,7 @@ "packages": {}, "exec": [ "pm.test(\"Response status code is 20x or 409\", function () {", - " pm.expect(pm.response.code).to.be.oneOf([200,201,204, 404, 409]);", + " pm.expect(pm.response.code).to.be.oneOf([200,201,204, 409]);", "});" ] } diff --git a/mxd/seed_data.tf b/mxd/seed_data.tf index fac5f78c..9fd79429 100644 --- a/mxd/seed_data.tf +++ b/mxd/seed_data.tf @@ -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.alice-identityhub, module.bob-connector, module.bob-identityhub] + depends_on = [module.alice-identityhub, module.bob-identityhub] metadata { name = "seed-connectors" namespace = kubernetes_namespace.mxd-ns.metadata.0.name