Skip to content

Commit 9e8669d

Browse files
t-perssont-persson
authored
Update to edition-arica of the Eiffel protocol (#68)
* Update to edition-arica of the Eiffel protocol * Added new link types and fixed a few overrides
1 parent 23c4c91 commit 9e8669d

37 files changed

+943
-168
lines changed

‎requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ Flask==1.1.1
2424
Flask-GraphQL==2.0.0
2525
graphene==2.1.8
2626
gunicorn==20.0.4
27+
greenlet==0.4.14
2728
gevent==1.4.0

‎setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package_dir =
2323
=src
2424
# DON'T CHANGE THE FOLLOWING LINE! IT WILL BE UPDATED BY PYSCAFFOLD!
2525
setup_requires = pyscaffold>=3.2a0,<3.3a0
26-
install_requires = eiffellib==1.2.0;requests==2.22.0;pymongo[srv]==3.12.0;graphql-core==2.2.1;gql==0.1.0;Flask==1.1.1;Flask-GraphQL==2.0.0;graphene==2.1.8;gunicorn==20.0.4;gevent==1.4.0
26+
install_requires = eiffellib==1.2.0;requests==2.22.0;pymongo[srv]==3.12.0;graphql-core==2.2.1;gql==0.1.0;Flask==1.1.1;Flask-GraphQL==2.0.0;graphene==2.1.8;gunicorn==20.0.4;greenlet==0.4.14;gevent==1.4.0
2727

2828
[options.package_data]
2929
* = *.json

‎src/eiffel_graphql_api/graphql/schemas/events/activity_finished.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019-2020 Axis Communications AB.
1+
# Copyright 2019-2023 Axis Communications AB.
22
#
33
# For a full list of individual contributors, please see the commit history.
44
#
@@ -30,6 +30,7 @@ class ActivityFinished(EiffelObjectType):
3030
load("EiffelActivityFinishedEvent.json").get("data").get("properties"),
3131
override_name={
3232
"persistentLogs": "activityPersistentLogs",
33+
"tags": "activityPersistentLogTags",
3334
"outcome": "activityOutcome",
3435
},
3536
)

‎src/eiffel_graphql_api/graphql/schemas/events/activity_started.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019-2020 Axis Communications AB.
1+
# Copyright 2019-2023 Axis Communications AB.
22
#
33
# For a full list of individual contributors, please see the commit history.
44
#
@@ -28,7 +28,7 @@ class ActivityStarted(EiffelObjectType):
2828
data = json_schema_to_graphql(
2929
"ActivityStartedData",
3030
load("EiffelActivityStartedEvent.json").get("data").get("properties"),
31-
override_name={"liveLogs": "activityLiveLogs"},
31+
override_name={"liveLogs": "activityLiveLogs", "tags": "activityLiveLogTags"},
3232
)
3333
mongo = None
3434

‎src/eiffel_graphql_api/graphql/schemas/events/artifact_created.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2019-2020 Axis Communications AB.
1+
# Copyright 2019-2023 Axis Communications AB.
22
#
33
# For a full list of individual contributors, please see the commit history.
44
#
@@ -28,7 +28,10 @@ class ArtifactCreated(EiffelObjectType):
2828
data = json_schema_to_graphql(
2929
"ArtifactCreatedData",
3030
load("EiffelArtifactCreatedEvent.json").get("data").get("properties"),
31-
override_name={"tags": "artifactTags"},
31+
override_name={
32+
"tags": "artifactTags",
33+
"integrityProtection": "artifactIntegrityProtection",
34+
},
3235
)
3336
mongo = None
3437

‎src/eiffel_graphql_api/graphql/schemas/events/json_schemas/EiffelActivityCanceledEvent.json

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
},
1212
"type": {
1313
"type": "string",
14-
"enum": ["EiffelActivityCanceledEvent"]
14+
"enum": [
15+
"EiffelActivityCanceledEvent"
16+
]
1517
},
1618
"version": {
1719
"type": "string",
18-
"enum": [ "3.0.0" ],
19-
"default": "3.0.0"
20+
"enum": [
21+
"3.2.0"
22+
],
23+
"default": "3.2.0"
2024
},
2125
"time": {
2226
"type": "integer"
@@ -63,7 +67,20 @@
6367
},
6468
"alg": {
6569
"type": "string",
66-
"enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
70+
"enum": [
71+
"HS256",
72+
"HS384",
73+
"HS512",
74+
"RS256",
75+
"RS384",
76+
"RS512",
77+
"ES256",
78+
"ES384",
79+
"ES512",
80+
"PS256",
81+
"PS384",
82+
"PS512"
83+
]
6784
},
6885
"publicKey": {
6986
"type": "string"
@@ -99,6 +116,9 @@
99116
"required": [
100117
"authorIdentity"
101118
]
119+
},
120+
"schemaUri": {
121+
"type": "string"
102122
}
103123
},
104124
"required": [
@@ -123,8 +143,7 @@
123143
"key": {
124144
"type": "string"
125145
},
126-
"value": {
127-
}
146+
"value": {}
128147
},
129148
"required": [
130149
"key",
@@ -147,6 +166,9 @@
147166
"target": {
148167
"type": "string",
149168
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
169+
},
170+
"domainId": {
171+
"type": "string"
150172
}
151173
},
152174
"required": [

‎src/eiffel_graphql_api/graphql/schemas/events/json_schemas/EiffelActivityFinishedEvent.json

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
},
1212
"type": {
1313
"type": "string",
14-
"enum": ["EiffelActivityFinishedEvent"]
14+
"enum": [
15+
"EiffelActivityFinishedEvent"
16+
]
1517
},
1618
"version": {
1719
"type": "string",
18-
"enum": [ "3.0.0" ],
19-
"default": "3.0.0"
20+
"enum": [
21+
"3.3.0"
22+
],
23+
"default": "3.3.0"
2024
},
2125
"time": {
2226
"type": "integer"
@@ -63,7 +67,20 @@
6367
},
6468
"alg": {
6569
"type": "string",
66-
"enum": ["HS256", "HS384", "HS512", "RS256", "RS384", "RS512", "ES256", "ES384", "ES512", "PS256", "PS384", "PS512"]
70+
"enum": [
71+
"HS256",
72+
"HS384",
73+
"HS512",
74+
"RS256",
75+
"RS384",
76+
"RS512",
77+
"ES256",
78+
"ES384",
79+
"ES512",
80+
"PS256",
81+
"PS384",
82+
"PS512"
83+
]
6784
},
6885
"publicKey": {
6986
"type": "string"
@@ -99,6 +116,9 @@
99116
"required": [
100117
"authorIdentity"
101118
]
119+
},
120+
"schemaUri": {
121+
"type": "string"
102122
}
103123
},
104124
"required": [
@@ -139,9 +159,18 @@
139159
"items": {
140160
"type": "object",
141161
"properties": {
162+
"mediaType": {
163+
"type": "string"
164+
},
142165
"name": {
143166
"type": "string"
144167
},
168+
"tags": {
169+
"type": "array",
170+
"items": {
171+
"type": "string"
172+
}
173+
},
145174
"uri": {
146175
"type": "string"
147176
}
@@ -161,8 +190,7 @@
161190
"key": {
162191
"type": "string"
163192
},
164-
"value": {
165-
}
193+
"value": {}
166194
},
167195
"required": [
168196
"key",
@@ -188,6 +216,9 @@
188216
"target": {
189217
"type": "string",
190218
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
219+
},
220+
"domainId": {
221+
"type": "string"
191222
}
192223
},
193224
"required": [

‎src/eiffel_graphql_api/graphql/schemas/events/json_schemas/EiffelActivityStartedEvent.json

Lines changed: 71 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111
},
1212
"type": {
1313
"type": "string",
14-
"enum": ["EiffelActivityStartedEvent"]
14+
"enum": [
15+
"EiffelActivityStartedEvent"
16+
]
1517
},
1618
"version": {
1719
"type": "string",
18-
"enum": [ "3.0.0" ],
19-
"default": "3.0.0"
20+
"enum": [
21+
"4.3.0"
22+
],
23+
"default": "4.3.0"
2024
},
2125
"time": {
2226
"type": "integer"
@@ -52,24 +56,69 @@
5256
"security": {
5357
"type": "object",
5458
"properties": {
55-
"sdm": {
59+
"authorIdentity": {
60+
"type": "string"
61+
},
62+
"integrityProtection": {
5663
"type": "object",
5764
"properties": {
58-
"authorIdentity": {
65+
"signature": {
5966
"type": "string"
6067
},
61-
"encryptedDigest": {
68+
"alg": {
69+
"type": "string",
70+
"enum": [
71+
"HS256",
72+
"HS384",
73+
"HS512",
74+
"RS256",
75+
"RS384",
76+
"RS512",
77+
"ES256",
78+
"ES384",
79+
"ES512",
80+
"PS256",
81+
"PS384",
82+
"PS512"
83+
]
84+
},
85+
"publicKey": {
6286
"type": "string"
6387
}
6488
},
6589
"required": [
66-
"authorIdentity",
67-
"encryptedDigest"
90+
"signature",
91+
"alg"
6892
],
6993
"additionalProperties": false
94+
},
95+
"sequenceProtection": {
96+
"type": "array",
97+
"items": {
98+
"type": "object",
99+
"properties": {
100+
"sequenceName": {
101+
"type": "string"
102+
},
103+
"position": {
104+
"type": "integer"
105+
}
106+
},
107+
"additionalProperties": false,
108+
"required": [
109+
"sequenceName",
110+
"position"
111+
]
112+
}
70113
}
71114
},
72-
"additionalProperties": false
115+
"additionalProperties": false,
116+
"required": [
117+
"authorIdentity"
118+
]
119+
},
120+
"schemaUri": {
121+
"type": "string"
73122
}
74123
},
75124
"required": [
@@ -91,9 +140,18 @@
91140
"items": {
92141
"type": "object",
93142
"properties": {
143+
"mediaType": {
144+
"type": "string"
145+
},
94146
"name": {
95147
"type": "string"
96148
},
149+
"tags": {
150+
"type": "array",
151+
"items": {
152+
"type": "string"
153+
}
154+
},
97155
"uri": {
98156
"type": "string"
99157
}
@@ -113,8 +171,7 @@
113171
"key": {
114172
"type": "string"
115173
},
116-
"value": {
117-
}
174+
"value": {}
118175
},
119176
"required": [
120177
"key",
@@ -137,6 +194,9 @@
137194
"target": {
138195
"type": "string",
139196
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
197+
},
198+
"domainId": {
199+
"type": "string"
140200
}
141201
},
142202
"required": [

0 commit comments

Comments
 (0)