Add EnrollmentUrl to Did document #203

Izzzu · 2022-07-15T08:29:33Z

co-author: algattik

What this PR changes/adds

Include Registration service enrollment api endpoint in Dataspace Authority DID document.

Why it does that

The Enrollment API url should be resolved from the Dataspace DID. A subsequent PR will implement that.

Further notes

Example DID: https://mvd144dataspacedid.z16.web.core.windows.net/.well-known/did.json

Also:

Corrected some variable names "DID URL" into "DID URI"
Simplified Terraform outputs by having the "/authority" registration service URL prefix contained in the output registration service URL

Linked Issue(s)

Linked to #43

Checklist

added appropriate tests?
performed checkstyle check locally?
added/updated copyright headers?
documented public classes/methods?
added/updated relevant documentation?
added relevant details to the changelog? (skip with label no-changelog)
formatted title correctly?

deployment/terraform/dataspace/main.tf

Co-authored-by: Peeyush Chandel <555114+cpeeyush@users.noreply.github.com>

Use the new reg service cli from branch Use the new reg service cli from branch Update edc Update reg service version

This reverts commit 322d03c.

* Use Registration Service CLI to onboard participants (#154) * . * . * . * . * . * . * . * . * . * PR comments * Update cd.yaml * adapted CLI call in VerifyLocalTests * Update register-participants.sh * Update register-participants.sh * Fixed DID URLs for docker-compose * Adapted for upstream changes * Update JWT_AUDIENCE to localhost due to docker hosts and registration script differences * Revert "Update JWT_AUDIENCE to localhost due to docker hosts and registration script differences" This reverts commit ad83173. * use docker for cli tools Use docker for cli tools add execute permission explicitly * Simplified scripts * Update doc to reflect cli-tools changes * Update version number * use latest reg service Co-authored-by: Peeyush Chandel <555114+cpeeyush@users.noreply.github.com>

…-did

…rollment-url-in-did

This reverts commit c8b0b9e.

cpeeyush · 2022-07-28T15:18:21Z

deployment/terraform/dataspace/main.tf

@@ -86,7 +86,7 @@ resource "azurerm_container_group" "registration-service" {

    environment_variables = {
      EDC_CONNECTOR_NAME      = local.connector_name
-      JWT_AUDIENCE            = "${local.registration_service_url}${local.registration_service_path_prefix}"
+      JWT_AUDIENCE            = local.registration_service_url


we also need to modify it for local setup ?

MinimumViableDataspace/system-tests/docker-compose.yml

Line 144 in 3ec52c9

JWT_AUDIENCE: http://registration-service:8184/authority

or we plan to do it in subsequent PR ?

No update needed, the URL still has /authority in it. We just assemble it differently in TF

.github/workflows/deploy.yaml

Izzzu

@algattik approving

cpeeyush

Approved with suggestion

add enrollment url to did

2a2e012

Izzzu force-pushed the feature/43/43-enrollment-url-in-did branch 2 times, most recently from f100e89 to f1cfebe Compare July 18, 2022 14:45

test - deploy only did

bee7c1c

Izzzu force-pushed the feature/43/43-enrollment-url-in-did branch from f1cfebe to bee7c1c Compare July 19, 2022 08:05

Izzzu added 2 commits July 20, 2022 10:04

uncomment

1c6a2bd

uncomment

fd197d6

Izzzu marked this pull request as ready for review July 20, 2022 08:07

cpeeyush self-requested a review July 20, 2022 08:35

chrislomonico self-requested a review July 20, 2022 08:40

cpeeyush reviewed Jul 20, 2022

View reviewed changes

deployment/terraform/dataspace/main.tf Outdated Show resolved Hide resolved

cpeeyush reviewed Jul 20, 2022

View reviewed changes

deployment/terraform/dataspace/main.tf Outdated Show resolved Hide resolved

cpeeyush reviewed Jul 20, 2022

View reviewed changes

deployment/terraform/dataspace/main.tf Outdated Show resolved Hide resolved

Izzzu and others added 2 commits July 20, 2022 19:46

Update deployment/terraform/dataspace/main.tf

8031ef0

Co-authored-by: Peeyush Chandel <555114+cpeeyush@users.noreply.github.com>

changes after review

1bf056c

Izzzu force-pushed the feature/43/43-enrollment-url-in-did branch from 3f56177 to 1bf056c Compare July 20, 2022 18:49

Izzzu added 2 commits July 20, 2022 21:49

revert

2efdac8

Changes after review

15c5ef3

Izzzu marked this pull request as draft July 21, 2022 09:24

Use the new reg service cli from branch

322d03c

Use the new reg service cli from branch Use the new reg service cli from branch Update edc Update reg service version

Izzzu force-pushed the feature/43/43-enrollment-url-in-did branch from 3ee535f to 7a98883 Compare July 21, 2022 13:08

Revert "Use the new reg service cli from branch"

fd3bf7e

This reverts commit 322d03c.

Izzzu force-pushed the feature/43/43-enrollment-url-in-did branch from 7a98883 to fd3bf7e Compare July 21, 2022 13:31

Izzzu marked this pull request as ready for review July 21, 2022 13:32

Izzzu marked this pull request as draft July 21, 2022 14:51

algattik changed the base branch from feature/43-enrollment-url-in-did to feature/14-rs-jws July 27, 2022 16:06

Merge branch 'feature/14-rs-jws' into feature/43/43-enrollment-url-in…

e7cf15e

…-did

algattik force-pushed the feature/43/43-enrollment-url-in-did branch from 66c99c6 to e7cf15e Compare July 27, 2022 17:33

Simplified use of registration_service_url

f5add88

algattik changed the title ~~Add EnrollmentUrl to Did document~~ Add EnrollmentUrl to Did document [TODO: update target branch] Jul 28, 2022

Update main.tf

f94669f

algattik force-pushed the feature/43/43-enrollment-url-in-did branch from 4f1d09b to f94669f Compare July 28, 2022 04:28

algattik changed the base branch from feature/14-rs-jws to feature/43-enrollment-url-in-did July 28, 2022 06:44

algattik changed the title ~~Add EnrollmentUrl to Did document [TODO: update target branch]~~ Add EnrollmentUrl to Did document [REQUIRES UPSTREAM #31] Jul 28, 2022

Merge branch 'feature/43-enrollment-url-in-did' into feature/43/43-en…

99b3b69

…rollment-url-in-did

algattik changed the title ~~Add EnrollmentUrl to Did document [REQUIRES UPSTREAM #31]~~ Add EnrollmentUrl to Did document Jul 28, 2022

algattik added 2 commits July 28, 2022 16:40

Update cloud-cd.yaml

c8b0b9e

Revert "Update cloud-cd.yaml"

3ec52c9

This reverts commit c8b0b9e.

algattik marked this pull request as ready for review July 28, 2022 15:09

algattik requested a review from paullatzelsperger as a code owner July 28, 2022 15:09

algattik requested review from cpeeyush and removed request for chrislomonico and paullatzelsperger July 28, 2022 15:09

cpeeyush reviewed Jul 28, 2022

View reviewed changes

.github/workflows/deploy.yaml Show resolved Hide resolved

cpeeyush reviewed Jul 28, 2022

View reviewed changes

.github/workflows/deploy.yaml Show resolved Hide resolved

Izzzu commented Jul 29, 2022

View reviewed changes

cpeeyush approved these changes Jul 29, 2022

View reviewed changes

marcgs approved these changes Jul 29, 2022

View reviewed changes

algattik merged commit dd2d445 into feature/43-enrollment-url-in-did Jul 29, 2022

marcgs pushed a commit that referenced this pull request Aug 2, 2022

Add EnrollmentUrl to Did document (#203)

018af93

Izzzu deleted the feature/43/43-enrollment-url-in-did branch August 16, 2022 11:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add EnrollmentUrl to Did document #203

Add EnrollmentUrl to Did document #203

Izzzu commented Jul 15, 2022 •

edited by algattik

Loading

cpeeyush Jul 28, 2022 •

edited

Loading

algattik Jul 29, 2022

Izzzu left a comment •

edited

Loading

cpeeyush left a comment

Add EnrollmentUrl to Did document #203

Add EnrollmentUrl to Did document #203

Conversation

Izzzu commented Jul 15, 2022 • edited by algattik Loading

What this PR changes/adds

Why it does that

Further notes

Linked Issue(s)

Checklist

cpeeyush Jul 28, 2022 • edited Loading

Choose a reason for hiding this comment

algattik Jul 29, 2022

Choose a reason for hiding this comment

Izzzu left a comment • edited Loading

Choose a reason for hiding this comment

cpeeyush left a comment

Choose a reason for hiding this comment

Izzzu commented Jul 15, 2022 •

edited by algattik

Loading

cpeeyush Jul 28, 2022 •

edited

Loading

Izzzu left a comment •

edited

Loading