Skip to content
This repository was archived by the owner on Mar 31, 2022. It is now read-only.

Commit bb4fa0f

Browse files
fix: update artifact with auth headers (#690)
* chore: fixed bug while updating artifact * refactor: remove unused logger * refactor: remove imports * fix: close webserver * fix: suppress ssl verification warning * fix: remove unused imports * test: add update test * style: format files Co-authored-by: Brian-Frederik Jahnke <[email protected]> Co-authored-by: Brian-Frederik Jahnke <[email protected]>
1 parent 054d01d commit bb4fa0f

31 files changed

+100
-91
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
12
# Changelog
23
All notable changes to this project will be documented in this file.
34

4-
## [X.X.X] - XXXX-XX-XX
5+
## [6.5.0] - 2021-10-27
56

67
### Added
78
- New `application.properties` setting `configuration.force.reload` that forces reloading the configuration from the `config.json` instead of using the latest active configuration from the database. If not set, the default value is `false`.
@@ -13,6 +14,8 @@ All notable changes to this project will be documented in this file.
1314
### Fixed
1415
- Only create agreements from contract offers with valid start and end date.
1516
- Check if agreement has expired before returning data.
17+
- Fix `TransientObjectException` while updating an artifact.
18+
- Add default constructor to `ApiKey` class, to avoid `InstantiationException`.
1619

1720
## [6.4.0] - 2021-10-21
1821

charts/dataspace-connector/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.2.6
19+
version: 0.2.7
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to
2323
# follow Semantic Versioning. They should reflect the version the application is using.
2424
# It is recommended to use it with quotes.
25-
appVersion: "6.4.0"
25+
appVersion: "6.5.0"
2626

2727
dependencies:
2828
- name: postgresql

openapi.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ info:
2525
license:
2626
name: "Apache License, Version 2.0"
2727
url: https://www.apache.org/licenses/LICENSE-2.0.txt
28-
version: 6.5.0-SNAPSHOT
28+
version: 6.5.0
2929
servers:
3030
- url: https://localhost:8080
3131
description: Generated server url
@@ -6899,6 +6899,9 @@ components:
68996899
- $ref: '#/components/schemas/AbstractConstraint'
69006900
- type: object
69016901
properties:
6902+
ids:unit:
6903+
type: string
6904+
format: uri
69026905
ids:pipEndpoint:
69036906
type: string
69046907
format: uri
@@ -6924,9 +6927,6 @@ components:
69246927
- https://w3id.org/idsa/code/STATE
69256928
- https://w3id.org/idsa/code/SYSTEM
69266929
- https://w3id.org/idsa/code/USER
6927-
ids:unit:
6928-
type: string
6929-
format: uri
69306930
ids:operator:
69316931
type: string
69326932
enum:
@@ -7006,15 +7006,15 @@ components:
70067006
- $ref: '#/components/schemas/AbstractConstraint'
70077007
- type: object
70087008
properties:
7009-
ids:or:
7009+
ids:and:
70107010
type: array
70117011
items:
70127012
$ref: '#/components/schemas/Constraint'
7013-
ids:and:
7013+
ids:xone:
70147014
type: array
70157015
items:
70167016
$ref: '#/components/schemas/Constraint'
7017-
ids:xone:
7017+
ids:or:
70187018
type: array
70197019
items:
70207020
$ref: '#/components/schemas/Constraint'
@@ -7085,11 +7085,16 @@ components:
70857085
ids:target:
70867086
type: string
70877087
format: uri
7088-
ids:constraint:
7088+
ids:assignee:
70897089
type: array
70907090
items:
7091-
oneOf:
7092-
- $ref: '#/components/schemas/LogicalConstraint'
7091+
type: string
7092+
format: uri
7093+
ids:assigner:
7094+
type: array
7095+
items:
7096+
type: string
7097+
format: uri
70937098
ids:action:
70947099
type: array
70957100
items:
@@ -7111,20 +7116,15 @@ components:
71117116
- https://w3id.org/idsa/code/TRACK_PROVENANCE
71127117
- https://w3id.org/idsa/code/USE
71137118
- https://w3id.org/idsa/code/WRITE
7114-
ids:assignee:
7119+
ids:constraint:
71157120
type: array
71167121
items:
7117-
type: string
7118-
format: uri
7122+
oneOf:
7123+
- $ref: '#/components/schemas/LogicalConstraint'
71197124
ids:assetRefinement:
71207125
oneOf:
71217126
- $ref: '#/components/schemas/Constraint'
71227127
- $ref: '#/components/schemas/LogicalConstraint'
7123-
ids:assigner:
7124-
type: array
7125-
items:
7126-
type: string
7127-
format: uri
71287128
ids:description:
71297129
type: array
71307130
items:

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585

8686
<properties>
8787
<!-- General -->
88-
<revision>6.5.0-SNAPSHOT</revision>
88+
<revision>6.5.0</revision>
8989
<email>[email protected]</email>
9090

9191
<!-- Build info -->

scripts/ci/e2e/active-tests.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
./scripts/tests/contract_negotation_security_level_access.py
88
./scripts/tests/multiple_artifacts.py
99
./scripts/tests/single_artifact_multiple_policies.py
10+
./scripts/tests/remote_data_can_be_updated.py
1011
./scripts/tests/subscription_creation.py

scripts/tests/contract_negotation_allow_access.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from resourceapi import ResourceApi
1919
from idsapi import IdsApi
20-
import requests
2120
import pprint
2221
import sys
2322

@@ -41,9 +40,6 @@ def main(argv):
4140

4241
print("Starting script")
4342

44-
# Suppress ssl verification warning
45-
requests.packages.urllib3.disable_warnings()
46-
4743
# Provider
4844
provider = ResourceApi(providerUrl)
4945

scripts/tests/contract_negotation_connector_restricted_access.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#
1717

1818
import pprint
19-
import requests
2019
import sys
2120

2221
from idsapi import IdsApi
@@ -42,9 +41,6 @@ def main(argv):
4241

4342
print("Starting script")
4443

45-
# Suppress ssl verification warning
46-
requests.packages.urllib3.disable_warnings()
47-
4844
# Provider
4945
provider = ResourceApi(providerUrl)
5046

scripts/tests/contract_negotation_count_access.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#
1717

1818
import pprint
19-
import requests
2019
import sys
2120

2221
from idsapi import IdsApi
@@ -42,9 +41,6 @@ def main(argv):
4241

4342
print("Starting script")
4443

45-
# Suppress ssl verification warning
46-
requests.packages.urllib3.disable_warnings()
47-
4844
# Provider
4945
provider = ResourceApi(providerUrl)
5046

scripts/tests/contract_negotation_log_access.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#
1717

1818
import pprint
19-
import requests
2019
import sys
2120

2221
from idsapi import IdsApi
@@ -42,9 +41,6 @@ def main(argv):
4241

4342
print("Starting script")
4443

45-
# Suppress ssl verification warning
46-
requests.packages.urllib3.disable_warnings()
47-
4844
# Provider
4945
provider = ResourceApi(providerUrl)
5046

scripts/tests/contract_negotation_notify_access.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#
1717

1818
import pprint
19-
import requests
2019
import sys
2120

2221
from idsapi import IdsApi
@@ -42,9 +41,6 @@ def main(argv):
4241

4342
print("Starting script")
4443

45-
# Suppress ssl verification warning
46-
requests.packages.urllib3.disable_warnings()
47-
4844
# Provider
4945
provider = ResourceApi(providerUrl)
5046

0 commit comments

Comments
 (0)