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

Hotfix: fixed irs helm configuration and updated testdata #420

Merged
merged 3 commits into from
Oct 2, 2024
Merged

Hotfix: fixed irs helm configuration and updated testdata #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01d358a
chore(testdata): updated DPP testdata resources
saudkhan116 Sep 19, 2024
02d66ef
chore(helm): fixed irs configuration to irs helm chart
saudkhan116 Sep 23, 2024
d42a8c7
chore(trufflehog): fixed trufflehog version to the workflow
saudkhan116 Sep 26, 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
2 changes: 1 addition & 1 deletion .github/workflows/trufflehog.yaml → .github/workflows/trufflehog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:

- name: TruffleHog OSS
id: trufflehog
uses: trufflesecurity/trufflehog@main
uses: trufflesecurity/trufflehog@7e78ca385fb82c19568c7a4b341c97d57d9aa5e1
continue-on-error: true
with:
path: ./ # Scan the entire repository
Expand Down
32 changes: 19 additions & 13 deletions deployment/infrastructure/data-consumer/edc-consumer/values-int.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,19 +218,21 @@ item-relationship-service:
type: decentral
url: https://dpp-registry.int.catena-x.net/semantics/registry/api/v3

discovery:
oAuthClientId: discovery # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
discoveryFinderUrl: https://semantics.int.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search
semanticshub:
url: https://semantics.int.catena-x.net/hub/apimodels
oAuthClientId: semantics
bpdm:
url: https://partners-pool.int.catena-x.net
oAuthClientId: bpdm
bpnEndpoint: >-
{{- if .Values.bpdm.url }}
{{- tpl (.Values.bpdm.url | default "") . }}/api/catena/legal-entities/{partnerId}?idType={idType}
{{- end }}
discovery:
oAuthClientId: discovery # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
discoveryFinderUrl: https://semantics.int.catena-x.net/discoveryfinder/api/v1.0/administration/connectors/discovery/search

semanticshub:
url: https://semantics.int.catena-x.net/hub/apimodels
oAuthClientId: semantics

bpdm:
url: https://partners-pool.int.catena-x.net
oAuthClientId: bpdm
bpnEndpoint: >-
{{- if .Values.bpdm.url }}
{{- tpl (.Values.bpdm.url | default "") . }}/api/catena/legal-entities/{partnerId}?idType={idType}
{{- end }}

minioUser: <path:digital-product-pass/data/int/irs/minio#user>
minioPassword: <path:digital-product-pass/data/int/irs/minio#password>
Expand Down Expand Up @@ -314,6 +316,10 @@ item-relationship-service:
apikey:
header: "X-Api-Key"
secret: <path:digital-product-pass/data/int/edc/oauth#api.key>
submodel:
request-ttl: "PT10M"
urn-prefix: "/urn"
submodel-suffix: ""

minio:
serviceAccount:
Expand Down
16 changes: 10 additions & 6 deletions deployment/infrastructure/data-consumer/edc-consumer/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,12 +627,12 @@ item-relationship-service:
type: decentral
url: ""

discovery:
oAuthClientId: discovery # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
discoveryFinderUrl: ""
semanticshub:
url: ""
oAuthClientId: semantics
discovery:
oAuthClientId: discovery # ID of the OAuth2 client registration to use, see config spring.security.oauth2.client
discoveryFinderUrl: ""
semanticshub:
url: ""
oAuthClientId: semantics
bpdm:
url: ""
oAuthClientId: bpdm
Expand Down Expand Up @@ -708,6 +708,10 @@ item-relationship-service:
apikey:
header: "X-Api-Key"
secret: ""
submodel:
request-ttl: "PT10M"
urn-prefix: "/urn"
submodel-suffix: "/$value"

minio:
serviceAccount:
Expand Down
Loading
Loading