From d156ff1814d250438e14006586324cf117f99df1 Mon Sep 17 00:00:00 2001 From: Denis Neuling Date: Mon, 23 May 2022 10:37:03 +0200 Subject: [PATCH] Release version 0.0.3 (#155) --- CHANGELOG.md | 6 +- deployment/helm/edc-controlplane/Chart.yaml | 4 +- deployment/helm/edc-controlplane/values.yaml | 2 + deployment/helm/edc-dataplane/Chart.yaml | 4 +- edc | 2 +- edc-controlplane/README.md | 17 --- .../edc-controlplane-cosmosdb/README.md | 104 +++++++++--------- .../edc-controlplane-cosmosdb/pom.xml | 2 +- .../edc-controlplane-memory/pom.xml | 2 +- .../edc-controlplane-postgresql/pom.xml | 2 +- edc-controlplane/pom.xml | 2 +- edc-dataplane/pom.xml | 2 +- edc-extensions/aas-controller/pom.xml | 2 +- .../business-partner-validation/pom.xml | 2 +- edc-extensions/pom.xml | 2 +- edc-extensions/postgresql-migration/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 75 insertions(+), 84 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f7316b40..db6371e39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.0.3] - 2022-05-23 + ## [0.0.2] - 2022-05-20 ## [0.0.1] - 2022-05-13 -[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.0.2...HEAD +[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.0.3...HEAD + +[0.0.3]: https://github.com/catenax-ng/product-edc/compare/0.0.2...0.0.3 [0.0.2]: https://github.com/catenax-ng/product-edc/compare/0.0.1...0.0.2 diff --git a/deployment/helm/edc-controlplane/Chart.yaml b/deployment/helm/edc-controlplane/Chart.yaml index 6896a5e64..95772effe 100644 --- a/deployment/helm/edc-controlplane/Chart.yaml +++ b/deployment/helm/edc-controlplane/Chart.yaml @@ -5,6 +5,6 @@ description: >- EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-controlplane type: application -appVersion: "0.0.2" -version: 0.0.2 +appVersion: "0.0.3" +version: 0.0.3 maintainers: [] diff --git a/deployment/helm/edc-controlplane/values.yaml b/deployment/helm/edc-controlplane/values.yaml index 25f40018c..3be6dd27e 100644 --- a/deployment/helm/edc-controlplane/values.yaml +++ b/deployment/helm/edc-controlplane/values.yaml @@ -243,6 +243,7 @@ configuration: # edc.contractnegotiationstore.cosmos.container-name= # edc.contractnegotiationstore.cosmos.database-name= # edc.contractnegotiationstore.cosmos.preferred-region= + # edc.contractnegotiationstore.cosmos.allow.sproc.autoupload= # edc.controlplane.validation-endpoint= # edc.core.retry.backoff.max= # edc.core.retry.backoff.min= @@ -322,6 +323,7 @@ configuration: # edc.transfer-process-store.cosmos.account.name= # edc.transfer-process-store.cosmos.container-name= # edc.transfer-process-store.cosmos.preferred-region= + # edc.transfer-process-store.cosmos.allow.sproc.autoupload= # edc.transfer-process-store.database.name= # edc.transfer.state-machine.batch-size= # edc.vault= diff --git a/deployment/helm/edc-dataplane/Chart.yaml b/deployment/helm/edc-dataplane/Chart.yaml index 3c3ff8e38..17af89ecb 100644 --- a/deployment/helm/edc-dataplane/Chart.yaml +++ b/deployment/helm/edc-dataplane/Chart.yaml @@ -5,6 +5,6 @@ description: >- EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-dataplane type: application -appVersion: "0.0.2" -version: 0.0.2 +appVersion: "0.0.3" +version: 0.0.3 maintainers: [] diff --git a/edc b/edc index dc8ff6d56..acd02337a 160000 --- a/edc +++ b/edc @@ -1 +1 @@ -Subproject commit dc8ff6d5681e80db284b6fb5d418b131eae6af57 +Subproject commit acd02337a16d9498727bee12e49e715e9be960e3 diff --git a/edc-controlplane/README.md b/edc-controlplane/README.md index f1cf32338..9b5d4715f 100644 --- a/edc-controlplane/README.md +++ b/edc-controlplane/README.md @@ -494,23 +494,6 @@ __targetConnectorIdsPath=api/v1/ids __defaultApiPath=api __apiKey=X-Api-Key __apiKeyValue=pwd -__contractDefinitionId=1 -__policyId=1 -__assetId=1 - -__publicContractDefinition=" - { - \"id\": \"$__contractDefinitionId\", - \"accessPolicyId\": \"$__policyId\", - \"contractPolicyId\": \"$__policyId\", - \"criteria\": [ - { - \"left\": \"asset:prop:id\", - \"op\": \"=\", - \"right\": \"$__assetId\" - } - ] - }" # Call Control API curl -G -X GET $__connectorUrl/$__defaultApiPath/control/catalog --header "$__apiKey: $__apiKeyValue" --data-urlencode "provider=$__targetConnectorUrl/$__targetConnectorIdsPath/data" --header "Content-Type: application/json" -s | jq diff --git a/edc-controlplane/edc-controlplane-cosmosdb/README.md b/edc-controlplane/edc-controlplane-cosmosdb/README.md index 8c932d960..09c5dbef3 100644 --- a/edc-controlplane/edc-controlplane-cosmosdb/README.md +++ b/edc-controlplane/edc-controlplane-cosmosdb/README.md @@ -16,57 +16,59 @@ This secret must contain the primary or the secondard CosmosDB Read-write key. Listed below are configuration keys needed to get the `edc-controlplane-cosmosdb` up and running. Details regarding each configuration property can be found at the [documentary section of the EDC](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/tree/main/docs). -| Key | Required | Example | Description | -|--- |--- |--- |--- | -| web.http.default.port | X | 8080 | | -| web.http.default.path | X | /api | | -| web.http.data.port | X | 8181 | | -| web.http.data.path | X | | | -| web.http.validation.port | X | 8182 | | -| web.http.validation.path | X | /validation | | -| web.http.control.port | X | 9999 | | -| web.http.control.path | X | /api/controlplane/control | | -| web.http.ids.port | X | 8282 | | -| web.http.ids.path | X | /api/v1/ids | | -| edc.receiver.http.endpoint | X | http://backend-service | | -| edc.ids.title | | Eclipse Dataspace Connector | | -| edc.ids.description | | Eclipse Dataspace Connector | | -| edc.ids.id | | urn:connector:edc | | -| edc.ids.security.profile | | base | | -| edc.ids.endpoint | | http://localhost:8282/api/v1/ids | | -| edc.ids.maintainer | | http://localhost | | -| edc.ids.curator | | http://localhost | | -| edc.ids.catalog.id | | urn:catalog:default | | -| ids.webhook.address | | http://localhost:8282/api/v1/ids | | -| edc.api.control.auth.apikey.key | | X-Api-Key | | -| edc.api.control.auth.apikey.value | | super-strong-api-key | | -| edc.hostname | | localhost | | -| edc.oauth.token.url | X | https://daps.catena-x.net | | -| edc.oauth.public.key.alias | X | key-to-daps-certificate-in-keyvault | | -| edc.oauth.private.key.alias | X | key-to-private-key-in-keyvault | | -| edc.oauth.client.id | X | daps-oauth-client-id | | -| edc.vault.clientid | X | 00000000-1111-2222-3333-444444444444 | | -| edc.vault.tenantid | X | 55555555-6666-7777-8888-999999999999 | | -| edc.vault.name | X | my-vault-name | | -| edc.vault.clientsecret | X | 34-chars-secret | | -| edc.assetindex.cosmos.account-name | X | cosmosdb-assetindex-account-name | | -| edc.assetindex.cosmos.database-name | X | asset-index | | -| edc.assetindex.cosmos.preferred-region | X | westeurope | | -| edc.assetindex.cosmos.container-name | X | cosmosdb-assetindex-container-name | | -| edc.contractdefinitionstore.cosmos.account-name | X | cosmosdb-contractdefinitionstore-account-name | | -| edc.contractdefinitionstore.cosmos.database-name | X | contract-definition-store | | -| edc.contractdefinitionstore.cosmos.preferred-region | X | westeurope | | -| edc.contractdefinitionstore.cosmos.container-name | X | cosmosdb-contractdefinitionstore-container-name | | -| edc.contractnegotiationstore.cosmos.account-name | X | cosmosdb-contractnegotiationstore-account-name | | -| edc.contractnegotiationstore.cosmos.database-name | X | contract-negotiation-store | | -| edc.contractnegotiationstore.cosmos.preferred-region | X | westeurope | | -| edc.contractnegotiationstore.cosmos.container-name | X | cosmosdb-contractnegotiationstore-container-name | | -| edc.transfer-process-store.cosmos.account.name | X | cosmosdb-contractnegotiationstore-account-name | | -| edc.transfer-process-store.database.name | X | transfer-process-store | | -| edc.transfer-process-store.cosmos.preferred-region | X | westeurope | | -| edc.transfer-process-store.cosmos.container-name | X | cosmosdb-transfer-process-store-container-name | | -| edc.transfer.proxy.endpoint | X | | | -| edc.transfer.proxy.token.signer.privatekey.alias | X | | | +| Key | Required | Example | Description | +|--- |--- |--- |--- | +| web.http.default.port | X | 8080 | | +| web.http.default.path | X | /api | | +| web.http.data.port | X | 8181 | | +| web.http.data.path | X | /data | | +| web.http.validation.port | X | 8182 | | +| web.http.validation.path | X | /validation | | +| web.http.control.port | X | 9999 | | +| web.http.control.path | X | /api/controlplane/control | | +| web.http.ids.port | X | 8282 | | +| web.http.ids.path | X | /api/v1/ids | | +| edc.receiver.http.endpoint | X | http://backend-service | | +| edc.ids.title | | Eclipse Dataspace Connector | | +| edc.ids.description | | Eclipse Dataspace Connector | | +| edc.ids.id | | urn:connector:edc | | +| edc.ids.security.profile | | base | | +| edc.ids.endpoint | | http://localhost:8282/api/v1/ids | | +| edc.ids.maintainer | | http://localhost | | +| edc.ids.curator | | http://localhost | | +| edc.ids.catalog.id | | urn:catalog:default | | +| ids.webhook.address | | http://localhost:8282/api/v1/ids | | +| edc.api.control.auth.apikey.key | | X-Api-Key | | +| edc.api.control.auth.apikey.value | | super-strong-api-key | | +| edc.hostname | | localhost | | +| edc.oauth.token.url | X | https://daps.catena-x.net | | +| edc.oauth.public.key.alias | X | key-to-daps-certificate-in-keyvault | | +| edc.oauth.private.key.alias | X | key-to-private-key-in-keyvault | | +| edc.oauth.client.id | X | daps-oauth-client-id | | +| edc.vault.clientid | X | 00000000-1111-2222-3333-444444444444 | | +| edc.vault.tenantid | X | 55555555-6666-7777-8888-999999999999 | | +| edc.vault.name | X | my-vault-name | | +| edc.vault.clientsecret | X | 34-chars-secret | | +| edc.assetindex.cosmos.account-name | X | cosmosdb-assetindex-account-name | | +| edc.assetindex.cosmos.database-name | X | asset-index | | +| edc.assetindex.cosmos.preferred-region | X | westeurope | | +| edc.assetindex.cosmos.container-name | X | cosmosdb-assetindex-container-name | | +| edc.contractdefinitionstore.cosmos.account-name | X | cosmosdb-contractdefinitionstore-account-name | | +| edc.contractdefinitionstore.cosmos.database-name | X | contract-definition-store | | +| edc.contractdefinitionstore.cosmos.preferred-region | X | westeurope | | +| edc.contractdefinitionstore.cosmos.container-name | X | cosmosdb-contractdefinitionstore-container-name | | +| edc.contractnegotiationstore.cosmos.account-name | X | cosmosdb-contractnegotiationstore-account-name | | +| edc.contractnegotiationstore.cosmos.database-name | X | contract-negotiation-store | | +| edc.contractnegotiationstore.cosmos.preferred-region | X | westeurope | | +| edc.contractnegotiationstore.cosmos.container-name | X | cosmosdb-contractnegotiationstore-container-name | | +| edc.contractnegotiationstore.cosmos.allow.sproc.autoupload | | true | | +| edc.transfer-process-store.cosmos.account.name | X | cosmosdb-contractnegotiationstore-account-name | | +| edc.transfer-process-store.database.name | X | transfer-process-store | | +| edc.transfer-process-store.cosmos.preferred-region | X | westeurope | | +| edc.transfer-process-store.cosmos.container-name | X | cosmosdb-transfer-process-store-container-name | | +| edc.transfer-process-store.cosmos.allow.sproc.autoupload | | true | | +| edc.transfer.proxy.endpoint | X | http://dataplane-public-endpoint/public | | +| edc.transfer.proxy.token.signer.privatekey.alias | X | key-of-private-key-in-keyvault-to-sign-transfer-token | | #### Example configuration.properties diff --git a/edc-controlplane/edc-controlplane-cosmosdb/pom.xml b/edc-controlplane/edc-controlplane-cosmosdb/pom.xml index 7faedc745..bcc16eef8 100644 --- a/edc-controlplane/edc-controlplane-cosmosdb/pom.xml +++ b/edc-controlplane/edc-controlplane-cosmosdb/pom.xml @@ -16,7 +16,7 @@ net.catenax.edc edc-controlplane - 0.0.2 + 0.0.3 4.0.0 diff --git a/edc-controlplane/edc-controlplane-memory/pom.xml b/edc-controlplane/edc-controlplane-memory/pom.xml index 0f10692fb..3e74214d7 100644 --- a/edc-controlplane/edc-controlplane-memory/pom.xml +++ b/edc-controlplane/edc-controlplane-memory/pom.xml @@ -16,7 +16,7 @@ edc-controlplane net.catenax.edc - 0.0.2 + 0.0.3 4.0.0 diff --git a/edc-controlplane/edc-controlplane-postgresql/pom.xml b/edc-controlplane/edc-controlplane-postgresql/pom.xml index 65ec75b43..4bcf962f9 100644 --- a/edc-controlplane/edc-controlplane-postgresql/pom.xml +++ b/edc-controlplane/edc-controlplane-postgresql/pom.xml @@ -16,7 +16,7 @@ edc-controlplane net.catenax.edc - 0.0.2 + 0.0.3 4.0.0 diff --git a/edc-controlplane/pom.xml b/edc-controlplane/pom.xml index 8b4cc5d9e..efbb64af0 100644 --- a/edc-controlplane/pom.xml +++ b/edc-controlplane/pom.xml @@ -18,7 +18,7 @@ net.catenax.edc product-edc-parent - 0.0.2 + 0.0.3 edc-controlplane diff --git a/edc-dataplane/pom.xml b/edc-dataplane/pom.xml index d3ef6b593..46fa869e8 100644 --- a/edc-dataplane/pom.xml +++ b/edc-dataplane/pom.xml @@ -18,7 +18,7 @@ net.catenax.edc product-edc-parent - 0.0.2 + 0.0.3 edc-dataplane jar diff --git a/edc-extensions/aas-controller/pom.xml b/edc-extensions/aas-controller/pom.xml index 569b6b26f..e813b744e 100644 --- a/edc-extensions/aas-controller/pom.xml +++ b/edc-extensions/aas-controller/pom.xml @@ -18,7 +18,7 @@ net.catenax.edc.extensions edc-extensions - 0.0.2 + 0.0.3 aas-controller diff --git a/edc-extensions/business-partner-validation/pom.xml b/edc-extensions/business-partner-validation/pom.xml index 9c06babc2..54e2360f0 100644 --- a/edc-extensions/business-partner-validation/pom.xml +++ b/edc-extensions/business-partner-validation/pom.xml @@ -18,7 +18,7 @@ net.catenax.edc.extensions edc-extensions - 0.0.2 + 0.0.3 business-partner-validation jar diff --git a/edc-extensions/pom.xml b/edc-extensions/pom.xml index b1f92fbab..6c76c4177 100644 --- a/edc-extensions/pom.xml +++ b/edc-extensions/pom.xml @@ -18,7 +18,7 @@ net.catenax.edc product-edc-parent - 0.0.2 + 0.0.3 net.catenax.edc.extensions diff --git a/edc-extensions/postgresql-migration/pom.xml b/edc-extensions/postgresql-migration/pom.xml index 6be92f2be..e88c32560 100644 --- a/edc-extensions/postgresql-migration/pom.xml +++ b/edc-extensions/postgresql-migration/pom.xml @@ -16,7 +16,7 @@ edc-extensions net.catenax.edc.extensions - 0.0.2 + 0.0.3 4.0.0 diff --git a/pom.xml b/pom.xml index 50310bc89..841f9922d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ net.catenax.edc product-edc-parent - 0.0.2 + 0.0.3 pom