Skip to content
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

chore: URL modification #172

Merged
merged 4 commits into from
Jun 6, 2024
Merged

chore: URL modification #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7b3848
removed urls
adkumar1 May 31, 2024
9b267a3
removed url details
adkumar1 May 31, 2024
8538d90
Update README.md
adkumar1 May 31, 2024
723766f
replace URLs
adkumar1 Jun 3, 2024
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
22 changes: 11 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ server:
include-message: always
keycloak:
resource:
clientid: Cl2-CX-Portal
clientid: <CLIENTID>
spring:
jackson:
default-property-inclusion: non_null
Expand All @@ -160,7 +160,7 @@ spring:
oauth2:
resourceserver:
jwt:
#jwk-set-uri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/certs
#jwk-set-uri: https://<example.com>/auth/realms/<REALM>/protocol/openid-connect/certs
springdoc:
api-docs:
enabled: true
Expand All @@ -171,19 +171,19 @@ app:
version: ^project.version^
verifiableCredentials:
durationDays: 90
schema2210Url: https://github.com/catenax-ng/tx-sd-factory/raw/main/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld
schema2210Url: <SCHEMA2210URL>
usersDetails:
custodianWallet:
#uri: https://managed-identity-wallets.int.demo.catena-x.net/api
#serverUrl: https://centralidp.int.demo.catena-x.net/auth
#realm: CX-Central
#clientId: sa-cl5-custodian-1
#uri: https://<example.com>/api
#serverUrl: https://<example.com>/auth
#realm: <REALM>
#clientId: <CLIENTID>
#clientSecret:
clearingHouse:
#uri: https://dummy.dev.demo.catena-x.net/api/credentials
#serverUrl: https://centralidp.int.demo.catena-x.net/auth
#realm: CX-Central
#clientId: sa-cl2-02
#uri: https://<example.com>/api/credentials
#serverUrl: https://<example.com>/auth
#realm: <REALM>
#clientId: <CLIENTID>
#clientSecret:
security:
createRole: add_self_descriptions
Expand Down
2 changes: 1 addition & 1 deletion docs/ARC42.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ Here the flow of Self-Description creation is shown:

In Catena-X we use [ARGO-CD](https://confluence.catena-x.net/display/ARTI/ArgoCD+deployment+tool) for deployment

[README.md](https://github.com/catenax-ng/tx-sd-factory/blob/main/README.md) describe the deployment process
[README.md](https://github.com/eclipse-tractusx/sd-factory/blob/main/README.md) describe the deployment process

## Quality Requirements

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spring:
oauth2:
resourceserver:
jwt:
#jwk-set-uri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/certs
#jwk-set-uri: https://centralidp.example.com/auth/realms/CX-Central/protocol/openid-connect/certs
springdoc:
api-docs:
enabled: true
Expand All @@ -50,8 +50,8 @@ app:
gaia-x-service-schema: https://gaia-x.gitlab.io/gaia-x-community/gaia-x-self-descriptions/service/ontology.json
usersDetails:
clearingHouse:
#uri: https://validation.dev.dih-cloud.com/api/v1/compliance
#auth-server-url: https://iam.dev.dih-cloud.com//auth
#uri: https://validation.example.com/api/v1/compliance
#auth-server-url: https://iam.example.com//auth
#realm: notarisation
#clientId: CARLA-GXDCH
#clientSecret:
Expand Down
32 changes: 16 additions & 16 deletions src/main/resources/static/SDFactoryApi-v22.10.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ paths:
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://github.com/catenax-ng/tx-sd-factory/raw/1.0.6-converter/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld",
"https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials/sd-document-v2210.jsonld"
"https://w3id.org/vc/status-list/2021/v1"
],
"type": [
Expand Down Expand Up @@ -254,11 +254,11 @@ paths:
"id": "did:sov:2xcjN7LjnHGaPdZbbGqju5"
},
"credentialStatus": {
"id": "https://managed-identity-wallets.int.demo.catena-x.net/api/credentials/status/7338ff60-dc18-47e2-9021-029e7db70bb2#12",
"id": "https://managed-identity-wallets.example.com/api/credentials/status/7338ff60-dc18-47e2-9021-029e7db70bb2#12",
"type": "StatusList2021Entry",
"statusPurpose": "revocation",
"statusListIndex": "12",
"statusListCredential": "https://managed-identity-wallets.int.demo.catena-x.net/api/credentials/status/7338ff60-dc18-47e2-9021-029e7db70bb2"
"statusListCredential": "https://managed-identity-wallets.example.com/api/credentials/status/7338ff60-dc18-47e2-9021-029e7db70bb2"
},
"proof": {
"type": "Ed25519Signature2018",
Expand All @@ -274,7 +274,7 @@ paths:
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://github.com/catenax-ng/tx-sd-factory/raw/all-versions/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld",
"https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials/sd-document-v2210.jsonld"
"https://w3id.org/vc/status-list/2021/v1"
],
"type": [
Expand Down Expand Up @@ -332,11 +332,11 @@ paths:
"id": "BPNL000000000000"
},
"credentialStatus": {
"id": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#54",
"id": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#54",
"type": "StatusList2021Entry",
"statusPurpose": "revocation",
"statusListIndex": "54",
"statusListCredential": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
"statusListCredential": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
},
"proof": {
"type": "Ed25519Signature2018",
Expand All @@ -352,7 +352,7 @@ paths:
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://github.com/catenax-ng/tx-sd-factory/raw/all-versions/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld",
"https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials/sd-document-v2210.jsonld"
"https://w3id.org/vc/status-list/2021/v1"
],
"type": [
Expand Down Expand Up @@ -401,11 +401,11 @@ paths:
"id": "did:sov:AmTGK5u8HdFgzidzTxM9B8"
},
"credentialStatus": {
"id": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#56",
"id": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#56",
"type": "StatusList2021Entry",
"statusPurpose": "revocation",
"statusListIndex": "56",
"statusListCredential": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
"statusListCredential": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
},
"proof": {
"type": "Ed25519Signature2018",
Expand All @@ -421,7 +421,7 @@ paths:
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://github.com/catenax-ng/tx-sd-factory/raw/all-versions/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld",
"https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials/sd-document-v2210.jsonld"
"https://w3id.org/vc/status-list/2021/v1"
],
"type": [
Expand Down Expand Up @@ -454,11 +454,11 @@ paths:
"id": "did:sov:AmTGK5u8HdFgzidzTxM9B8"
},
"credentialStatus": {
"id": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#57",
"id": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#57",
"type": "StatusList2021Entry",
"statusPurpose": "revocation",
"statusListIndex": "57",
"statusListCredential": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
"statusListCredential": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
},
"proof": {
"type": "Ed25519Signature2018",
Expand All @@ -474,7 +474,7 @@ paths:
{
"@context": [
"https://www.w3.org/2018/credentials/v1",
"https://github.com/catenax-ng/tx-sd-factory/raw/all-versions/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld",
"https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials/sd-document-v2210.jsonld"
"https://w3id.org/vc/status-list/2021/v1"
],
"type": [
Expand Down Expand Up @@ -553,11 +553,11 @@ paths:
"id": "BPNL000000000000"
},
"credentialStatus": {
"id": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#58",
"id": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92#58",
"type": "StatusList2021Entry",
"statusPurpose": "revocation",
"statusListIndex": "58",
"statusListCredential": "https://managed-identity-wallets.beta.demo.catena-x.net/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
"statusListCredential": "https://managed-identity-wallets.example.com/api/credentials/status/6351c222-3e5f-4650-a9aa-5188bf973c92"
},
"proof": {
"type": "Ed25519Signature2018",
Expand Down Expand Up @@ -967,4 +967,4 @@ components:
type: string
format: uri
security:
- bearerAuth: [] # use the same name as above
- bearerAuth: [] # use the same name as above
22 changes: 11 additions & 11 deletions src/test/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ server:
include-message: always
keycloak:
resource:
clientid: Cl2-CX-Portal
clientid: <CLIENTID>
spring:
jackson:
default-property-inclusion: non_null
Expand All @@ -34,7 +34,7 @@ spring:
oauth2:
resourceserver:
jwt:
jwk-set-uri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/certs
jwk-set-uri: https://<centalidp.example.com>/auth/realms/<REALM>/protocol/openid-connect/certs
springdoc:
api-docs:
enabled: true
Expand All @@ -45,23 +45,23 @@ app:
version: ^project.version^
verifiableCredentials:
durationDays: 90
schema2210Url: https://github.com/catenax-ng/tx-sd-factory/raw/clearing-house/src/main/resources/verifiablecredentials.jsonld/sd-document-v22.10.jsonld
schema2210Url: https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials/sd-document-v2210.jsonld
gaia-x-participant-schema: https://registry.lab.gaia-x.eu/development/api/trusted-schemas-registry/v2/schemas
gaia-x-service-schema: https://gaia-x.gitlab.io/gaia-x-community/gaia-x-self-descriptions/service/ontology.json
catena-x-schema: https://github.com/catenax-ng/tx-sd-factory/raw/clearing-house/src/main/resources/verifiablecredentials.jsonld/catenax.jsonld
catena-x-schema: https://github.com/eclipse-tractusx/sd-factory/blob/main/src/main/resources/verifiablecredentials.jsonld/catenax.jsonld
usersDetails:
custodianWallet:
uri: https://managed-identity-wallets.int.demo.catena-x.net/api
serverUrl: https://centralidp.int.demo.catena-x.net/auth
uri: https://<miw.example.com>/api
serverUrl: https://<centralidp.example.com>/auth
realm: CX-Central
clientId: sa-cl5-custodian-1
clientSecret: secret
clearingHouse:
uri: http://ch.dev.demo.catena-x.net/api
serverUrl: https://centralidp.int.demo.catena-x.net/auth
realm: CX-Central
clientId: sa-cl2-02
clientSecret: secret
uri: http://<ch.example.com>/api
serverUrl: https://<centralidp.example.com/auth
realm: <REALM>
clientId: <CLIENTID>
clientSecret: <CLIENTSECRET>
security:
createRole: add_self_descriptions
logging:
Expand Down