Skip to content

Commit

Permalink
feat(impl):[#568] remove bpdm lookup
Browse files Browse the repository at this point in the history
  • Loading branch information
ds-ext-kmassalski committed May 1, 2024
1 parent e3767c4 commit 74495fe
Show file tree
Hide file tree
Showing 40 changed files with 50 additions and 1,174 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,11 @@ data:
discovery:
client-id: ${DISCOVERY_OAUTH2_CLIENT_ID} # taken from secret ENV
client-secret: ${DISCOVERY_OAUTH2_CLIENT_SECRET} # taken from secret ENV
bpdm:
client-id: ${BPDM_OAUTH2_CLIENT_ID} # taken from secret ENV
client-secret: ${BPDM_OAUTH2_CLIENT_SECRET} # taken from secret ENV
provider:
semantics:
token-uri: {{ tpl (.Values.oauth2.clientTokenUri | default "http://localhost") . | quote }}
discovery:
token-uri: {{ tpl (.Values.oauth2.clientTokenUri | default "http://localhost") . | quote }}
bpdm:
token-uri: {{ tpl (.Values.oauth2.clientTokenUri | default "http://localhost") . | quote }}
digitalTwinRegistry:
descriptorEndpoint: {{ tpl (.Values.digitalTwinRegistry.descriptorEndpoint | default "") . | quote }}
Expand All @@ -94,10 +89,6 @@ data:
localModelDirectory: /app/semantic-models
{{- end }}
bpdm:
oAuthClientId: {{ .Values.bpdm.oAuthClientId | default "bpdm" }}
bpnEndpoint: {{ tpl (.Values.bpdm.bpnEndpoint | default "") . | quote }}
irs-edc-client:
callback:
mapping: {{ .Values.edc.callbackMapping | default "/internal/endpoint-data-reference" | quote }}
Expand Down
10 changes: 0 additions & 10 deletions charts/item-relationship-service/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,6 @@ spec:
secretKeyRef:
name: {{ template "irs.secretName" . }}
key: discoveryClientSecret
- name: BPDM_OAUTH2_CLIENT_ID
valueFrom:
secretKeyRef:
name: {{ template "irs.secretName" . }}
key: bpdmClientId
- name: BPDM_OAUTH2_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: {{ template "irs.secretName" . }}
key: bpdmClientSecret
- name: EDC_API_KEY_SECRET
valueFrom:
secretKeyRef:
Expand Down
2 changes: 0 additions & 2 deletions charts/item-relationship-service/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ data:
semanticsSecret: {{ .Values.oauth2.semantics.clientSecret | default "semanticsSecret" | b64enc | quote }}
discoveryClientId: {{ .Values.oauth2.discovery.clientId | default "discoveryClientId" | b64enc | quote }}
discoveryClientSecret: {{ .Values.oauth2.discovery.clientSecret | default "discoveryClientSecret" | b64enc | quote }}
bpdmClientId: {{ .Values.oauth2.bpdm.clientId | default "bpdmClientId" | b64enc | quote }}
bpdmClientSecret: {{ .Values.oauth2.bpdm.clientSecret | default "bpdmClientSecret" | b64enc | quote }}
edcApiSecret: {{ .Values.edc.controlplane.apikey.secret | toString | default "" | b64enc | quote }}
{{- if .Values.grafana.enabled }}
grafanaUser: {{ .Values.grafana.user | default "grafana" | b64enc | quote }}
Expand Down
10 changes: 0 additions & 10 deletions charts/item-relationship-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,6 @@ semanticshub:
# Map of Base64 encoded strings of semantic models. The key must be the Base64 encoded full URN of the model.
# Example for urn:bamm:io.catenax.serial_part:1.0.0#SerialPart:
# dXJuOmJhbW06aW8uY2F0ZW5heC5zZXJpYWxfcGFydDoxLjAuMCNTZXJpYWxQYXJ0: {
	"$schema": "http://json-schema.org/draft-04/schema",
	"description": "A serialized part is an instantiation of a (design-) part, where the particular instantiation can be uniquely identified by means of a serial number or a similar identifier (e.g. VAN) or a combination of multiple identifiers (e.g. combination of manufacturer, date and number)",
	"type": "object",
	"components": {
		"schemas": {
			"urn_bamm_io.catenax.serial_part_1.0.0_CatenaXIdTrait": {
				"type": "string",
				"description": "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI.",
				"pattern": "(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)"
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_KeyCharacteristic": {
				"type": "string",
				"description": "The key characteristic of a local identifier. A specific subset of keys is predefined, but additionally any other custom key is allowed. Predefined keys (to be used when applicable):\n- \"manufacturerId\" - The Business Partner Number (BPN) of the manufacturer. Value: BPN-Nummer\n- \"partInstanceId\" - The identifier of the manufacturer for the serialized instance of the part, e.g. the serial number\n- \"batchId\" - The identifier of the batch, to which the serialzed part belongs\n- \"van\" - The anonymized vehicle identification number (VIN). Value: anonymized VIN according to OEM anonymization rules. Note: If the key \"van\" is available, \"partInstanceId\" must also be available and hold the identical value."
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_ValueCharacteristic": {
				"type": "string",
				"description": "The value of an identifier."
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_KeyValueList": {
				"description": "A list of key value pairs for local identifiers, which are composed of a key and a corresponding value.",
				"type": "object",
				"properties": {
					"key": {
						"description": "The key of a local identifier. ",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_KeyCharacteristic"
					},
					"value": {
						"description": "The value of an identifier.",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_ValueCharacteristic"
					}
				},
				"required": [
					"key",
					"value"
				]
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_LocalIdentifierCharacteristic": {
				"description": "A single serialized part may have multiple attributes, that uniquely identify a that part in a specific dataspace (e.g. the manufacturer`s dataspace)",
				"type": "array",
				"items": {
					"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_KeyValueList"
				},
				"uniqueItems": true
			},
			"urn_bamm_io.openmanufacturing_characteristic_2.0.0_Timestamp": {
				"type": "string",
				"pattern": "-?([1-9][0-9]{3,}|0[0-9]{3})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9](\\.[0-9]+)?|(24:00:00(\\.0+)?))(Z|(\\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00))?",
				"description": "Describes a Property which contains the date and time with an optional timezone."
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_ProductionCountryCodeTrait": {
				"type": "string",
				"description": "Regular Expression that ensures a three-letter code ",
				"pattern": "^[A-Z][A-Z][A-Z]$"
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_ManufacturingCharacteristic": {
				"description": "Characteristic to describe manufacturing related data",
				"type": "object",
				"properties": {
					"date": {
						"description": "Timestamp of the manufacturing date as the final step in production process (e.g. final quality check, ready-for-shipment event)",
						"$ref": "#/components/schemas/urn_bamm_io.openmanufacturing_characteristic_2.0.0_Timestamp"
					},
					"country": {
						"description": "Country code where the part was manufactured",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_ProductionCountryCodeTrait"
					}
				},
				"required": [
					"date"
				]
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_PartIdCharacteristic": {
				"type": "string",
				"description": "The part ID is a multi-character string, ususally assigned by an ERP system"
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_PartNameCharacteristic": {
				"type": "string",
				"description": "Part Name in string format from the respective system in the value chain"
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_ClassificationCharacteristic": {
				"type": "string",
				"description": "A part type must be placed into one of the following classes: 'component', 'product', 'software', 'assembly', 'tool', or 'raw material'.",
				"enum": [
					"product",
					"raw material",
					"software",
					"assembly",
					"tool",
					"component"
				]
			},
			"urn_bamm_io.catenax.serial_part_1.0.0_PartTypeInformationCharacteristic": {
				"description": "The characteristics of the part type",
				"type": "object",
				"properties": {
					"manufacturerPartId": {
						"description": "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part (as designed) in the manufacturer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number.",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_PartIdCharacteristic"
					},
					"customerPartId": {
						"description": "Part ID as assigned by the manufacturer of the part. The Part ID identifies the part (as designed) in the customer`s dataspace. The Part ID does not reference a specific instance of a part and thus should not be confused with the serial number.",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_PartIdCharacteristic"
					},
					"nameAtManufacturer": {
						"description": "Name of the part as assigned by the manufacturer",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_PartNameCharacteristic"
					},
					"nameAtCustomer": {
						"description": "Name of the part as assigned by the customer",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_PartNameCharacteristic"
					},
					"classification": {
						"description": "The classification of the part type according to STEP standard definition",
						"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_ClassificationCharacteristic"
					}
				},
				"required": [
					"manufacturerPartId",
					"nameAtManufacturer",
					"classification"
				]
			}
		}
	},
	"properties": {
		"catenaXId": {
			"description": "The fully anonymous Catena-X ID of the serialized part, valid for the Catena-X dataspace.",
			"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_CatenaXIdTrait"
		},
		"localIdentifiers": {
			"description": "A local identifier enables identification of a part in a specific dataspace, but is not unique in Catena-X dataspace. Multiple local identifiers may exist.",
			"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_LocalIdentifierCharacteristic"
		},
		"manufacturingInformation": {
			"description": "Information from manufacturing process, such as manufacturing date and manufacturing country",
			"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_ManufacturingCharacteristic"
		},
		"partTypeInformation": {
			"description": "The part type from which the serialized part has been instantiated",
			"$ref": "#/components/schemas/urn_bamm_io.catenax.serial_part_1.0.0_PartTypeInformationCharacteristic"
		}
	},
	"required": [
		"catenaXId",
		"localIdentifiers",
		"manufacturingInformation",
		"partTypeInformation"
	]
}
bpdm:
url: # https://<bpdm-url>
oAuthClientId: bpdm
bpnEndpoint: >-
{{- if .Values.bpdm.url }}
{{- tpl (.Values.bpdm.url | default "") . }}/api/catena/legal-entities/{partnerId}?idType={idType}
{{- end }}
minioUser: "minio" # <minio-username>
minioPassword: # <minio-password>
minioUrl: "http://{{ .Release.Name }}-minio:9000"
Expand All @@ -166,9 +159,6 @@ oauth2:
discovery:
clientId: # <discovery-client-id>
clientSecret: # <discovery-client-secret>
bpdm:
clientId: # <bpdm-client-id>
clientSecret: # <bpdm-client-secret>
edc:
controlplane:
endpoint:
Expand Down
4 changes: 2 additions & 2 deletions docs/src/api/irs-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2344,8 +2344,6 @@ components:
- DigitalTwinRequest
- SchemaValidation
- SchemaRequest
- BpdmRequest
- BpdmValidation
- UsagePolicyValidation
- EssValidation
retryCounter:
Expand Down Expand Up @@ -2481,6 +2479,7 @@ components:
maxItems: 2147483647
lookupBPNs:
type: boolean
deprecated: true
description: Flag to specify whether BPNs should be collected and resolved
via the configured BPDM URL. Default is false.
timeout:
Expand Down Expand Up @@ -2646,6 +2645,7 @@ components:
$ref: '#/components/schemas/PartChainIdentificationKey'
lookupBPNs:
type: boolean
deprecated: true
description: Flag to specify whether BPNs should be collected and resolved
via the configured BPDM URL. Default is false.
required:
Expand Down
9 changes: 0 additions & 9 deletions docs/src/docs/administration/configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ The URL of the Discovery Finder. The IRS uses this service to discover EDC to a
==== <semantics-hub-url>
The URL of the SemanticsHub. The IRS uses this service to fetch aspect schemas for payload validation.
==== <bpdm-url>
The URL of the BPDM service. The IRS uses this service to fetch business partner information based on BPNs.
==== <oauth2-token-uri>
The URL of the OAuth2 token API. Used by the IRS for token creation to authenticate with other services.
Expand Down Expand Up @@ -168,12 +165,6 @@ Dataspace Discovery client ID for OAuth2 provider. Request this from your OAuth
=== <discovery-client-secret>
Dataspace Discovery client secret for OAuth2 provider. Request this from your OAuth2 operator.
=== <bpdm-client-id>
BPDM client ID for OAuth2 provider. Request this from your OAuth2 operator.
=== <bpdm-client-secret>
BPDM client secret for OAuth2 provider. Request this from your OAuth2 operator.
=== <minio-username>
Login username for Minio. To be defined by you.
Expand Down
20 changes: 7 additions & 13 deletions docs/src/docs/arc42/building-block-view/whitebox-overall.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ include::../../../uml-diagrams/building-block-view/whitebox_overall_decentral.pu

|Semantic Hub
|Semantic Hub provides information about semantic models in a specific version. This also includes JSON schemas, which IRS uses to validate the payload received by data providers.

|BPDM
|The Business Partner Data Management (BPDM) Service is used by the IRS to access shared business partner data for BPNs of Data Providers along the supply chain.
|===


Expand Down Expand Up @@ -83,30 +80,27 @@ include::../../../uml-diagrams/building-block-view/whitebox_overall_decentral.pu
| IRS uses *Semantic Hub* to validate of *SubmodelAspects* payloads agains the schema provided in *Semantic Hub*

| 11
| In case "lookupBPNs" is active IRS provides a lookup of company for given BPN

| 12
| *EDC* is connected to *Managed Identity Wallet* for access policy check for data offers

| 13
| 12
| *EDC* communication covering negotiation and data consumption

| 14
| 13
| *EDC* is connected to *Managed Identity Wallet* for access policy check for data offers

| 15
| 14
| *IRS* accessing to *SubmodelServer* on Tier Level using the *EDC*

| 16
| 15
| *IRS* accessing the *decentral DigitalTwinRegistry* on Tier Level using the *EDC*

| 17
| 16
| In case of the use-case Environmental and Social Standards, *IRS* sends notifications to the *IRS-ESS* instance running at the data provider using the *EDC*.

| 18
| 17
| *IRS* uses the Policy Store to load the usage policies stored for BPNLs in order to check the usage policies during the consumption of the data assets.

| 19
| 18
| IrsApiConsumer calls the IRS public /policy *API*
|===

Expand Down
4 changes: 0 additions & 4 deletions docs/src/docs/arc42/cross-cutting/under-the-hood.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@ The IRS caches data provided externally to avoid unnecessary requests and reduce

Caching is implemented for the following services:

=== BPDM

Whenever a BPN is resolved via BPDM, the partner name is cached on IRS side, as this data does not change.

=== Semantics Hub

Whenever a semantic model schema is requested from the Semantic Hub, it is stored locally until the cache is evicted (configurable).
Expand Down
2 changes: 0 additions & 2 deletions docs/src/docs/security/security-assessment.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ System_Ext(EDC-DS, "EDC Discovery Service")
System_Ext(DF, "Discovery Finder")
System_Ext(DTR, "Digital Twin Registry")
System_Ext(OAuth2, "OAuth2")
System_Ext(BPDM, "BPDM")
System_Ext(SH, "Semantic Hub")
System_Ext(V, "Vault")
Expand Down Expand Up @@ -47,7 +46,6 @@ Rel(IRS-App, EDC-DS, "Find decentral DTs, https, access token")
Rel(IRS-App, DF, "Get EDC Discovery Service URL, https, access token")
Rel(IRS-App, DTR, "https, access token")
Rel(IRS-App, OAuth2, "https, clientID, clientSecret, Get tokens to access DTR")
Rel(IRS-App, BPDM, "https, access token, Get BPN")
Rel(IRS-App, SH, "Get schemas to validate response from EDC, https, access token")
Rel(DAPS, EDC, "")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ package [**CatenaX-Network**] as network {
component [**EDC Discovery Service**] <<System>> as edc_discovery
component [**Discovery Finder**] <<System>> as discovery_finder
component [**Semantic Hub**] <<System>> as semantic_hub
component [**BPDM**] <<System>> as bpdm
}

package [**N-Tier**] <<CatenaX Data Provider Company>> as provider {
Expand All @@ -59,22 +58,20 @@ IRS <..> edc_discovery : **[08]**

IRS <..> discovery_finder : **[09]**
IRS <..> semantic_hub : **[10]**
IRS <..> bpdm : **[11]**
EDC <..> miw : **[12]**
EDC <..> EDCProvider : **[13]**
EDC <..> EDCProviderOEM : **[13]**
EDC <..> miw : **[11]**
EDC <..> EDCProvider : **[12]**
EDC <..> EDCProviderOEM : **[12]**

miw <..> EDCProvider : **[14]**
EDCProvider <--> SubmodelServer : **[15]**
EDCProvider <--> DT_REG : **[16]**
EDCProvider <-> EssProvider : **[17]**
miw <..> EDCProvider : **[13]**
EDCProvider <--> SubmodelServer : **[14]**
EDCProvider <--> DT_REG : **[15]**
EDCProvider <-> EssProvider : **[16]**

IRS <...> policy_store : **[18]**
IrsApiConsumer -r(0- policy_store : **[19]**
IRS <...> policy_store : **[17]**
IrsApiConsumer -r(0- policy_store : **[18]**

miw -[hidden]d- IAM_IRS
miw -[hidden]r- discovery_finder
discovery_finder -[hidden]d- edc_discovery
bpdm -[hidden]d- semantic_hub

@enduml
Loading

0 comments on commit 74495fe

Please sign in to comment.