Skip to content

Commit 2936b25

Browse files
Fix failures in CI (#184)
* Fix link to allurereport documentation Signed-off-by: Martin Kunkel <git@martinkunkel.de> * Fix cargo clippy warnings Signed-off-by: Martin Kunkel <git@martinkunkel.de> * Update outdated token Copied from kuksa-common rev. e4c8af2 Signed-off-by: Martin Kunkel <git@martinkunkel.de> * Update jwt from kuksa-common Copied from kuksa-common rev. e4c8af2 Signed-off-by: Martin Kunkel <git@martinkunkel.de> * Update certificates Signed-off-by: Martin Kunkel <git@martinkunkel.de> * pin pytest to version less than 9 pytest raises sync-test-depending-on-async-fixture which is deprecated in pytest 8, but is an error in pytest 9. Signed-off-by: Martin Kunkel <git@martinkunkel.de> --------- Signed-off-by: Martin Kunkel <git@martinkunkel.de>
1 parent 79657b2 commit 2936b25

File tree

18 files changed

+41
-47
lines changed

18 files changed

+41
-47
lines changed

certificates/Client.pem

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIEvDCCA6SgAwIBAgIUHTSx4IXPnRm1jobM/3hTaxuK0GwwDQYJKoZIhvcNAQEL
2+
MIIEvDCCA6SgAwIBAgIUaxtq8PHtf201cMc4TBQuizgSwq0wDQYJKoZIhvcNAQEL
33
BQAwgZQxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZP
44
dHRhd2ExJTAjBgNVBAoMHEVjbGlwc2Uub3JnIEZvdW5kYXRpb24sIEluYy4xFTAT
55
BgNVBAMMDGxvY2FsaG9zdC1jYTEkMCIGCSqGSIb3DQEJARYVa3Vrc2EtZGV2QGVj
6-
bGlwc2Uub3JnMB4XDTI1MDcwMzA5MzMwNloXDTI2MDcwMzA5MzMwNlowgY4xCzAJ
6+
bGlwc2Uub3JnMB4XDTI2MDIwNTIxMDk1OFoXDTI3MDIwNTIxMDk1OFowgY4xCzAJ
77
BgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZPdHRhd2ExJTAj
88
BgNVBAoMHEVjbGlwc2Uub3JnIEZvdW5kYXRpb24sIEluYy4xDzANBgNVBAMMBkNs
99
aWVudDEkMCIGCSqGSIb3DQEJARYVa3Vrc2EtZGV2QGVjbGlwc2Uub3JnMIIBIjAN
@@ -19,10 +19,10 @@ gZQxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZPdHRh
1919
d2ExJTAjBgNVBAoMHEVjbGlwc2Uub3JnIEZvdW5kYXRpb24sIEluYy4xFTATBgNV
2020
BAMMDGxvY2FsaG9zdC1jYTEkMCIGCSqGSIb3DQEJARYVa3Vrc2EtZGV2QGVjbGlw
2121
c2Uub3JnghR92Q2Epkh+nIVseTvM7XpxzB0XwjANBgkqhkiG9w0BAQsFAAOCAQEA
22-
sQpPaKmW94J0Nm8v6cA9xDCw4vOXLhYVcuwEkV5mExiK50uYHx1y62LkBafw16oN
23-
7hbltcr2YfdanNg5YeEzEb2Jdgmc2YmTY7uyBq9qLDzhqnl6mi0tjzSg/lMxwH5C
24-
VTi9p9gcKYna6CufSFiPZylRa3rCg/5yIbVdniHiQqpm6fMTNHyeqT1MMCsi67Gh
25-
hmwKNcPMLHpLuXzy4YX+UibIF2yoovghry6t931ukYz494bxX0DgeRAQXaFQsZKO
26-
DRvTddobYEtq8C+oeBsJYHxAhCNJXIquyaZQPq9hnLvbtkNo/HsZbp6LAm/WcEcN
27-
DTlxXqrZ24GWewrzfn2DqA==
22+
amxzsdLha5u9J/bJfUY6pWDzshzWYoasy5rcIeokkDomxusrxN95uZT9PIY3A3OV
23+
34l7vVzqmJJn+YJqzVMLw/hqFehV7xr/N1X1DbHeePARO/AvuWTV/0iAIwPPdJTA
24+
pTD1cC+1ZkX5RvLRz9+OUzC8fBoyfTbWUIwGQw7ygH0qMDFk7DGTfyrdYT1eDRxx
25+
JRhu0T011RhFnhukFZwzoHz+QRcGBqqWncsqmfvQUvvwO9mx0brvcH6RVz/+yCSq
26+
tB5LoD0XXyADQCHmEmV4Ut5ux2l/CmHBD0y3XotcYs6RHIaVkfRYVtRWbEcS6IzJ
27+
I65KbTWm6cPPajP7HTXFrA==
2828
-----END CERTIFICATE-----

certificates/Server.pem

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIEvDCCA6SgAwIBAgIUGf3jo81QPAgl+hQasZUu2FSmpzgwDQYJKoZIhvcNAQEL
2+
MIIEvDCCA6SgAwIBAgIUaxtq8PHtf201cMc4TBQuizgSwqwwDQYJKoZIhvcNAQEL
33
BQAwgZQxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZP
44
dHRhd2ExJTAjBgNVBAoMHEVjbGlwc2Uub3JnIEZvdW5kYXRpb24sIEluYy4xFTAT
55
BgNVBAMMDGxvY2FsaG9zdC1jYTEkMCIGCSqGSIb3DQEJARYVa3Vrc2EtZGV2QGVj
6-
bGlwc2Uub3JnMB4XDTI1MDcwMzA5MzMwNloXDTI2MDcwMzA5MzMwNlowgY4xCzAJ
6+
bGlwc2Uub3JnMB4XDTI2MDIwNTIxMDk1OFoXDTI3MDIwNTIxMDk1OFowgY4xCzAJ
77
BgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZPdHRhd2ExJTAj
88
BgNVBAoMHEVjbGlwc2Uub3JnIEZvdW5kYXRpb24sIEluYy4xDzANBgNVBAMMBlNl
99
cnZlcjEkMCIGCSqGSIb3DQEJARYVa3Vrc2EtZGV2QGVjbGlwc2Uub3JnMIIBIjAN
@@ -19,10 +19,10 @@ gZQxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZPdHRh
1919
d2ExJTAjBgNVBAoMHEVjbGlwc2Uub3JnIEZvdW5kYXRpb24sIEluYy4xFTATBgNV
2020
BAMMDGxvY2FsaG9zdC1jYTEkMCIGCSqGSIb3DQEJARYVa3Vrc2EtZGV2QGVjbGlw
2121
c2Uub3JnghR92Q2Epkh+nIVseTvM7XpxzB0XwjANBgkqhkiG9w0BAQsFAAOCAQEA
22-
eC8Av1Tl0Bh+jr1qBzehr2PdEnm731h6/zVmQ9oupYLXP49FcIUik81NZvgG5kLb
23-
uOgZoBX2CrKx0bOw/oAAGcOwL49Xf0L7kZj81U0Ddc0UGK0S8XyxEbH9ilBtJYLT
24-
8ZWsdQCQsRRoWzSGCZk6C9E9Na09fMO4J9GvkC8oRrorn410LvEIBidOstY+QNXy
25-
G34tPIzlq5vl27/ntyp7q16zWwACfrpHlISyhRlmf/ySLfj+ohIsJYRS0oedb7QO
26-
TqmbGgWEQMAXVIwXuIVXbZZtAqJfYPj1FVCvyvKdyaH4LxfTPXDIqY4LJ5rRR9HW
27-
PyXyaWy0EOJUE7onTDR0vA==
22+
jAYxf0KzX0s9k/BmrVw0tFRbNSwt06b0qrV4PvHlLb8H0NnrQ/JLvy0FOUTHv8Ll
23+
TyyKPzuxdfxDfP+RVK4HCJMCOJbyciAYKiZAT9Sll4ryFXDEpIiYqWgAEodEaCXj
24+
EtlUkBWEQfuUOQzCBCDCUsgIWom2tD96rl7JTvt/DWzI/Zof0uknrW0VF+Nn0crp
25+
ZY3OzlZyR2foGn/zUsJSqznLJ5e1YgrvRJhVmrHNLfMt1BAWVzu4UsVBlsEyJ5oU
26+
dpNSJk+vZObpiTNICNc5RZ5e3ukLwHgrfno9SJEvaSVPJMcpUaWGNpPcTg8WbZJ+
27+
S6ZspMN0DqCptZaqfGshag==
2828
-----END CERTIFICATE-----

databroker/src/authorization/jwt/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ NI1RhlTziu35Xo6NDEgs9hVs9k3WrtF+ZUxhivWmP2VXhWruRakVkC1NzKGh54e5
160160
AEiqOjPq0D6X45wCzIwjILUCAwEAAQ==
161161
-----END PUBLIC KEY-----
162162
";
163-
let token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoicmVhZDpWZWhpY2xlLlNwZWVkIn0.QyaKO-vjjzeimAAyUMjlM_jAvhlmYVguzXp76jAnW9UUiWowrXeYTa_ERVzZqxz21txq1QQmee8WtCO978w95irSRugTmlydWNjS6xPGAOCan6TEXBryrmR5FSmm6fPNrgLPhFEfcqFIQm07B286JTU98s-s2yeb6bJRpm7gOzhH5klCLxBPFYNncwdqqaT6aQD31xOcq4evooPOoV5KZFKI9WKkzOclDvto6TCLYIgnxu9Oey_IqyRAkDHybeFB7LR-1XexweRjWKleXGijpNweu6ATsbPakeVIfJ6k3IN-oKNvP6nawtBg7GeSEFYNksUUCVrIg8b0_tZi3c3E114MvdiDe7iWfRd5SDjO1f8nKiqDYy9P-hwejHntsaXLZbWSs_GNbWmi6J6pwgdM4XI3x4vx-0Otsb4zZ0tOmXjIL_tRsKA5dIlSBYEpIZq6jSXgQLN2_Ame0i--gGt4jTg1sYJHqE56BKc74HqkcvrQAZrZcoeqiKkwKcy6ofRpIQ57ghooZLkJ8BLWEV_zJgSffHBX140EEnMg1z8GAhrsbGvJ29TmXGmYyLrAhyTj_L6aNCZ1XEkbK0Yy5pco9sFGRm9nKTeFcNICogPuzbHg4xsGX_SZgUmla8Acw21AAXwuFY60_aFDUlCKZh93Z2SAruz1gfNIL43I0L8-wfw";
163+
let token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNzY4NTY0ODAwLCJleHAiOjE4NjE5MTk5OTksInNjb3BlIjoicmVhZDpWZWhpY2xlLlNwZWVkIn0.CeOLvMfINCGLii3ycsYBU3WINXTuPYK0Z5BKnHxoZwE7lKXLQQKEmqh3GO1kx8rHJZxe4YQAK543tQCZ2GZQBVM3uJmShLRnWFkMd-DB_LEDw6codw11UoxUNcgld-d5pnYfBXlVc45TvoYUMoaezEx3jsZKlDYnXxybC0W7uepwvex7Zz0H7zv2WJJ73Qz6gRn5Mm6jQthq0GBO1POsxTTLC9xwaL_8MEdYmUOXxa3pWexo0qv_50OWgAYzg0djzHp8oByh2aFwg0NhjD6IkraMRvj1xmLsOaZPpzV9dKlozRPia3efbsf5pgLhYEAb6iVpnifmEFHGn548lrjqqcGVTOS_8CIpihjh7iMsnEkpU2wKnrlDU2jg4XhPsZ7eCJLnFe0rB7Gu8WVXxRC6P0DQDjJR5rShLK4IfAWcZAFQjh9ZSat6Ii5TezdH5nXCaEpu7DPEZ3_HyyA54uW3l397v1q13saJmBVEc3egiO8mmaHWcClCVwm47_UZIh4tdMTtREWoKELXjTlGmHp4R4hFx7H5inRScs8iHYEe2fjY2-wVQUEv2aCw8zT-HQ9U7rew1Em8DiAJUJIDCbZMBT2t-USIVZUFrOiQ5BcCHW36rx5w4NcS0Y_8VGajKbnWqH_8MP66CdzrnZrBIAjRIZSUtk-4iQYRlYm3Y8z-n0A";
164164

165165
let decoder = Decoder::new(pub_key).expect("Creation of decoder should succeed");
166166

databroker/src/grpc/kuksa_val_v2/val.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -882,8 +882,8 @@ impl proto::val_server::Val for broker::DataBroker {
882882
}
883883
},
884884
Some(PublishValuesRequest(publish_values_request)) => {
885-
if local_provider_uuid.is_some() {
886-
let response = publish_values(&broker, local_provider_uuid.unwrap(), &publish_values_request).await;
885+
if let Some(provide_uuid) = local_provider_uuid {
886+
let response = publish_values(&broker, provide_uuid, &publish_values_request).await;
887887
if let Some(value) = response {
888888
if let Err(err) = response_stream_sender.send(value).await {
889889
debug!("Failed to send error response: {}", err);
@@ -966,8 +966,8 @@ impl proto::val_server::Val for broker::DataBroker {
966966
}
967967
}
968968
Some(ProviderErrorIndication(_provider_error_indication)) => {
969-
if local_provider_uuid.is_some() {
970-
publish_provider_error(&broker, local_provider_uuid.unwrap()).await;
969+
if let Some(provide_uuid) = local_provider_uuid {
970+
publish_provider_error(&broker, provide_uuid).await;
971971
} else if let Err(err) = response_stream_sender.send(Err(tonic::Status::aborted("Provider has not claimed yet any signals, please call ProvideSignalRequest first"))).await {
972972
debug!("Failed to send error response: {}", err);
973973
}

databroker/src/vss.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -534,19 +534,13 @@ pub fn parse_vss_from_reader<R>(reader: R) -> Result<BTreeMap<String, DataEntry>
534534
where
535535
R: std::io::Read,
536536
{
537-
let root_entry = match serde_json::from_reader::<R, RootEntry>(reader) {
538-
Ok(root_entry) => root_entry,
539-
Err(err) => return Err(err.into()),
540-
};
537+
let root_entry = serde_json::from_reader::<R, RootEntry>(reader)?;
541538

542539
flatten_vss_tree(root_entry)
543540
}
544541

545542
pub fn parse_vss_from_str(data: &str) -> Result<BTreeMap<String, DataEntry>, Error> {
546-
let root_entry = match serde_json::from_str::<RootEntry>(data) {
547-
Ok(root_entry) => root_entry,
548-
Err(err) => return Err(err.into()),
549-
};
543+
let root_entry = serde_json::from_str::<RootEntry>(data)?;
550544

551545
flatten_vss_tree(root_entry)
552546
}

integration_test/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
asyncio
22
grpcio
33
protobuf
4-
pytest
4+
pytest<9
55
pytest-ordering
66
pytest-asyncio

integration_test/viss/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Re-run tests:
9393

9494
We use Allure Report to produce test results reports: https://allurereport.org/docs/pytest/
9595

96-
- Install Allure Report, see https://allurereport.org/docs/install-for-linux/
96+
- Install Allure Report, see https://allurereport.org/docs/v2/install-for-linux/
9797
- Requires Java Runtime
9898

9999
```

jwt/actuate-provide-all.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"aud": [
55
"kuksa.val"
66
],
7-
"iat": 1516239022,
8-
"exp": 1767225599,
7+
"iat": 1768564800,
8+
"exp": 1861919999,
99
"scope": "actuate provide"
1010
}

jwt/actuate-provide-all.token

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNTE2MjM5MDIyLCJleHAiOjE3NjcyMjU1OTksInNjb3BlIjoiYWN0dWF0ZSBwcm92aWRlIn0.x-bUZwDCC663wGYrWCYjQZwQWhN1CMuKgxuIN5dUF_izwMutiqF6Xc-tnXgZa93BbT3I74WOMk4awKHBUSTWekGs3-qF6gajorbat6n5180TOqvNu4CXuIPZN5zpngf4id3smMkKOT699tPnSEbmlkj4vk-mIjeOAU-FcYA-VbkKBTsjvfFgKa2OdB5h9uZARBg5Rx7uBN3JsH1I6j9zoLid184Ewa6bhU2qniFt5iPsGJniNsKsRrrndN1KzthO13My44s56yvwSHIOrgDGbXdja_eLuOVOq9pHCjCtorPScgEuUUE4aldIuML-_j397taNP9Y3VZYVvofEK7AuiePTbzwxrZ1RAjK74h1-4ued3A2gUTjr5BsRlc9b7eLZzxLJkrqdfGAzBh_rtrB7p32TbvpjeFP30NW6bB9JS43XACUUm_S_RcyI7BLuUdnFyQDQr6l6sRz9XayYXceilHdCxbAVN0HVnBeui5Bb0mUZYIRZeY8k6zcssmokANTD8ZviDMpKlOU3t5AlXJ0nLkgyMhV9IUTwPUv6F8BTPc-CquJCUNbTyo4ywTSoODWbm3PmQ3Y46gWF06xqnB4wehLscBdVk3iAihQp3tckGhMnx5PI_Oy7utIncr4pRCMos63TnBkfrl7d43cHQTuK0kO76EWtv4ODEHgLvEAv4HA
1+
eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsb2NhbCBkZXYiLCJpc3MiOiJjcmVhdGVUb2tlbi5weSIsImF1ZCI6WyJrdWtzYS52YWwiXSwiaWF0IjoxNzY4NTY0ODAwLCJleHAiOjE4NjE5MTk5OTksInNjb3BlIjoiYWN0dWF0ZSBwcm92aWRlIn0.eLx-Ur9UjwvdiLLoMYYKDhxFW8ogfEoOBf4EqB8qA_NucTWpiECy_y5o5035qSmeiGclxoEp2CNiyo_5ji9amkqnuGgyVfJNIq0eSiDvuG7IEjgTnRJW21Bl7Qn3MZ9rK6lXvvY_VAZeGpnRG_XxTM3XhOWpDD8Z-LOStcSTJR_K3_HtwFBzTH8JTDbNk8--dXTYjuHd6_o5RcXG-mvQSHPti1Zk6G1Zk7N7ZEtYMSPpg6Uwsff7VUvTZSesGZAD8WfNqOl2IX8O0DXhyxfr4LaQQV6oZhS-QYxjRVL72gN2tAzHysqptaYj2HpoaM121oZWJ78gQ4My-_0lfHplL29BWuw_v6JPugdDwtd4Ai-7aoZ8GreNSYM5DEeBAE7Qsd09-0TVTiJuBDrSsbiIVX7v_Jsh2u5OpSk3ZRz14s5e8SJFtW7keTLhHq8ES6piNYpGlRDnG729v4EVes8H1sJCdTkCT4Ct9luRMwc6iiJk7vlEOQT43ofmDs93PNmp1K7UQf62FQAaiC0O_SBWvfKZrMcKkIX5Bk440QzV_9jkWWETBPvbRWDwM0RaXmrPKsA97g31yLv2Fo5EJe295XohNBB6xoghidCc-qxezO4Sdwm4ZnXFtxrvyKcg3Q5EZ-gWlPOPkS1fF5A-D4XwanBcLJDt0zXYcKVQWO0F68Y

jwt/provide-all.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"aud": [
55
"kuksa.val"
66
],
7-
"iat": 1516239022,
8-
"exp": 1767225599,
7+
"iat": 1768564800,
8+
"exp": 1861919999,
99
"scope": "provide"
1010
}

0 commit comments

Comments
 (0)