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.

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

feat: add SSI DIM Wallet Stub #125

Merged
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e55e6d5
chore: add SSI DIM Wallet Stub
CDiezRodriguez Oct 7, 2024
6bf3039
chore: Update Umbrella version
CDiezRodriguez Oct 11, 2024
b8360b9
chore: update deployment configuration
CDiezRodriguez Oct 14, 2024
ca78bcd
chore: Update Portal version from 2.0.0 to 2.2.0
CDiezRodriguez Oct 14, 2024
02d8d07
chore: update configuration to enable data exchange functionality
CDiezRodriguez Oct 21, 2024
165d265
chore: Add missing newline at end of files
CDiezRodriguez Oct 22, 2024
d5d6494
chore: requested changes
CDiezRodriguez Oct 22, 2024
bea21f2
chore: requested changes - 2
CDiezRodriguez Oct 22, 2024
021cf73
chore: requested changes - 3
CDiezRodriguez Oct 23, 2024
2db7b05
chore: fix indentation error
CDiezRodriguez Oct 23, 2024
f65ea73
chore: Update STUB version
CDiezRodriguez Oct 23, 2024
2642ac1
chore: requested changes - 4
CDiezRodriguez Oct 23, 2024
e3e85e8
chore: Organize structure and fix test
CDiezRodriguez Oct 24, 2024
3832cd0
chore: Lint errors - 1
CDiezRodriguez Oct 24, 2024
22f2990
chore: errors - 1
CDiezRodriguez Oct 24, 2024
f1437f5
chore: Lint errors - 2
CDiezRodriguez Oct 24, 2024
a396d4f
fix: adjust test configuration to utilize internal services for tx-da…
CDiezRodriguez Oct 25, 2024
7739673
fix: adjust test configuration to utilize internal services for tx-da…
CDiezRodriguez Oct 25, 2024
f479a9d
fix: adjust test configuration to utilize internal services for tx-da…
CDiezRodriguez Oct 25, 2024
d78367f
Merge branch 'main' into chore/ssi-dim-wallet-stub
CDiezRodriguez Oct 28, 2024
2dbc133
fix: correct merge
CDiezRodriguez Oct 28, 2024
c7a42af
chore: requested changes - 5
CDiezRodriguez Nov 4, 2024
8f1fa56
chore: remove redundant empty line
CDiezRodriguez Nov 4, 2024
d0c5b22
Merge branch 'main' into chore/ssi-dim-wallet-stub
CDiezRodriguez Nov 4, 2024
2022f90
chore: Fix Merge
CDiezRodriguez Nov 4, 2024
8baf474
fix: fix typo in iatp values after merge main
evegufy Nov 4, 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
12 changes: 10 additions & 2 deletions .github/workflows/helm-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,21 @@ jobs:
helm dep up charts/tx-data-provider
helm dep up charts/umbrella
helm install umbrella charts/umbrella --namespace data-exchange --create-namespace --debug --timeout 10m \
-f charts/values-test-data-exchange.yaml -f charts/values-test-iam-init-container.yaml \
-f charts/values-test-data-exchange.yaml
helm uninstall umbrella --namespace data-exchange

- name: Install chart for data exchange with iatp-mock (umbrella)
run: |
helm dep up charts/tx-data-provider
helm dep up charts/umbrella
helm install umbrella charts/umbrella --namespace data-exchange --create-namespace --debug --timeout 10m \
-f charts/values-test-data-exchange-iatp-mock.yaml -f charts/values-test-iam-init-container.yaml \
--set iatpmock.image.repository=kind-registry:5000/iatp-mock --set iatpmock.image.tag=testing
helm uninstall umbrella --namespace data-exchange

- name: Install chart for shared services one (umbrella)
run: |
helm install umbrella charts/umbrella -f charts/values-test-shared-services-1.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m --set iatpmock.image.repository=kind-registry:5000/iatp-mock --set iatpmock.image.tag=testing
helm install umbrella charts/umbrella -f charts/values-test-shared-services-1.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m
helm uninstall umbrella --namespace shared-services

- name: Install chart for shared services two (umbrella)
Expand Down
9 changes: 7 additions & 2 deletions charts/umbrella/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ sources:
- https://github.com/eclipse-tractusx/tractus-x-umbrella

type: application
version: 1.1.0
version: 1.1.1
CDiezRodriguez marked this conversation as resolved.
Show resolved Hide resolved

# when adding or updating versions of dependencies, also update list under README.md#Install
dependencies:
# portal
- condition: portal.enabled
name: portal
repository: https://eclipse-tractusx.github.io/charts/dev
version: 2.0.0
version: 2.2.0
# cx-iam
- condition: centralidp.enabled
name: centralidp
Expand Down Expand Up @@ -109,3 +109,8 @@ dependencies:
version: 0.1.0
repository: file://charts/iatpmock
condition: iatpmock.enabled
# ssi-dim-wallet-stub
- name: ssi-dim-wallet-stub
repository: https://eclipse-tractusx.github.io/charts/dev
version: 0.1.2
condition: ssi-dim-wallet-stub.enabled
9 changes: 9 additions & 0 deletions charts/umbrella/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ Collection of hosts to be added to the `/etc/hosts` (Linux and Mac) or the `C:\W
192.168.49.2 iatpmock.tx.test
192.168.49.2 business-partners.tx.test
192.168.49.2 pgadmin4.tx.test
192.168.49.2 ssi-dim-wallet-stub.tx.test
CDiezRodriguez marked this conversation as resolved.
Show resolved Hide resolved
```

Replace `192.168.49.2` with your `minikube ip` if it differs.
Expand Down Expand Up @@ -287,6 +288,7 @@ The currently available components are following:
- [bdrs](https://github.com/eclipse-tractusx/bpn-did-resolution-service/tree/0.0.4) (**in memory** - no persistance possible)
- [iatp-mock](https://github.com/eclipse-tractusx/tractus-x-umbrella/tree/main/charts/umbrella/charts/iatpmock/Chart.yaml)
- [bpdm](https://github.com/eclipse-tractusx/bpdm/tree/release/6.0.x)
- [ssi-dim-wallet-stub](https://github.com/eclipse-tractusx/ssi-dim-wallet-stub/releases/tag/ssi-dim-wallet-stub-0.1.2)

> :warning: **Note**
>
Expand Down Expand Up @@ -449,6 +451,12 @@ dataconsumerTwo:
helm upgrade -f values-adopter-data-exchange.yaml umbrella . --namespace umbrella
```

*iatp-mock Version*

```bash
helm install -f values-adopter-data-exchange-iatp-mock.yaml umbrella . --namespace umbrella --create-namespace
```

**Portal Subset**

```bash
Expand Down Expand Up @@ -587,6 +595,7 @@ Currently enabled ingresses:
- http://bdrs-server.tx.test
- http://iatpmock.tx.test
- http://pgadmin4.tx.test
- http://ssi-dim-wallet-stub.tx.test

### Database Access

Expand Down
245 changes: 245 additions & 0 deletions charts/umbrella/values-adopter-data-exchange-iatp-mock.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
# #############################################################################
# Copyright (c) 2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Apache License, Version 2.0 which is available at
# https://www.apache.org/licenses/LICENSE-2.0.
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# SPDX-License-Identifier: Apache-2.0
# #############################################################################
---

centralidp:
enabled: true


CDiezRodriguez marked this conversation as resolved.
Show resolved Hide resolved
iatpmock:
enabled: true
ingress:
enabled: true
hosts:
- host: iatpmock.tx.test
paths:
- path: /
pathType: ImplementationSpecific

bdrs-server-memory:
enabled: true
seeding:
bpnList:
- bpn: "BPNL00000003B3NX"
did: "did:web:mock-util-service/BPNL00000003B3NX"
- bpn: "BPNL00000003CSGV"
did: "did:web:mock-util-service/BPNL00000003CSGV"
- bpn: "BPNL00000003B6LU"
did: "did:web:mock-util-service/BPNL00000003B6LU"
- bpn: "BPNL00000003AXS3"
did: "did:web:mock-util-service/BPNL00000003AXS3"
- bpn: "BPNL00000003AZQP"
did: "did:web:mock-util-service/BPNL00000003AZQP"
- bpn: "BPNL00000003AWSS"
did: "did:web:mock-util-service/BPNL00000003AWSS"
- bpn: "BPNL00000003AYRE"
did: "did:web:mock-util-service/BPNL00000003AYRE"
- bpn: "BPNL00000003AVTH"
did: "did:web:mock-util-service/BPNL00000003AVTH"
- bpn: "BPNL00000000BJTL"
did: "did:web:mock-util-service/BPNL00000000BJTL"
- bpn: "BPNL00000003CML1"
did: "did:web:mock-util-service/BPNL00000003CML1"
- bpn: "BPNL00000003B2OM"
did: "did:web:mock-util-service/BPNL00000003B2OM"
- bpn: "BPNL00000003B0Q0"
did: "did:web:mock-util-service/BPNL00000003B0Q0"
- bpn: "BPNL00000003B5MJ"
did: "did:web:mock-util-service/BPNL00000003B5MJ"
- bpn: "BPNS0000000008ZZ"
did: "did:web:mock-util-service/BPNS0000000008ZZ"
- bpn: "BPNL00000003CNKC"
did: "did:web:mock-util-service/BPNL00000003CNKC"
- bpn: "BPNS00000008BDFH"
did: "did:web:mock-util-service/BPNS00000008BDFH"

hostname: &hostname bdrs-server.tx.test
server:
trustedIssuers:
- did:web:mock-util-service/trusted-issuer
ingresses:
- enabled: true
hostname: *hostname
endpoints:
- directory
- management
tls:
enabled: false

dataconsumerOne:
enabled: true
secrets:
edc-miw-keycloak-secret: UbfW4CR1xH4OskkovqJ2JzcwnQIrG7oj
tractusx-connector:
participant:
id: BPNL00000003AZQP
iatp:
id: did:web:mock-util-service/BPNL00000003AZQP
trustedIssuers:
- did:web:mock-util-service/trusted-issuer
sts:
dim:
url: http://mock-util-service/sts
oauth:
token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
client:
id: satest01
controlplane:
env:
TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
endpoints:
management:
authKey: TEST1
ingresses:
- enabled: true
hostname: "dataconsumer-1-controlplane.tx.test"
endpoints:
- default
- protocol
- management
tls:
enabled: false
dataplane:
env:
TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
ingresses:
- enabled: true
hostname: "dataconsumer-1-dataplane.tx.test"
endpoints:
- default
- public
tls:
enabled: false
# -- uncomment the following for persistence
# postgresql:
# primary:
# persistence:
# enabled: true

tx-data-provider:
seedTestdata: true
enabled: true
secrets:
edc-miw-keycloak-secret: pyFUZP2L9UCSVJUScHcN3ZEgy2PGyEpg
tractusx-connector:
participant:
id: BPNL00000003AYRE
iatp:
id: did:web:mock-util-service/BPNL00000003AYRE
trustedIssuers:
- did:web:mock-util-service/trusted-issuer
sts:
dim:
url: http://mock-util-service/sts
oauth:
token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
client:
id: satest02
controlplane:
env:
TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
endpoints:
management:
authKey: TEST2
ingresses:
- enabled: true
hostname: "dataprovider-controlplane.tx.test"
endpoints:
- default
- protocol
- management
tls:
enabled: false
dataplane:
env:
TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
ingresses:
- enabled: true
hostname: "dataprovider-dataplane.tx.test"
endpoints:
- default
- public
tls:
enabled: false
# -- uncomment the following for persistence
# postgresql:
# primary:
# persistence:
# enabled: true
# digital-twin-registry:
# postgresql:
# primary:
# persistence:
# enabled: true

dataconsumerTwo:
enabled: false
secrets:
edc-miw-keycloak-secret: tPwy4exxH1sXBRQouobSA2nNVaaPuwCs
tractusx-connector:
participant:
id: BPNL00000003AVTH
iatp:
id: did:web:mock-util-service/BPNL00000003AVTH
trustedIssuers:
- did:web:mock-util-service/trusted-issuer
sts:
dim:
url: http://mock-util-service/sts
oauth:
token_url: http://centralidp.tx.test/auth/realms/CX-Central/protocol/openid-connect/token
client:
id: satest03
controlplane:
env:
TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
endpoints:
management:
authKey: TEST3
ingresses:
- enabled: true
hostname: "dataconsumer-2-controlplane.tx.test"
endpoints:
- default
- protocol
- management
tls:
enabled: false
dataplane:
env:
TX_IAM_IATP_CREDENTIALSERVICE_URL: http://mock-util-service
ingresses:
- enabled: true
hostname: "dataconsumer-2-dataplane.tx.test"
endpoints:
- default
- public
tls:
enabled: false
# -- uncomment the following for persistence
# postgresql:
# primary:
# persistence:
# enabled: true

pgadmin4:
enabled: true
# -- uncomment the following for persistence
# persistentVolume:
# enabled: true
Loading