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

Chore/794 update testdata policy #811

Merged
merged 3 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 28 additions & 28 deletions COMPATIBILITY_MATRIX.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@ Full changelog of IRS: [changelog](CHANGELOG.md)

## [Unreleased]

| Dependency | Version | Helm | Comments |
|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-------|-----------------|
| EDC | 0.7.1 | 0.7.1 | |
| Semantics Hub | 0.3.1 | 0.2.1 | REST connection |
| DTR | 0.4.1 | 0.4.9 | REST connection |
| Discovery Finder | 0.2.5 | - | REST connection |
| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | |
| Helm | 3.9.3 | - | - |
| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - |
| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version |
| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version |
| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version |
| Dependency | Version | Helm | Comments |
|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|--------|-----------------|
| EDC | 0.7.3 | 0.7.3 | |
| Semantics Hub | 0.3.1 | 0.2.1 | REST connection |
| DTR | 0.4.3 | 0.4.11 | REST connection |
| Discovery Finder | 0.2.5 | - | REST connection |
| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | |
| Helm | 3.9.3 | - | - |
| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - |
| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version |
| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version |
| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version |

## [CATENA-X Release 24.08](https://eclipse-tractusx.github.io/CHANGELOG/) - [5.3.0](https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/5.3.0) - 2024-07-15

| Dependency | Version | Helm | Comments |
|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-------|-----------------|
| EDC | 0.7.1 | 0.7.1 | |
| Semantics Hub | 0.3.1 | 0.2.1 | REST connection |
| DTR | 0.4.1 | 0.4.9 | REST connection |
| Discovery Finder | 0.2.5 | - | REST connection |
| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | |
| Helm | 3.9.3 | - | - |
| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - |
| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version |
| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version |
| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version |
| Dependency | Version | Helm | Comments |
|------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|--------|-----------------|
| EDC | 0.7.3 | 0.7.3 | |
| Semantics Hub | 0.3.1 | 0.2.1 | REST connection |
| DTR | 0.4.3 | 0.4.11 | REST connection |
| Discovery Finder | 0.2.5 | - | REST connection |
| Minio | RELEASE.2022-11-11T03-44-20Z | 5.0.1 | |
| Helm | 3.9.3 | - | - |
| Kubernetes | [ 1.28; 1.29; 1.30 ] | - | - |
| [SingleLevelBomAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_built) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_planned) | [ 2.0.0; 3.0.0 ] | - | Model version |
| [SingleLevelBomAsSpecified](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_bom_as_specified) | 2.0.0 | - | Model version |
| [SingleLevelUsageAsBuilt](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_built) | 3.0.0 | - | Model version |
| [SingleLevelUsageAsPlanned](https://github.com/eclipse-tractusx/sldt-semantic-models/tree/main/io.catenax.single_level_usage_as_planned) | 2.0.0 | - | Model version |

## [5.2.0](https://github.com/eclipse-tractusx/item-relationship-service/releases/tag/5.2.0) - 2024-07-05

Expand Down
6 changes: 6 additions & 0 deletions charts/item-relationship-service/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [7.3.1] - 2024-07-16

### Changed

- Change default policy to include full namespace `https://w3id.org/catenax/policy/` instead of `cx-policy:`

## [7.3.0] - 2024-07-15

### Changed
Expand Down
2 changes: 1 addition & 1 deletion charts/item-relationship-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 7.3.0
version: 7.3.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
4 changes: 2 additions & 2 deletions charts/item-relationship-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ edc:
# IRS will only negotiate contracts for offers with a policy as defined in the allowedNames list.
# If a requested asset does not provide one of these policies, a tombstone will be created and this node will not be processed.
acceptedPolicies:
- leftOperand: "cx-policy:FrameworkAgreement"
- leftOperand: "https://w3id.org/catenax/policy/FrameworkAgreement"
operator: "eq"
rightOperand: "traceability:1.0"
- leftOperand: "cx-policy:UsagePurpose"
- leftOperand: "https://w3id.org/catenax/policy/UsagePurpose"
operator: "eq"
rightOperand: "cx.core.industrycore:1"
discoveryFinderClient:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
{
"odrl:action": "use",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:FrameworkAgreement",
"odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement",
"odrl:operator": {
"@id": "odrl:eq"
},
"odrl:rightOperand": "traceability:1.0"
},
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:UsagePurpose",
"odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose",
"odrl:operator": {
"@id": "odrl:eq"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
{
"odrl:action": "use",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:FrameworkAgreement",
"odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement",
"odrl:operator": {
"@id": "odrl:eq"
},
"odrl:rightOperand": "traceability:1.0"
},
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:UsagePurpose",
"odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose",
"odrl:operator": {
"@id": "odrl:eq"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
{
"odrl:action": "use",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:FrameworkAgreement",
"odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement",
"odrl:operator": {
"@id": "odrl:eq"
},
"odrl:rightOperand": "traceability:1.0"
},
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:UsagePurpose",
"odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose",
"odrl:operator": {
"@id": "odrl:eq"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
{
"odrl:action": "use",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:FrameworkAgreement",
"odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement",
"odrl:operator": {
"@id": "odrl:eq"
},
"odrl:rightOperand": "traceability:1.0"
},
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:UsagePurpose",
"odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose",
"odrl:operator": {
"@id": "odrl:eq"
},
Expand Down
7 changes: 2 additions & 5 deletions local/testing/testdata/CX_Testdata_v.1.7.0_PartType.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
{
"odrl:action": "use",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:FrameworkAgreement",
"odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement",
"odrl:operator": {
"@id": "odrl:eq"
},
"odrl:rightOperand": "traceability:1.0"
},
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:UsagePurpose",
"odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose",
"odrl:operator": {
"@id": "odrl:eq"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
{
"odrl:action": "use",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:FrameworkAgreement",
"odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement",
"odrl:operator": {
"@id": "odrl:eq"
},
"odrl:rightOperand": "traceability:1.0"
},
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:UsagePurpose",
"odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose",
"odrl:operator": {
"@id": "odrl:eq"
},
Expand Down
7 changes: 2 additions & 5 deletions local/testing/testdata/ESS_Testdata_v2.0.0-AsPlanned.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,16 @@
{
"odrl:action": "use",
"odrl:constraint": {
"@type": "AtomicConstraint",
"odrl:and": [
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:FrameworkAgreement",
"odrl:leftOperand": "https://w3id.org/catenax/policy/FrameworkAgreement",
"odrl:operator": {
"@id": "odrl:eq"
},
"odrl:rightOperand": "traceability:1.0"
},
{
"@type": "Constraint",
"odrl:leftOperand": "cx-policy:UsagePurpose",
"odrl:leftOperand": "https://w3id.org/catenax/policy/UsagePurpose",
"odrl:operator": {
"@id": "odrl:eq"
},
Expand Down
Loading