Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -428,9 +428,9 @@ unauthenticated at the gateway level.
| Service | Exposed path | Rewrites to | Backend port | Auth middleware |
|---------------------|---------------------|-------------------------|--------------|----------------------------------------|
| Control Plane | `/api/management` | `/api/mgmt` | `8081` | `jwt-auth-management-api` |
| Identity Hub | `/api/identity` | `/api/identity/v1alpha` | `7081` | `jwt-auth-identity-api` |
| Issuer Service | `/api/issuer/admin` | `/api/admin/v1alpha` | `10013` | `jwt-auth-issuer-admin-api` |
| Provision Manager | `/api/pm` | `/api/v1alpha` | `8080` | `jwt-auth-provision-manager-api` |
| Identity Hub | `/api/identity` | `/api/identity/v1beta` | `7081` | `jwt-auth-identity-api` |
| Issuer Service | `/api/issuer/admin` | `/api/admin/v1beta` | `10013` | `jwt-auth-issuer-admin-api` |
| Provision Manager | `/api/pm` | `/api/v1beta` | `8080` | `jwt-auth-provision-manager-api` |
| Tenant Manager | `/api/tm` | `/api/v1alpha1` | `8080` | `jwt-auth-tenant-manager-api` |
| Dataplane (public) | `/api/dp/public` | `/` | `11002` | — |
| Dataplane (control) | `/api/dp/control` | `/` | `8083` | — |
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
#
#
group=org.eclipse.edc
version=0.17.0-SNAPSHOT
version=0.18.0-SNAPSHOT
jadVersion=0.0.2-SNAPSHOT
2 changes: 1 addition & 1 deletion k8s/apps/edc/identityhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ spec:
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /api/identity/v1alpha
replacePrefixMatch: /api/identity/v1beta
- type: ExtensionRef
extensionRef:
group: traefik.io
Expand Down
12 changes: 6 additions & 6 deletions k8s/apps/edc/issuerservice-seed-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,15 @@ spec:
fi

# Create issuer tenant
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10015/api/identity/v1alpha/participants" \
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10015/api/identity/v1beta/participants" \
-H "Authorization: Bearer ${PROVISIONER_TOKEN}" \
-H "Content-Type: application/json" \
-d '{
"roles": ["admin"],
"serviceEndpoints": [
{
"type": "IssuerService",
"serviceEndpoint": "http://issuerservice.edc-v.svc.cluster.local:10012/api/issuance/v1alpha/participants/issuer",
"serviceEndpoint": "http://issuerservice.edc-v.svc.cluster.local:10012/api/issuance/v1beta/participants/issuer",
"id": "issuer-service-1"
}
],
Expand Down Expand Up @@ -241,7 +241,7 @@ spec:

# Create attestation definitions
echo "Creating Membership AttestationDefinition"
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1alpha/participants/issuer/attestations" \
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1beta/participants/issuer/attestations" \
-H "Authorization: Bearer ${ISSUER_TOKEN}" \
-H "Content-Type: application/json" \
-d '{
Expand All @@ -259,7 +259,7 @@ spec:
fi

echo "Creating Manufacturer AttestationDefinition"
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1alpha/participants/issuer/attestations" \
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1beta/participants/issuer/attestations" \
-H "Authorization: Bearer ${ISSUER_TOKEN}" \
-H "Content-Type: application/json" \
-d '{
Expand All @@ -283,7 +283,7 @@ spec:

# Create credential definitions
echo "Creating Membership CredentialDefinition"
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1alpha/participants/issuer/credentialdefinitions" \
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1beta/participants/issuer/credentialdefinitions" \
-H "Authorization: Bearer ${ISSUER_TOKEN}" \
-H "Content-Type: application/json" \
-d '{
Expand Down Expand Up @@ -328,7 +328,7 @@ spec:
fi

echo "Creating Manufacturer CredentialDefinition"
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1alpha/participants/issuer/credentialdefinitions" \
do_curl -X POST "http://issuerservice.edc-v.svc.cluster.local:10013/api/admin/v1beta/participants/issuer/credentialdefinitions" \
-H "Authorization: Bearer ${ISSUER_TOKEN}" \
-H "Content-Type: application/json" \
-d '{
Expand Down
2 changes: 1 addition & 1 deletion k8s/apps/edc/issuerservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
urlRewrite:
path:
type: ReplacePrefixMatch
replacePrefixMatch: /api/admin/v1alpha
replacePrefixMatch: /api/admin/v1beta
- type: ExtensionRef
extensionRef:
group: traefik.io
Expand Down
26 changes: 13 additions & 13 deletions openapi/identity-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ security:
- read
- write
paths:
/v1alpha/credentials:
/v1beta/credentials:
get:
tags:
- Verifiable Credentials
Expand Down Expand Up @@ -66,7 +66,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/credentials/request/{holderPid}:
/v1beta/participants/{participantContextId}/credentials/request/{holderPid}:
get:
tags:
- Verifiable Credentials
Expand Down Expand Up @@ -119,7 +119,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}:
/v1beta/participants/{participantContextId}:
get:
tags:
- Participant Context
Expand Down Expand Up @@ -165,7 +165,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/dids:
/v1beta/dids:
get:
tags:
- DID
Expand Down Expand Up @@ -217,7 +217,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/credentials:
/v1beta/participants/{participantContextId}/credentials:
get:
tags:
- Verifiable Credentials
Expand Down Expand Up @@ -264,7 +264,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/credentials/request:
/v1beta/participants/{participantContextId}/credentials/request:
post:
tags:
- Verifiable Credentials
Expand Down Expand Up @@ -314,7 +314,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/keypairs:
/v1beta/keypairs:
get:
tags:
- Key Pairs
Expand Down Expand Up @@ -366,7 +366,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/dids/state:
/v1beta/participants/{participantContextId}/dids/state:
post:
tags:
- DID
Expand Down Expand Up @@ -405,7 +405,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/keypairs:
/v1beta/participants/{participantContextId}/keypairs:
get:
tags:
- Key Pairs
Expand Down Expand Up @@ -509,7 +509,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/keypairs/{keyPairId}:
/v1beta/participants/{participantContextId}/keypairs/{keyPairId}:
get:
tags:
- Key Pairs
Expand Down Expand Up @@ -562,7 +562,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants:
/v1beta/participants:
get:
tags:
- Participant Context
Expand Down Expand Up @@ -614,7 +614,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/keypairs/{keyPairId}/revoke:
/v1beta/participants/{participantContextId}/keypairs/{keyPairId}/revoke:
post:
tags:
- Key Pairs
Expand Down Expand Up @@ -670,7 +670,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/keypairs/{keyPairId}/rotate:
/v1beta/participants/{participantContextId}/keypairs/{keyPairId}/rotate:
post:
tags:
- Key Pairs
Expand Down
16 changes: 8 additions & 8 deletions openapi/issuer-admin-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ security:
- read
- write
paths:
/v1alpha/participants/{participantContextId}/credentials/{credentialId}/status:
/v1beta/participants/{participantContextId}/credentials/{credentialId}/status:
get:
tags:
- Issuer Service Credentials Admin API
Expand Down Expand Up @@ -64,7 +64,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/holders/query:
/v1beta/participants/{participantContextId}/holders/query:
post:
tags:
- Issuer Service Holder Admin API
Expand Down Expand Up @@ -117,7 +117,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/holders/{holderId}:
/v1beta/participants/{participantContextId}/holders/{holderId}:
get:
tags:
- Issuer Service Holder Admin API
Expand Down Expand Up @@ -171,7 +171,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/credentialdefinitions/query:
/v1beta/participants/{participantContextId}/credentialdefinitions/query:
post:
tags:
- Issuer Service Credential Definition Admin API
Expand Down Expand Up @@ -216,7 +216,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/credentialdefinitions/{credentialDefinitionId}:
/v1beta/participants/{participantContextId}/credentialdefinitions/{credentialDefinitionId}:
get:
tags:
- Issuer Service Credential Definition Admin API
Expand Down Expand Up @@ -269,7 +269,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/credentials/query:
/v1beta/participants/{participantContextId}/credentials/query:
post:
tags:
- Issuer Service Credentials Admin API
Expand Down Expand Up @@ -315,7 +315,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/issuanceprocesses/query:
/v1beta/participants/{participantContextId}/issuanceprocesses/query:
post:
tags:
- Issuer Service Issuance Process Admin API
Expand Down Expand Up @@ -360,7 +360,7 @@ paths:
type: array
items:
$ref: "#/components/schemas/ApiErrorDetail"
/v1alpha/participants/{participantContextId}/issuanceprocesses/{issuanceProcessId}:
/v1beta/participants/{participantContextId}/issuanceprocesses/{issuanceProcessId}:
get:
tags:
- Issuer Service Issuance Process Admin API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"serviceEndpoints": [
{
"type": "IssuerService",
"serviceEndpoint": "http://issuerservice.edc-v.svc.cluster.local:10012/api/issuance/v1alpha/participants/issuer",
"serviceEndpoint": "http://issuerservice.edc-v.svc.cluster.local:10012/api/issuance/v1beta/participants/issuer",
"id": "issuer-service-1"
}
],
Expand Down
Loading