Incorporated upstream v0.13.0 changes and re-applied downstream features

Git history will be rewritten to a fresh start
Next backport will be done as a rebase operation
(with "git push --force-with-lease" on the main downstream branch)

Note: Prometheus first PR has been cherry-picked

Signed-off-by: Leonardo Milleri <[email protected]>

Author: lmilleri

.tekton/trustee-pull-request.yaml

@@ -5,7 +5,6 @@ members = [
     "rvps",
     "tools/kbs-client",
     "deps/verifier",
-    "integration-tests",
 ]
 resolver = "2"
 
@@ -33,7 +32,7 @@ hex = "0.4.3"
 jwt-simple = { version = "0.12", default-features = false, features = [
     "pure-rust",
 ] }
-kbs_protocol = { git = "https://github.com/confidential-containers/guest-components.git", rev = "27b8245", default-features = false }
+kbs_protocol = { git = "https://github.com/confidential-containers/guest-components.git", rev = "e6999a3c0fd877dae9e68ea78b8b483062db32b8", default-features = false }
 kbs-types = "0.10.0"
 kms = { git = "https://github.com/confidential-containers/guest-components.git", rev = "e6999a3c0fd877dae9e68ea78b8b483062db32b8", default-features = false }
 jsonwebtoken = { version = "9", default-features = false }

.tekton/trustee-push.yaml

@@ -60,6 +60,7 @@ lazy_static = "1.4.0"
 log.workspace = true
 mobc = { version = "0.8.5", optional = true }
 p256 = { workspace = true, features = ["ecdh"] }
+prometheus = "0.13.4"
 prost = { workspace = true, optional = true }
 rand = "0.8.5"
 regex = "1.11.1"
@@ -103,7 +104,20 @@ josekit = "0.10.0"
 tempfile.workspace = true
 rstest.workspace = true
 reference-value-provider-service.path = "../rvps"
-serial_test = "3.0"
+serial_test.workspace = true
+
+[target.'cfg(not(any(target_arch = "s390x", target_arch = "aarch64")))'.dev-dependencies]
+kbs-client = { path = "../tools/kbs-client" }
+
+[target.'cfg(target_arch = "s390x")'.dev-dependencies]
+kbs-client = { path = "../tools/kbs-client", default-features = false, features = [
+    "se-attester",
+] }
+
+[target.'cfg(target_arch = "aarch64")'.dev-dependencies]
+kbs-client = { path = "../tools/kbs-client", default-features = false, features = [
+    "cca-attester",
+] }
 
 [build-dependencies]
 tonic-build = { workspace = true, optional = true }

Cargo.lock

@@ -115,7 +115,7 @@ uninstall:
 	rm -rf $(INSTALL_DESTDIR)/kbs $(INSTALL_DESTDIR)/kbs-client $(INSTALL_DESTDIR)/issuer-kbs $(INSTALL_DESTDIR)/resource-kbs
 
 check:
-	cargo test -p kbs -p kbs-client -p integration-tests $(TEST_ARGUMENTS)
+	cargo test -p kbs -p kbs-client $(TEST_ARGUMENTS)
 
 lint:
 	cargo clippy -p kbs -p kbs-client $(TEST_ARGUMENTS) -- -D warnings

Cargo.toml

@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.80.0 AS builder
+FROM docker.io/library/rust:1.89.0 AS builder
 
 WORKDIR /usr/src/kbs
 COPY . .

integration-tests/Cargo.toml

@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.80.0 AS builder
+FROM docker.io/library/rust:1.89.0 AS builder
 ARG ARCH=x86_64
 
 WORKDIR /usr/src/kbs