diff --git a/README.md b/README.md index 0da16e1..bc95722 100644 --- a/README.md +++ b/README.md @@ -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` | — | diff --git a/gradle.properties b/gradle.properties index c8d2e03..a875e62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,5 +12,5 @@ # # group=org.eclipse.edc -version=0.17.0-SNAPSHOT +version=0.18.0-SNAPSHOT jadVersion=0.0.2-SNAPSHOT diff --git a/k8s/apps/edc/identityhub.yaml b/k8s/apps/edc/identityhub.yaml index fc2329f..54bc039 100644 --- a/k8s/apps/edc/identityhub.yaml +++ b/k8s/apps/edc/identityhub.yaml @@ -129,7 +129,7 @@ spec: urlRewrite: path: type: ReplacePrefixMatch - replacePrefixMatch: /api/identity/v1alpha + replacePrefixMatch: /api/identity/v1beta - type: ExtensionRef extensionRef: group: traefik.io diff --git a/k8s/apps/edc/issuerservice-seed-job.yaml b/k8s/apps/edc/issuerservice-seed-job.yaml index 77353db..5493f6a 100644 --- a/k8s/apps/edc/issuerservice-seed-job.yaml +++ b/k8s/apps/edc/issuerservice-seed-job.yaml @@ -171,7 +171,7 @@ 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 '{ @@ -179,7 +179,7 @@ spec: "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" } ], @@ -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 '{ @@ -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 '{ @@ -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 '{ @@ -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 '{ diff --git a/k8s/apps/edc/issuerservice.yaml b/k8s/apps/edc/issuerservice.yaml index 0f8c935..d952623 100644 --- a/k8s/apps/edc/issuerservice.yaml +++ b/k8s/apps/edc/issuerservice.yaml @@ -128,7 +128,7 @@ spec: urlRewrite: path: type: ReplacePrefixMatch - replacePrefixMatch: /api/admin/v1alpha + replacePrefixMatch: /api/admin/v1beta - type: ExtensionRef extensionRef: group: traefik.io diff --git a/openapi/identity-api.yaml b/openapi/identity-api.yaml index 45f4299..df540cd 100644 --- a/openapi/identity-api.yaml +++ b/openapi/identity-api.yaml @@ -14,7 +14,7 @@ security: - read - write paths: - /v1alpha/credentials: + /v1beta/credentials: get: tags: - Verifiable Credentials @@ -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 @@ -119,7 +119,7 @@ paths: type: array items: $ref: "#/components/schemas/ApiErrorDetail" - /v1alpha/participants/{participantContextId}: + /v1beta/participants/{participantContextId}: get: tags: - Participant Context @@ -165,7 +165,7 @@ paths: type: array items: $ref: "#/components/schemas/ApiErrorDetail" - /v1alpha/dids: + /v1beta/dids: get: tags: - DID @@ -217,7 +217,7 @@ paths: type: array items: $ref: "#/components/schemas/ApiErrorDetail" - /v1alpha/participants/{participantContextId}/credentials: + /v1beta/participants/{participantContextId}/credentials: get: tags: - Verifiable Credentials @@ -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 @@ -314,7 +314,7 @@ paths: type: array items: $ref: "#/components/schemas/ApiErrorDetail" - /v1alpha/keypairs: + /v1beta/keypairs: get: tags: - Key Pairs @@ -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 @@ -405,7 +405,7 @@ paths: type: array items: $ref: "#/components/schemas/ApiErrorDetail" - /v1alpha/participants/{participantContextId}/keypairs: + /v1beta/participants/{participantContextId}/keypairs: get: tags: - Key Pairs @@ -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 @@ -562,7 +562,7 @@ paths: type: array items: $ref: "#/components/schemas/ApiErrorDetail" - /v1alpha/participants: + /v1beta/participants: get: tags: - Participant Context @@ -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 @@ -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 diff --git a/openapi/issuer-admin-api.yaml b/openapi/issuer-admin-api.yaml index b484383..3862727 100644 --- a/openapi/issuer-admin-api.yaml +++ b/openapi/issuer-admin-api.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/tests/end2end/src/test/resources/create_participant_issuerservice.json b/tests/end2end/src/test/resources/create_participant_issuerservice.json index 39e366c..825adb7 100644 --- a/tests/end2end/src/test/resources/create_participant_issuerservice.json +++ b/tests/end2end/src/test/resources/create_participant_issuerservice.json @@ -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" } ],