Skip to content

bazel: Replace crate extension with score-crates #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pawelrutkaq merged 2 commits into from
Dec 16, 2025
Merged

bazel: Replace crate extension with score-crates #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2a7795
testing: Update test_scenarios_rust to v0.3.0
igorostrowskiq Dec 11, 2025
2e8a4f6
bazel: Replace crate extension with score-crates
igorostrowskiq Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 3 additions & 14 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,6 @@ bazel_dep(name = "aspect_rules_lint", version = "1.10.2")
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.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",
Expand All @@ -127,8 +115,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
Expand Down Expand Up @@ -169,3 +155,6 @@ register_toolchains(
"@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0",
dev_dependency = True,
)

# S-CORE crates
bazel_dep(name = "score_crates", version = "0.0.6")
13 changes: 5 additions & 8 deletions src/rust/rust_kvs/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -29,8 +29,5 @@ rust_test(
"unit_tests",
"ut",
],
deps = all_crate_deps(
normal = True,
normal_dev = True,
),
deps = ["@score_crates//:tempfile"],
)
7 changes: 3 additions & 4 deletions src/rust/rust_kvs_tool/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
],
)
2 changes: 0 additions & 2 deletions tests/python_test_cases/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ score_py_pytest(
data = [
":python_tc_venv",
"//tests/cpp_test_scenarios",
"//tests/rust_test_scenarios",
],
env = {
"RUST_BACKTRACE": "1",
Expand All @@ -66,7 +65,6 @@ score_py_pytest(
],
data = [
":python_tc_venv",
"//tests/cpp_test_scenarios",
"//tests/rust_test_scenarios",
],
env = {
Expand Down
10 changes: 7 additions & 3 deletions tests/rust_test_scenarios/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
],
)
2 changes: 1 addition & 1 deletion tests/rust_test_scenarios/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tracing = "0.1.41"
tracing-subscriber = { version = "0.3.20", features = ["json"] }
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
test_scenarios_rust = { git = "https://github.com/qorix-group/testing_tools.git", tag = "v0.2.0" }
test_scenarios_rust = { git = "https://github.com/eclipse-score/testing_tools.git", tag = "v0.3.0" }


[lints]
Expand Down
25 changes: 10 additions & 15 deletions tests/rust_test_scenarios/src/cit/default_values.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ impl Scenario for DefaultValues {
"default_values"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
// Key used for tests.
let key = "test_number";

// Create KVS instance with provided params.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
{
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");

Expand Down Expand Up @@ -61,13 +60,12 @@ impl Scenario for RemoveKey {
"remove_key"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
// Key used for tests.
let key = "test_number";

// Create KVS instance with provided params.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
{
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");

Expand Down Expand Up @@ -109,12 +107,11 @@ impl Scenario for ResetAllKeys {
"reset_all_keys"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
let num_values = 5;

// Create KVS instance with provided params.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
{
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");

Expand Down Expand Up @@ -175,13 +172,12 @@ impl Scenario for ResetSingleKey {
"reset_single_key"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
let num_values = 5;
let reset_index = 2;

// Create KVS instance with provided params.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
{
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");

Expand Down Expand Up @@ -243,10 +239,9 @@ impl Scenario for Checksum {
"checksum"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
// Create KVS instance with provided params.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
let kvs_path;
let hash_path;
{
Expand Down
15 changes: 6 additions & 9 deletions tests/rust_test_scenarios/src/cit/multiple_kvs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ impl Scenario for MultipleInstanceIds {
"multiple_instance_ids"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
// Values.
let keyname = "number".to_string();
let value1 = 111.1;
let value2 = 222.2;

// Parameters.
let input_string = input.as_ref().expect("Test input is expected");
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
let params1 =
KvsParameters::from_value(&v["kvs_parameters_1"]).expect("Failed to parse parameters");
let params2 =
Expand Down Expand Up @@ -68,14 +67,13 @@ impl Scenario for SameInstanceIdSameValue {
"same_instance_id_same_value"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
// Values.
let keyname = "number".to_string();
let value = 111.1;

// Parameters.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
{
// Create first KVS instance.
let kvs1 = kvs_instance(params.clone()).expect("Failed to create KVS instance");
Expand Down Expand Up @@ -120,15 +118,14 @@ impl Scenario for SameInstanceIdDifferentValue {
"same_instance_id_diff_value"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
// Values.
let keyname = "number".to_string();
let value1 = 111.1;
let value2 = 222.2;

// Parameters.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
{
// Create first KVS instance.
let kvs1 = kvs_instance(params.clone()).expect("Failed to create KVS instance");
Expand Down
5 changes: 2 additions & 3 deletions tests/rust_test_scenarios/src/cit/persistency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ impl Scenario for ExplicitFlush {
"explicit_flush"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
fn run(&self, input: &str) -> Result<(), String> {
// List of keys and corresponding values.
let num_values = 5;
let mut key_values = Vec::new();
Expand All @@ -23,8 +23,7 @@ impl Scenario for ExplicitFlush {
}

// Check parameters.
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
{
// First KVS instance object - used for setting and flushing data.
let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");
Expand Down
20 changes: 8 additions & 12 deletions tests/rust_test_scenarios/src/cit/snapshots.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ impl Scenario for SnapshotCount {
"count"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
let input_string = input.as_ref().expect("Test input is expected");
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
fn run(&self, input: &str) -> Result<(), String> {
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
let count =
serde_json::from_value(v["count"].clone()).expect("Failed to parse \"count\" field");
let params = KvsParameters::from_value(&v).expect("Failed to parse parameters");
Expand Down Expand Up @@ -44,9 +43,8 @@ impl Scenario for SnapshotMaxCount {
"max_count"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
let input_string = input.as_ref().expect("Test input is expected");
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
fn run(&self, input: &str) -> Result<(), String> {
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
let params = KvsParameters::from_value(&v).expect("Failed to parse parameters");

let kvs = kvs_instance(params.clone()).expect("Failed to create KVS instance");
Expand All @@ -62,9 +60,8 @@ impl Scenario for SnapshotRestore {
"restore"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
let input_string = input.as_ref().expect("Test input is expected");
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
fn run(&self, input: &str) -> Result<(), String> {
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
let count =
serde_json::from_value(v["count"].clone()).expect("Failed to parse \"count\" field");
let snapshot_id = serde_json::from_value(v["snapshot_id"].clone())
Expand Down Expand Up @@ -104,9 +101,8 @@ impl Scenario for SnapshotPaths {
"paths"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
let input_string = input.as_ref().expect("Test input is expected");
let v: Value = serde_json::from_str(input_string).expect("Failed to parse input string");
fn run(&self, input: &str) -> Result<(), String> {
let v: Value = serde_json::from_str(input).expect("Failed to parse input string");
let count =
serde_json::from_value(v["count"].clone()).expect("Failed to parse \"count\" field");
let snapshot_id = serde_json::from_value(v["snapshot_id"].clone())
Expand Down
10 changes: 4 additions & 6 deletions tests/rust_test_scenarios/src/cit/supported_datatypes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ impl Scenario for SupportedDatatypesKeys {
"keys"
}

fn run(&self, input: Option<String>) -> Result<(), String> {
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
fn run(&self, input: &str) -> Result<(), String> {
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
let kvs = kvs_instance(params).expect("Failed to create KVS instance");

// Set key-value pairs. Unit type is used for value - only key is used later on.
Expand Down Expand Up @@ -59,9 +58,8 @@ impl Scenario for SupportedDatatypesValues {
}
}

fn run(&self, input: Option<String>) -> Result<(), String> {
let input_string = input.as_ref().expect("Test input is expected");
let params = KvsParameters::from_json(input_string).expect("Failed to parse parameters");
fn run(&self, input: &str) -> Result<(), String> {
let params = KvsParameters::from_json(input).expect("Failed to parse parameters");
let kvs = kvs_instance(params).expect("Failed to create KVS instance");

kvs.set_value(self.name(), self.value.clone())
Expand Down
Loading
Loading