bazel: Replace crate extension with score-crates

Author: igorostrowskiq

MODULE.bazel

@@ -101,18 +101,6 @@ bazel_dep(name = "score_process", version = "1.3.1")
 bazel_dep(name = "score_baselibs", version = "0.1.2")
 
 ## additional settings / config
-crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
-crate.from_cargo(
-    name = "score_persistency_crates",
-    cargo_lockfile = "//:Cargo.lock",
-    manifests = [
-        "//:Cargo.toml",
-        "//src/rust/rust_kvs:Cargo.toml",
-        "//src/rust/rust_kvs_tool:Cargo.toml",
-        "//tests/rust_test_scenarios:Cargo.toml",
-    ],
-)
-
 bazel_dep(name = "rust_qnx8_toolchain", version = "1.0.0", dev_dependency = True)
 archive_override(
     module_name = "rust_qnx8_toolchain",
@@ -122,8 +110,6 @@ archive_override(
     ],
 )
 
-use_repo(crate, "score_persistency_crates")
-
 ## temporary overrides / tools
 # Testing utils dependency.
 # Direct usage of tag in git_override reports false problem in editor, using hash of a tag
@@ -190,3 +176,11 @@ register_toolchains(
     "@toolchains_qnx_ifs//:ifs_aarch64",
     dev_dependency = True,
 )
+
+# S-CORE crates
+bazel_dep(name = "score_crates", version = "0.0.6")
+git_override(
+    module_name = "score_crates",
+    commit = "91fd7903f1219bbb4fa3890007eabe4dd512b3a8",
+    remote = "https://github.com/eclipse-score/score-crates.git",
+)

src/rust/rust_kvs/BUILD

@@ -11,15 +11,15 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
-load("@score_persistency_crates//:defs.bzl", "all_crate_deps")
 
 rust_library(
     name = "rust_kvs",
     srcs = glob(["src/**/*.rs"]),
     visibility = ["//visibility:public"],
-    deps = all_crate_deps(
-        normal = True,
-    ),
+    deps = [
+        "@score_crates//:adler32",
+        "@score_crates//:tinyjson",
+    ],
 )
 
 rust_test(
@@ -29,8 +29,5 @@ rust_test(
         "unit_tests",
         "ut",
     ],
-    deps = all_crate_deps(
-        normal = True,
-        normal_dev = True,
-    ),
+    deps = ["@score_crates//:tempfile"],
 )

src/rust/rust_kvs_tool/BUILD

@@ -11,7 +11,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 load("@rules_rust//rust:defs.bzl", "rust_binary")
-load("@score_persistency_crates//:defs.bzl", "all_crate_deps")
 
 rust_binary(
     name = "kvs_tool",
@@ -20,9 +19,9 @@ rust_binary(
     ],
     crate_name = "rust_kvs_tool",
     visibility = ["//visibility:public"],
-    deps = all_crate_deps(
-        normal = True,
-    ) + [
+    deps = [
         "//src/rust/rust_kvs",
+        "@score_crates//:pico_args",
+        "@score_crates//:tinyjson",
     ],
 )

tests/rust_test_scenarios/BUILD

@@ -11,7 +11,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 load("@rules_rust//rust:defs.bzl", "rust_binary")
-load("@score_persistency_crates//:defs.bzl", "all_crate_deps")
 
 rust_binary(
     name = "rust_test_scenarios",
@@ -20,6 +19,11 @@ rust_binary(
     deps =
         [
             "//src/rust/rust_kvs",
-            "@score_persistency_crates//:tinyjson",
-        ] + all_crate_deps(normal = True),
+            "@score_crates//:serde",
+            "@score_crates//:serde_json",
+            "@score_crates//:tinyjson",
+            "@score_crates//:tracing",
+            "@score_crates//:tracing_subscriber",
+            "@score_test_scenarios//test_scenarios_rust",
+        ],
 )

tests/rust_test_scenarios/src/main.rs

@@ -6,8 +6,35 @@ mod helpers;
 mod test_basic;
 use crate::cit::cit_scenario_group;
 use crate::test_basic::BasicScenario;
+use std::time::{SystemTime, UNIX_EPOCH};
+use tracing::Level;
+use tracing_subscriber::fmt::time::FormatTime;
+use tracing_subscriber::FmtSubscriber;
 
-fn main() {
+struct NumericUnixTime;
+
+impl FormatTime for NumericUnixTime {
+    fn format_time(&self, w: &mut tracing_subscriber::fmt::format::Writer<'_>) -> std::fmt::Result {
+        let now = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap_or_default();
+        write!(w, "{}", now.as_secs())
+    }
+}
+
+fn init_tracing_subscriber() {
+    let subscriber = FmtSubscriber::builder()
+        .with_max_level(Level::TRACE)
+        .with_thread_ids(true)
+        .with_timer(NumericUnixTime)
+        .json()
+        .finish();
+
+    tracing::subscriber::set_global_default(subscriber)
+        .expect("Setting default subscriber failed!");
+}
+
+fn main() -> Result<(), String> {
     let raw_arguments: Vec<String> = std::env::args().collect();
 
     // Basic group.
@@ -29,6 +56,7 @@ fn main() {
     ));
 
     // Run.
+    init_tracing_subscriber();
     let test_context = TestContext::new(root_group);
-    run_cli_app(&raw_arguments, &test_context);
+    run_cli_app(&raw_arguments, &test_context)
 }