From edcd8dae5bb1cd8dc4dc3d9ba6f783bee6989e2a Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Wed, 24 Jul 2024 15:13:25 +0300 Subject: [PATCH 1/3] chore: prepare release --- CHANGELOG.md | 53 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd863ca60..15ba7f037 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,32 +9,69 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). ### Detailed Changes +#### Minor + +#### Patch + +#### Major Changes + +#### Minor Changes + +### Deployment Migration Notes + +#### Compatible Versions + +- Connector Backend Docker Images: + - Dev EDC: `ghcr.io/sovity/edc-dev:{{ VERSION }}` + - sovity EDC CE: `ghcr.io/sovity/edc-ce:{{ VERSION }}` + - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:{{ VERSION }}` + - Dev Catalog Crawler: `ghcr.io/sovity/catalog-crawler-dev:{{ VERSION }}` + - Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:{{ VERSION }}` +- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI VERSION }}` + +## [10.0.0] - 2024-07-24 + +### Overview + +MDS 2.2 release + +### Detailed Changes + #### Major Changes -- The `UiPolicy` model has been adjusted to support complex expressions including `AND`, `OR` and `XONE`. +- Complex policies using AND, OR and XONE: + - Complex policy support in the Connector UI. + - The `UiPolicy` model has been adjusted to support complex expressions including `AND`, `OR` and `XONE`. - The `createPolicyDefinition` has been marked as deprecated in favor of the new `createPolicyDefinitionV2` endpoint that supports complex policies. - Removed the recently rushed `createPolicyDefinitionUseCase` endpoint in favor of the new `createPolicyDefinitionV2` endpoint. #### Minor Changes +- Reworked data offer creation page for easier data sharing. - Both providers and consumers can now terminate their contracts. -- Added endpoints for checking ID availability for policies, assets and contract definitions +- Contracts can be filtered by their termination status. +- Improved "On Request" data offer support in the Connector UI. - The always-true policy is now created with no constraints instead of the artificial `ALWAYS_TRUE = TRUE` constraint - Existing always-true policy definitions are migrated to the new format - existing contract agreements are not affected #### Patch Changes +- Fixed an issue that caused the auth information to get lost during asset + creation. + ### Deployment Migration Notes +_No special migration notes required_ + #### Compatible Versions - Connector Backend Docker Images: - - Dev EDC: `ghcr.io/sovity/edc-dev:{{ VERSION }}` - - sovity EDC CE: `ghcr.io/sovity/edc-ce:{{ VERSION }}` - - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:{{ VERSION }}` - - Dev Catalog Crawler: `ghcr.io/sovity/catalog-crawler-dev:{{ VERSION }}` - - Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:{{ VERSION }}` -- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:{{ UI VERSION }}` + - Dev EDC: `ghcr.io/sovity/edc-dev:10.0.0` + - sovity EDC CE: `ghcr.io/sovity/edc-ce:10.0.0` + - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:10.0.0` + - Dev Catalog Crawler: `ghcr.io/sovity/catalog-crawler-dev:10.0.0` + - Catalog Crawler CE: `ghcr.io/sovity/catalog-crawler-ce:10.0.0` +- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:4.1.0` ## [9.0.0] - 2024-07-15 From 8e7a05d194a6f364d57ab1c4b96172369df54c58 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Wed, 24 Jul 2024 15:28:00 +0300 Subject: [PATCH 2/3] chore: fix ci --- .../src/test/java/de/sovity/edc/e2e/ContractTerminationTest.java | 1 - .../edc/e2e/common/AlwaysTruePolicyMigrationCommonTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/src/test/java/de/sovity/edc/e2e/ContractTerminationTest.java b/tests/src/test/java/de/sovity/edc/e2e/ContractTerminationTest.java index 4b71abef4..41944d5bf 100644 --- a/tests/src/test/java/de/sovity/edc/e2e/ContractTerminationTest.java +++ b/tests/src/test/java/de/sovity/edc/e2e/ContractTerminationTest.java @@ -54,7 +54,6 @@ import static java.time.Duration.ofSeconds; import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.DynamicTest.dynamicTest; diff --git a/tests/src/test/java/de/sovity/edc/e2e/common/AlwaysTruePolicyMigrationCommonTest.java b/tests/src/test/java/de/sovity/edc/e2e/common/AlwaysTruePolicyMigrationCommonTest.java index 46d487d6c..4180dcd0c 100644 --- a/tests/src/test/java/de/sovity/edc/e2e/common/AlwaysTruePolicyMigrationCommonTest.java +++ b/tests/src/test/java/de/sovity/edc/e2e/common/AlwaysTruePolicyMigrationCommonTest.java @@ -14,7 +14,6 @@ import java.util.Map; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE; public class AlwaysTruePolicyMigrationCommonTest { From 2ecf46b6bcf7fbaf003ade5b951b37e390bdae8b Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Wed, 24 Jul 2024 15:29:29 +0300 Subject: [PATCH 3/3] chore: fix ci --- .../edc/extension/postgresql/FlywayExecutionParams.java | 1 - .../ext/wrapper/api/common/mappers/PolicyMapperTest.java | 7 ------- .../de/sovity/edc/ext/wrapper/api/ui/UiResourceImpl.java | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/extensions/postgres-flyway-core/src/main/java/de/sovity/edc/extension/postgresql/FlywayExecutionParams.java b/extensions/postgres-flyway-core/src/main/java/de/sovity/edc/extension/postgresql/FlywayExecutionParams.java index f56da9d6b..540b0524c 100644 --- a/extensions/postgres-flyway-core/src/main/java/de/sovity/edc/extension/postgresql/FlywayExecutionParams.java +++ b/extensions/postgres-flyway-core/src/main/java/de/sovity/edc/extension/postgresql/FlywayExecutionParams.java @@ -15,7 +15,6 @@ package de.sovity.edc.extension.postgresql; import lombok.Builder; -import lombok.Singular; import lombok.Value; import lombok.With; diff --git a/extensions/wrapper/wrapper-common-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java b/extensions/wrapper/wrapper-common-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java index 7ef734cfe..adfcbbe2a 100644 --- a/extensions/wrapper/wrapper-common-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java +++ b/extensions/wrapper/wrapper-common-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java @@ -17,18 +17,12 @@ import de.sovity.edc.ext.wrapper.api.common.mappers.policy.ExpressionExtractor; import de.sovity.edc.ext.wrapper.api.common.mappers.policy.ExpressionMapper; import de.sovity.edc.ext.wrapper.api.common.mappers.policy.MappingErrors; -import de.sovity.edc.ext.wrapper.api.common.model.UiPolicyConstraint; -import de.sovity.edc.ext.wrapper.api.common.model.UiPolicyCreateRequest; import de.sovity.edc.ext.wrapper.api.common.model.UiPolicyExpression; import jakarta.json.Json; import jakarta.json.JsonObject; -import org.eclipse.edc.policy.model.AndConstraint; -import org.eclipse.edc.policy.model.AtomicConstraint; import org.eclipse.edc.policy.model.Constraint; -import org.eclipse.edc.policy.model.OrConstraint; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.policy.model.PolicyType; -import org.eclipse.edc.policy.model.XoneConstraint; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.transform.spi.TypeTransformerRegistry; import org.junit.jupiter.api.Test; @@ -37,7 +31,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResourceImpl.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResourceImpl.java index e43a992fd..ab856602f 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResourceImpl.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/UiResourceImpl.java @@ -14,8 +14,6 @@ package de.sovity.edc.ext.wrapper.api.ui; -import de.sovity.edc.ext.wrapper.api.ui.model.PolicyDefinitionCreateDto; -import de.sovity.edc.ext.wrapper.api.ui.model.PolicyDefinitionCreateRequest; import de.sovity.edc.ext.wrapper.api.common.model.UiAsset; import de.sovity.edc.ext.wrapper.api.common.model.UiAssetCreateRequest; import de.sovity.edc.ext.wrapper.api.common.model.UiAssetEditRequest; @@ -31,6 +29,8 @@ import de.sovity.edc.ext.wrapper.api.ui.model.IdResponseDto; import de.sovity.edc.ext.wrapper.api.ui.model.InitiateCustomTransferRequest; import de.sovity.edc.ext.wrapper.api.ui.model.InitiateTransferRequest; +import de.sovity.edc.ext.wrapper.api.ui.model.PolicyDefinitionCreateDto; +import de.sovity.edc.ext.wrapper.api.ui.model.PolicyDefinitionCreateRequest; import de.sovity.edc.ext.wrapper.api.ui.model.PolicyDefinitionPage; import de.sovity.edc.ext.wrapper.api.ui.model.TransferHistoryPage; import de.sovity.edc.ext.wrapper.api.ui.model.UiContractNegotiation;