diff --git a/.bazelrc b/.bazelrc index f346504..c3d8d90 100644 --- a/.bazelrc +++ b/.bazelrc @@ -6,7 +6,7 @@ build --tool_java_runtime_version=remotejdk_17 test --test_output=errors common --@score_baselibs//score/json:base_library=nlohmann -common --@score_communication//score/mw/com/flags:tracing_library=stub +common --@score_communication//score/mw/com/flags:tracing_library=@score_baselibs//score/analysis/tracing/generic_trace_library/stub_implementation common --//score/config_management/config_daemon/code:score_variant=True common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/ common --registry=https://bcr.bazel.build diff --git a/MODULE.bazel b/MODULE.bazel index 418e24d..48f4a1b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,5 +1,5 @@ # ******************************************************************************* -# Copyright (c) 2025, 2026 Contributors to the Eclipse Foundation +# Copyright (c) 2025 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. @@ -67,12 +67,15 @@ bazel_dep(name = "score_docs_as_code", version = "4.0.3") # s-core base libs bazel_dep(name = "score_baselibs", version = "0.2.7") +git_override( + module_name = "score_baselibs", + commit = "498a4b256c9073602140243d30c33b106e279f75", + remote = "https://github.com/eclipse-score/baselibs.git", +) # s-core communication bazel_dep(name = "score_communication", version = "0.2.1") - bazel_dep(name = "score_logging", version = "0.2.1") - bazel_dep(name = "score_lifecycle_health", version = "0.2.0") # s-core persistency diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index af7161c..52234d4 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -280,6 +280,8 @@ "https://bcr.bazel.build/modules/opencensus-cpp/0.0.0-20230502-50eb5de/source.json": "f50efc07822f5425bd1d3e40e977484f9c0142463052717d40ec85cd6744243e", "https://bcr.bazel.build/modules/opencensus-proto/0.4.1/MODULE.bazel": "4a2e8b4d0b544002502474d611a5a183aa282251e14f6a01afe841c0c1b10372", "https://bcr.bazel.build/modules/opencensus-proto/0.4.1/source.json": "a7d956700a85b833c43fc61455c0e111ab75bab40768ed17a206ee18a2bbe38f", + "https://bcr.bazel.build/modules/openssl/3.5.5.bcr.4/MODULE.bazel": "b3f35b53c6c73bd3a7c8efbf9b7e79e92566d189e64d313aede69f608ac6dd77", + "https://bcr.bazel.build/modules/openssl/3.5.5.bcr.4/source.json": "662d68be9227e60ef65fed83c6820564bda4af0efe6a40dc62dd9aee288fe9cf", "https://bcr.bazel.build/modules/opentelemetry-cpp/1.14.2/MODULE.bazel": "089a5613c2a159c7dfde098dabfc61e966889c7d6a81a98422a84c51535ed17d", "https://bcr.bazel.build/modules/opentelemetry-cpp/1.16.0/MODULE.bazel": "b7379a140f538cea3f749179a2d481ed81942cc6f7b05a6113723eb34ac3b3e7", "https://bcr.bazel.build/modules/opentelemetry-cpp/1.16.0/source.json": "da0cf667713b1e48d7f8912b100b4e0a8284c8a95717af5eb8c830d699e61cf5", @@ -364,7 +366,6 @@ "https://bcr.bazel.build/modules/rules_cc/0.1.4/MODULE.bazel": "bb03a452a7527ac25a7518fb86a946ef63df860b9657d8323a0c50f8504fb0b9", "https://bcr.bazel.build/modules/rules_cc/0.1.5/MODULE.bazel": "88dfc9361e8b5ae1008ac38f7cdfd45ad738e4fa676a3ad67d19204f045a1fd8", "https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8", - "https://bcr.bazel.build/modules/rules_cc/0.2.16/MODULE.bazel": "9242fa89f950c6ef7702801ab53922e99c69b02310c39fb6e62b2bd30df2a1d4", "https://bcr.bazel.build/modules/rules_cc/0.2.17/MODULE.bazel": "1849602c86cb60da8613d2de887f9566a6d354a6df6d7009f9d04a14402f9a84", "https://bcr.bazel.build/modules/rules_cc/0.2.17/source.json": "3832f45d145354049137c0090df04629d9c2b5493dc5c2bf46f1834040133a07", "https://bcr.bazel.build/modules/rules_cc/0.2.4/MODULE.bazel": "1ff1223dfd24f3ecf8f028446d4a27608aa43c3f41e346d22838a4223980b8cc", @@ -439,6 +440,8 @@ "https://bcr.bazel.build/modules/rules_nodejs/6.5.2/source.json": "6a6ca0940914d55c550d1417cad13a56c9900e23f651a762d8ccc5a64adcf661", "https://bcr.bazel.build/modules/rules_oci/2.3.0/MODULE.bazel": "49075197960c924c0a4d759b7c765c3d00a41d2fdd4a943b42823c1d016ab4ec", "https://bcr.bazel.build/modules/rules_oci/2.3.0/source.json": "47710c28446211b5e61a24015a4669c50c6862d5f91e6bdbc710de8d750cf613", + "https://bcr.bazel.build/modules/rules_perl/1.1.0/MODULE.bazel": "22138e75bb8f1ee6c21f609b90d2c24b0c9b796ccf55cc04c1c9190b699f7e9d", + "https://bcr.bazel.build/modules/rules_perl/1.1.0/source.json": "896fe7707a38c5b229c6f5fa77134209874c4d57fecda5f756c1f23e4d25aae2", "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc", "https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff", "https://bcr.bazel.build/modules/rules_pkg/1.1.0/MODULE.bazel": "9db8031e71b6ef32d1846106e10dd0ee2deac042bd9a2de22b4761b0c3036453", @@ -721,6 +724,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/nlohmann_json/3.6.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opencensus-cpp/0.0.0-20230502-50eb5de/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opencensus-proto/0.4.1/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/openssl/3.5.5.bcr.4/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opentelemetry-cpp/1.14.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opentelemetry-cpp/1.16.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opentelemetry-proto/1.1.0/MODULE.bazel": "not found", @@ -791,7 +795,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.1.4/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.1.5/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.14/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.16/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.17/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.4/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.8/MODULE.bazel": "not found", @@ -854,6 +857,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_nodejs/6.3.3/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_nodejs/6.5.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_oci/2.3.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_perl/1.1.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_pkg/0.7.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_pkg/1.0.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_pkg/1.1.0/MODULE.bazel": "not found", @@ -899,9 +903,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.16.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.18.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/2.1.1/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.6/MODULE.bazel": "36db2ffb07d1b4cc91f44ffbdb17cab834baef0fb3173c5e9b6885868fdc420c", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.7/MODULE.bazel": "7383c9e593051051d128ca34be078abb365e14c2b12a15237f451240fc27ad73", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs/0.2.7/source.json": "70b750a4582db620d562d53735f9212e8d1b7486491e65293ca06035f20b6a74", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs_rust/0.1.0/MODULE.bazel": "e9f8781fa23b58a7c4815d662d82a9a472d8dddc306f08cba3853928f3b760fe", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs_rust/0.1.2/MODULE.bazel": "8a07e1c62986e941a6e182e39c9cd08391849eed55c2f4dbb02d72ef6f524346", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_baselibs_rust/0.1.2/source.json": "5d920b55b98cf3d87da75d5a3ab1915709867fda14991ef2843c5e7c33aa0391", diff --git a/score/config_management/config_daemon/code/BUILD b/score/config_management/config_daemon/code/BUILD index 8e74f37..e072291 100644 --- a/score/config_management/config_daemon/code/BUILD +++ b/score/config_management/config_daemon/code/BUILD @@ -40,9 +40,9 @@ cc_test( features = COMPILER_WARNING_FEATURES, tags = ["unit"], deps = [ + "//score/config_management/config_daemon/code/app/details:app_for_unit_test", "@score_lifecycle_health//src/lifecycle_client_lib:applicationcontext_mock", "@score_lifecycle_health//src/lifecycle_client_lib:lifecycle_mock", - "//score/config_management/config_daemon/code/app/details:app_for_unit_test", ] + select({ ":is_score_variant": ["//score/config_management/config_daemon/code/factory/details:mw_factory_for_unit_test"], "//conditions:default": ["//score/config_management/config_daemon/code/factory/details:ara_factory_for_unit_test"], diff --git a/score/config_management/config_daemon/code/app/details/BUILD b/score/config_management/config_daemon/code/app/details/BUILD index b497739..e4a7be1 100644 --- a/score/config_management/config_daemon/code/app/details/BUILD +++ b/score/config_management/config_daemon/code/app/details/BUILD @@ -25,14 +25,14 @@ cc_library( "//score/config_management/config_daemon/code:__pkg__", ], deps = [ - "@score_baselibs//score/concurrency:interruptible_wait", - "@score_baselibs//score/utils:scoped_operation", - "@score_lifecycle_health//src/lifecycle_client_lib:application", - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/app:interface", "//score/config_management/config_daemon/code/data_model:parameterset_collection_manager", "//score/config_management/config_daemon/code/data_model/details:parameterset_collection_manager_impl", "//score/config_management/config_daemon/code/factory:interface", + "@score_baselibs//score/concurrency:interruptible_wait", + "@score_baselibs//score/utils:scoped_operation", + "@score_lifecycle_health//src/lifecycle_client_lib:application", + "@score_logging//score/mw/log", ], ) @@ -46,14 +46,14 @@ cc_library( "//score/config_management/config_daemon/code:__pkg__", ], deps = [ - "@score_baselibs//score/utils:scoped_operation", - "@score_lifecycle_health//src/lifecycle_client_lib:application_mock", - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/app:interface", "//score/config_management/config_daemon/code/data_model:parameterset_collection_manager", "//score/config_management/config_daemon/code/data_model/details:parameterset_collection_manager_impl", "//score/config_management/config_daemon/code/factory:interface_for_unit_test", "//score/config_management/config_daemon/code/fault_event_reporter", + "@score_baselibs//score/utils:scoped_operation", + "@score_lifecycle_health//src/lifecycle_client_lib:application_mock", + "@score_logging//score/mw/log", ], ) @@ -66,16 +66,11 @@ cc_test( features = COMPILER_WARNING_FEATURES, tags = ["unit"], visibility = [ - "//score/config_management/config_daemon/code/app:__pkg__", "//requirements:__pkg__", + "//score/config_management/config_daemon/code/app:__pkg__", ], deps = [ ":app_for_unit_test", - "@score_baselibs//score/os/mocklib:stat_mock", - "@score_lifecycle_health//src/lifecycle_client_lib:applicationcontext", - "@score_lifecycle_health//src/lifecycle_client_lib:lifecycle_mock", - "@score_communication//score/mw/service:factory", - "@score_communication//score/mw/service:provided_service_container", "//score/config_management/config_daemon/code/data_model:parameterset_collection_manager_mock", "//score/config_management/config_daemon/code/factory:mock", "//score/config_management/config_daemon/code/fault_event_reporter:mock", @@ -83,5 +78,10 @@ cc_test( "//score/config_management/config_daemon/code/plugins/plugin_collector:mock", "//score/config_management/config_daemon/code/services:mock", "@googletest//:gtest_main", + "@score_baselibs//score/os/mocklib:stat_mock", + "@score_communication//score/mw/service:factory", + "@score_communication//score/mw/service:provided_service_container", + "@score_lifecycle_health//src/lifecycle_client_lib:applicationcontext", + "@score_lifecycle_health//src/lifecycle_client_lib:lifecycle_mock", ], ) diff --git a/score/config_management/config_daemon/code/data_model/BUILD b/score/config_management/config_daemon/code/data_model/BUILD index fd2ef97..a1dea24 100644 --- a/score/config_management/config_daemon/code/data_model/BUILD +++ b/score/config_management/config_daemon/code/data_model/BUILD @@ -25,10 +25,10 @@ cc_library( "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_baselibs//score/json", - "@score_baselibs//score/result", "//score/config_management/config_daemon/code/data_model:parameter_set_qualifier", "//score/config_management/config_daemon/code/data_model/parameterset_collection_interfaces:read_only_parameterset_collection", + "@score_baselibs//score/json", + "@score_baselibs//score/result", ], ) @@ -69,8 +69,8 @@ cc_library( hdrs = ["parameterset_collection_manager_mock.h"], features = COMPILER_WARNING_FEATURES, visibility = [ - "//score/config_management/config_daemon/code:__subpackages__", "//score:__subpackages__", + "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ ":parameterset_collection_manager", diff --git a/score/config_management/config_daemon/code/data_model/details/BUILD b/score/config_management/config_daemon/code/data_model/details/BUILD index 6d55480..32efeeb 100644 --- a/score/config_management/config_daemon/code/data_model/details/BUILD +++ b/score/config_management/config_daemon/code/data_model/details/BUILD @@ -30,18 +30,18 @@ cc_library( features = COMPILER_WARNING_FEATURES, tags = ["FUSA"], visibility = [ - "//score/config_management/config_daemon/code:__subpackages__", "//score:__subpackages__", + "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_baselibs//score/filesystem", - "@score_baselibs//score/json", - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/data_model:parameter_set_qualifier", "//score/config_management/config_daemon/code/data_model:parameterset_collection", "//score/config_management/config_daemon/code/data_model/error", "//score/config_management/config_daemon/code/data_model/parameter_set_storage", + "@score_baselibs//score/filesystem", + "@score_baselibs//score/json", "@score_baselibs//score/language/futurecpp", + "@score_logging//score/mw/log", ], ) @@ -56,11 +56,11 @@ cc_library( ], deps = [ ":parameterset_collection_impl", - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/data_model:parameterset_collection_manager", "//score/config_management/config_daemon/code/data_model/error", "//score/config_management/config_daemon/code/data_model/parameter_set_storage", "//score/config_management/config_daemon/code/plugins:plugin", + "@score_logging//score/mw/log", ], ) @@ -75,8 +75,8 @@ cc_test( visibility = ["//score/config_management/config_daemon/code/data_model:__pkg__"], deps = [ ":parameterset_collection_impl", - "@score_baselibs//score/json:mock", "@googletest//:gtest_main", + "@score_baselibs//score/json:mock", ], ) @@ -88,9 +88,9 @@ cc_test( visibility = ["//score/config_management/config_daemon/code/data_model:__pkg__"], deps = [ ":parameterset_collection_manager_impl", - "@score_logging//score/mw/log/test/console_logging_environment", "//score/config_management/config_daemon/code/data_model/parameter_set_storage:mock", "//score/config_management/config_daemon/code/plugins:mock", "@googletest//:gtest_main", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD index f4f97a4..8e52805 100644 --- a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD +++ b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD @@ -36,11 +36,11 @@ COMMON_FEATURES = [ "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_baselibs//score/hash:safe_hash", - "@score_baselibs//score/json", "//score/config_management/config_daemon/code/data_model:parameterset_collection", "//score/config_management/config_daemon/code/data_model/parameter_set_storage", "//score/config_management/config_daemon/code/data_model/parameter_set_storage/error", + "@score_baselibs//score/hash:safe_hash", + "@score_baselibs//score/json", ] + dependencies, ) for name, testonly, dependencies in [ @@ -71,10 +71,10 @@ cc_test( ], deps = [ ":details_score_for_unit_test", - "@score_logging//score/mw/log/test/console_logging_environment", "//score/config_management/config_daemon/code/data_model:parameterset_collection_mock", "@googletest//:gtest", "@googletest//:gtest_main", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD index 9ccce6f..8cbb61d 100644 --- a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD +++ b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD @@ -36,8 +36,8 @@ cc_library( "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_baselibs//score/result", "//score/config_management/config_daemon/code/data_model/parameter_set_storage/error", + "@score_baselibs//score/result", ], ) diff --git a/score/config_management/config_daemon/code/data_model/parameter_set_storage/error/BUILD b/score/config_management/config_daemon/code/data_model/parameter_set_storage/error/BUILD index 3163173..a47827b 100644 --- a/score/config_management/config_daemon/code/data_model/parameter_set_storage/error/BUILD +++ b/score/config_management/config_daemon/code/data_model/parameter_set_storage/error/BUILD @@ -29,8 +29,8 @@ cc_library( "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_baselibs//score/result", "@score_baselibs//score/language/futurecpp", + "@score_baselibs//score/result", ], ) diff --git a/score/config_management/config_daemon/code/data_model/parameterset_collection_interfaces/BUILD b/score/config_management/config_daemon/code/data_model/parameterset_collection_interfaces/BUILD index 6089440..aadf61b 100644 --- a/score/config_management/config_daemon/code/data_model/parameterset_collection_interfaces/BUILD +++ b/score/config_management/config_daemon/code/data_model/parameterset_collection_interfaces/BUILD @@ -27,8 +27,8 @@ cc_library( visibility = ["//score/config_management/config_daemon:__subpackages__"], deps = [ "@score_baselibs//score/json", - "@score_baselibs//score/result", "@score_baselibs//score/language/futurecpp", + "@score_baselibs//score/result", ], ) diff --git a/score/config_management/config_daemon/code/factory/BUILD b/score/config_management/config_daemon/code/factory/BUILD index 3a9692a..b859449 100644 --- a/score/config_management/config_daemon/code/factory/BUILD +++ b/score/config_management/config_daemon/code/factory/BUILD @@ -30,13 +30,13 @@ load(":custom.bzl", "load_custom_test_suites") "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_communication//score/mw/service", "//score/config_management/config_daemon/code/data_model:parameterset_collection", "//score/config_management/config_daemon/code/data_model:parameterset_collection_manager", "//score/config_management/config_daemon/code/data_model/parameter_set_storage", "//score/config_management/config_daemon/code/fault_event_reporter", "//score/config_management/config_daemon/code/plugins/plugin_collector:interface", "//score/config_management/config_daemon/code/services", + "@score_communication//score/mw/service", ] + dependencies, ) for name, testonly, dependencies in [ diff --git a/score/config_management/config_daemon/code/factory/details/BUILD b/score/config_management/config_daemon/code/factory/details/BUILD index 84cf4d7..2595042 100644 --- a/score/config_management/config_daemon/code/factory/details/BUILD +++ b/score/config_management/config_daemon/code/factory/details/BUILD @@ -26,17 +26,16 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER tags = ["FFI"], visibility = visibility, deps = [ - "@score_baselibs//score/filesystem", - "@score_baselibs//score/json:json_impl", - "@score_communication//score/mw/service:factory", "//score/config_management/config_daemon/code/data_model/details:parameterset_collection_impl", "//score/config_management/config_daemon/code/data_model/details:parameterset_collection_manager_impl", "//score/config_management/config_daemon/code/json_helper/details", "//score/config_management/config_daemon/code/services/details:details_impl", + "@score_baselibs//score/filesystem", + "@score_baselibs//score/json:json_impl", + "@score_communication//score/mw/service:factory", ] + dependencies, ) for name, srcs, testonly, visibility, dependencies in [ - ( "mw_factory", ["factory_mw_impl.cpp"], @@ -54,7 +53,6 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER "//score/config_management/config_daemon/code/data_model/parameter_set_storage/details:details_score", ], ), - ( "mw_factory_for_unit_test", ["factory_mw_impl.cpp"], @@ -109,6 +107,5 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER ], ["//score/config_management/config_daemon/code/services/details/mw_com:mw_com_config"], ), - ] ] diff --git a/score/config_management/config_daemon/code/json_helper/details/BUILD b/score/config_management/config_daemon/code/json_helper/details/BUILD index 9fad66e..8939372 100644 --- a/score/config_management/config_daemon/code/json_helper/details/BUILD +++ b/score/config_management/config_daemon/code/json_helper/details/BUILD @@ -22,12 +22,12 @@ cc_library( features = COMPILER_WARNING_FEATURES, tags = ["FFI"], visibility = [ - "//score/config_management/config_daemon/code:__subpackages__", "//score:__subpackages__", + "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ + "//score/config_management/config_daemon/code/json_helper", "@score_baselibs//score/filesystem", "@score_baselibs//score/json:json_impl", - "//score/config_management/config_daemon/code/json_helper", ], ) diff --git a/score/config_management/config_daemon/code/plugins/BUILD b/score/config_management/config_daemon/code/plugins/BUILD index 1406554..231c6c4 100644 --- a/score/config_management/config_daemon/code/plugins/BUILD +++ b/score/config_management/config_daemon/code/plugins/BUILD @@ -28,11 +28,11 @@ cc_library( "//score/config_management/config_daemon/code/plugins:__subpackages__", ], deps = [ - "@score_baselibs//score/result", "//score/config_management/config_daemon/code/data_model:parameterset_collection_manager", "//score/config_management/config_daemon/code/fault_event_reporter", "//score/config_management/config_daemon/code/services", "@score_baselibs//score/language/futurecpp", + "@score_baselibs//score/result", ], ) diff --git a/score/config_management/config_daemon/code/plugins/demo_json/details/BUILD b/score/config_management/config_daemon/code/plugins/demo_json/details/BUILD index 31ecdb4..b97301f 100644 --- a/score/config_management/config_daemon/code/plugins/demo_json/details/BUILD +++ b/score/config_management/config_daemon/code/plugins/demo_json/details/BUILD @@ -1,6 +1,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library") -load("@safe_posix_platform@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") load("@score_baselibs//:bazel/unit_tests.bzl", "cc_gtest_unit_test", "cc_unit_test_suites_for_host_and_qnx") +load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") cc_library( name = "demo_json_plugin_impl", @@ -13,10 +13,10 @@ cc_library( features = COMPILER_WARNING_FEATURES, visibility = ["//score/config_management/config_daemon/code:__subpackages__"], deps = [ - "@score_baselibs//score/json:json_impl", - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/plugins:plugin", "//score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/details:demo_parameter_loader_impl", + "@score_baselibs//score/json:json_impl", + "@score_logging//score/mw/log", ], ) @@ -29,10 +29,10 @@ cc_gtest_unit_test( visibility = ["//score/config_management/config_daemon:__subpackages__"], deps = [ ":demo_json_plugin_impl", - "@score_baselibs//score/json:mock", - "@score_logging//score/mw/log/test/console_logging_environment", "//score/config_management/config_daemon/code/data_model:parameterset_collection_manager_mock", "//score/config_management/config_daemon/code/data_model/details:parameterset_collection_impl", + "@score_baselibs//score/json:mock", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/BUILD b/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/BUILD index f0f1b74..6d4929a 100644 --- a/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/BUILD +++ b/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/BUILD @@ -1,5 +1,5 @@ load("@rules_cc//cc:defs.bzl", "cc_library") -load("@safe_posix_platform@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") +load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") cc_library( name = "demo_parameter_loader", diff --git a/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/details/BUILD b/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/details/BUILD index b434340..682c2a3 100644 --- a/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/details/BUILD +++ b/score/config_management/config_daemon/code/plugins/demo_json/parameter_loader/details/BUILD @@ -1,6 +1,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library") -load("@safe_posix_platform@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") load("@score_baselibs//:bazel/unit_tests.bzl", "cc_gtest_unit_test", "cc_unit_test_suites_for_host_and_qnx") +load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") cc_library( name = "demo_parameter_loader_impl", @@ -13,11 +13,11 @@ cc_library( features = COMPILER_WARNING_FEATURES, visibility = ["//score/config_management/config_daemon/code:__subpackages__"], deps = [ - "@score_baselibs//score/json:json_serializer", - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/data_model:parameterset_collection", "//score/config_management/config_daemon/code/plugins/demo_json/parameter_loader:demo_parameter_loader", + "@score_baselibs//score/json:json_serializer", "@score_baselibs//score/language/futurecpp", + "@score_logging//score/mw/log", ], ) @@ -30,11 +30,11 @@ cc_gtest_unit_test( visibility = ["//score/config_management/config_daemon:__subpackages__"], deps = [ ":demo_parameter_loader_impl", - "@score_baselibs//score/json:json_impl", - "@score_logging//score/mw/log/test/console_logging_environment", "//score/config_management/config_daemon/code/data_model:parameterset_collection_mock", "//score/config_management/config_daemon/code/data_model/details:parameterset_collection_impl", "//score/config_management/config_daemon/code/data_model/error", + "@score_baselibs//score/json:json_impl", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_daemon/code/plugins/demo_json/plugin_creator/BUILD b/score/config_management/config_daemon/code/plugins/demo_json/plugin_creator/BUILD index e89802b..975a30b 100644 --- a/score/config_management/config_daemon/code/plugins/demo_json/plugin_creator/BUILD +++ b/score/config_management/config_daemon/code/plugins/demo_json/plugin_creator/BUILD @@ -1,6 +1,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library") -load("@safe_posix_platform@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") load("@score_baselibs//:bazel/unit_tests.bzl", "cc_gtest_unit_test", "cc_unit_test_suites_for_host_and_qnx") +load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") cc_library( name = "demo_json_plugin_creator", diff --git a/score/config_management/config_daemon/code/plugins/plugin_collector/details/BUILD b/score/config_management/config_daemon/code/plugins/plugin_collector/details/BUILD index 7404762..ceced4f 100644 --- a/score/config_management/config_daemon/code/plugins/plugin_collector/details/BUILD +++ b/score/config_management/config_daemon/code/plugins/plugin_collector/details/BUILD @@ -28,9 +28,9 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/plugins:plugin", "//score/config_management/config_daemon/code/plugins/plugin_collector:interface", + "@score_logging//score/mw/log", ] + dependencies, ) for name, testonly, dependencies in [ @@ -78,8 +78,8 @@ cc_test( visibility = ["//score/config_management/config_daemon:__subpackages__"], deps = [ ":details_for_unit_test", - "@score_logging//score/mw/log/test/console_logging_environment", "@googletest//:gtest", "@googletest//:gtest_main", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_daemon/code/services/BUILD b/score/config_management/config_daemon/code/services/BUILD index 482e722..db920bb 100644 --- a/score/config_management/config_daemon/code/services/BUILD +++ b/score/config_management/config_daemon/code/services/BUILD @@ -28,9 +28,9 @@ cc_library( tags = ["FUSA"], visibility = ["//score/config_management/config_daemon:__subpackages__"], deps = [ - "@score_communication//score/mw/service:provided_service_container", "//score/config_management/config_daemon/code/types/initial_qualifier_state", "@score_baselibs//score/language/futurecpp", + "@score_communication//score/mw/service:provided_service_container", ], ) @@ -69,8 +69,8 @@ cc_library( "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_baselibs//score/result", "@score_baselibs//score/language/futurecpp", + "@score_baselibs//score/result", ], ) diff --git a/score/config_management/config_daemon/code/services/details/BUILD b/score/config_management/config_daemon/code/services/details/BUILD index 07e2cce..d96d51f 100644 --- a/score/config_management/config_daemon/code/services/details/BUILD +++ b/score/config_management/config_daemon/code/services/details/BUILD @@ -30,8 +30,8 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER "//score/config_management/config_daemon/code:__subpackages__", ], deps = [ - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/data_model/parameterset_collection_interfaces:read_only_parameterset_collection", + "@score_logging//score/mw/log", ] + dependencies, ) for name, testonly, dependencies in [ @@ -65,9 +65,9 @@ cc_test( "//score/config_management/config_daemon/code/services:__pkg__", ], deps = [ - "@score_logging//score/mw/log/test/console_logging_environment", "//score/config_management/config_daemon/code/data_model:parameterset_collection_mock", "//score/config_management/config_daemon/code/data_model/error", "//score/config_management/config_daemon/code/services/details:for_unit_test", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_daemon/code/services/details/mw_com/generated_service/BUILD b/score/config_management/config_daemon/code/services/details/mw_com/generated_service/BUILD index d1b9495..75e4b0c 100644 --- a/score/config_management/config_daemon/code/services/details/mw_com/generated_service/BUILD +++ b/score/config_management/config_daemon/code/services/details/mw_com/generated_service/BUILD @@ -12,7 +12,7 @@ # ******************************************************************************* load("@rules_cc//cc:defs.bzl", "cc_library") -load("@safe_posix_platform@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") +load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") cc_library( name = "internal_config_provider_type", diff --git a/score/config_management/config_provider/code/config_provider/details/BUILD b/score/config_management/config_provider/code/config_provider/details/BUILD index 50aa9b9..2d30392 100644 --- a/score/config_management/config_provider/code/config_provider/details/BUILD +++ b/score/config_management/config_provider/code/config_provider/details/BUILD @@ -16,15 +16,15 @@ cc_library( "//score/config_management/config_provider:__subpackages__", ], deps = [ - "@score_baselibs//score/concurrency:condition_variable", - "@score_baselibs//score/concurrency/future", - "@score_logging//score/mw/log", - "@score_communication//score/mw/service:proxy_future", "//score/config_management/config_provider/code/config_provider", "//score/config_management/config_provider/code/config_provider/error", "//score/config_management/config_provider/code/persistency", "//score/config_management/config_provider/code/proxies:internal_config_provider", + "@score_baselibs//score/concurrency:condition_variable", + "@score_baselibs//score/concurrency/future", "@score_baselibs//score/language/futurecpp", + "@score_communication//score/mw/service:proxy_future", + "@score_logging//score/mw/log", ], ) @@ -40,13 +40,13 @@ cc_test( ], deps = [ ":details", - "@score_baselibs//score/concurrency:notification", - "@score_logging//score/mw/log/test/console_logging_environment", "//score/config_management/config_provider/code/config_provider/error", "//score/config_management/config_provider/code/persistency:mock", "//score/config_management/config_provider/code/persistency/error", "//score/config_management/config_provider/code/proxies:mock", "@googletest//:gtest_main", + "@score_baselibs//score/concurrency:notification", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_provider/code/config_provider/error/BUILD b/score/config_management/config_provider/code/config_provider/error/BUILD index f886aa8..72d24e8 100644 --- a/score/config_management/config_provider/code/config_provider/error/BUILD +++ b/score/config_management/config_provider/code/config_provider/error/BUILD @@ -13,7 +13,6 @@ cc_library( features = COMPILER_WARNING_FEATURES, tags = ["FUSA"], visibility = [ - "//score/config_management/config_provider:__subpackages__", ], deps = [ diff --git a/score/config_management/config_provider/code/config_provider/factory/BUILD b/score/config_management/config_provider/code/config_provider/factory/BUILD index 784ae71..b07afa9 100644 --- a/score/config_management/config_provider/code/config_provider/factory/BUILD +++ b/score/config_management/config_provider/code/config_provider/factory/BUILD @@ -10,17 +10,16 @@ cc_library( features = COMPILER_WARNING_FEATURES, tags = ["FUSA"], visibility = [ - "//score/config_management/config_daemon/test:__subpackages__", "//score/config_management/config_provider:__subpackages__", ], deps = [ - "@score_logging//score/mw/log", - "@score_communication//score/mw/service:factory", - "@score_communication//score/mw/service/backend/mw_com:single_instantiation_strategy", "//score/config_management/config_provider/code/config_provider/details", - "//score/config_management/config_provider/code/persistency/details:details", + "//score/config_management/config_provider/code/persistency/details", "//score/config_management/config_provider/code/proxies/details:details_mw_com", + "@score_communication//score/mw/service:factory", + "@score_communication//score/mw/service/backend/mw_com:single_instantiation_strategy", + "@score_logging//score/mw/log", ], ) diff --git a/score/config_management/config_provider/code/parameter_set/BUILD b/score/config_management/config_provider/code/parameter_set/BUILD index 416fc77..0f52df2 100644 --- a/score/config_management/config_provider/code/parameter_set/BUILD +++ b/score/config_management/config_provider/code/parameter_set/BUILD @@ -12,10 +12,10 @@ cc_library( "//visibility:public", ], deps = [ - "@score_baselibs//score/json", - "@score_logging//score/mw/log", "//score/config_management/config_daemon/code/data_model:parameter_set_qualifier", "//score/config_management/config_provider/code/config_provider/error", + "@score_baselibs//score/json", + "@score_logging//score/mw/log", ], ) @@ -31,10 +31,10 @@ cc_test( ], deps = [ ":parameter_set", - "@score_logging//score/mw/log/test/console_logging_environment", "//score/config_management/config_daemon/code/data_model:parameter_set_qualifier", "//score/config_management/config_provider/code/config_provider:config_provider_mock", "@googletest//:gtest_main", + "@score_logging//score/mw/log/test/console_logging_environment", ], ) diff --git a/score/config_management/config_provider/code/persistency/BUILD b/score/config_management/config_provider/code/persistency/BUILD index 102c630..563d196 100644 --- a/score/config_management/config_provider/code/persistency/BUILD +++ b/score/config_management/config_provider/code/persistency/BUILD @@ -19,8 +19,8 @@ cc_library( tags = ["FFI"], visibility = ["//score/config_management/config_provider/code:__subpackages__"], deps = [ - "@score_baselibs//score/filesystem", "//score/config_management/config_provider/code/parameter_set", + "@score_baselibs//score/filesystem", ], ) diff --git a/score/config_management/config_provider/code/persistency/details/BUILD b/score/config_management/config_provider/code/persistency/details/BUILD index 5e41f7d..d79b50b 100644 --- a/score/config_management/config_provider/code/persistency/details/BUILD +++ b/score/config_management/config_provider/code/persistency/details/BUILD @@ -18,9 +18,9 @@ load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER "//score/config_management/config_provider/code:__subpackages__", ], deps = [ - "@score_logging//score/mw/log", "//score/config_management/config_provider/code/persistency", "//score/config_management/config_provider/code/persistency/error", + "@score_logging//score/mw/log", ] + dep, ) for name, test_only, dep in [ @@ -51,8 +51,8 @@ cc_gtest_unit_test( "//score/config_management/config_provider/code/persistency:__pkg__", ], deps = [ - ":details_for_unit_test", ":details", + ":details_for_unit_test", "@score_baselibs//score/filesystem:mock", "@score_logging//score/mw/log/test/console_logging_environment", ], diff --git a/score/config_management/config_provider/code/proxies/BUILD b/score/config_management/config_provider/code/proxies/BUILD index d67d4db..7df6d0d 100644 --- a/score/config_management/config_provider/code/proxies/BUILD +++ b/score/config_management/config_provider/code/proxies/BUILD @@ -12,9 +12,9 @@ cc_library( "//visibility:public", # platform_only ], deps = [ - "@score_baselibs//score/json", "//score/config_management/config_provider/code/config_provider:initial_qualifier_state_types", "//score/config_management/config_provider/code/config_provider/error", + "@score_baselibs//score/json", "@score_baselibs//score/language/futurecpp", ], ) diff --git a/score/config_management/config_provider/code/proxies/details/BUILD b/score/config_management/config_provider/code/proxies/details/BUILD index 69cbc2b..e8d1242 100644 --- a/score/config_management/config_provider/code/proxies/details/BUILD +++ b/score/config_management/config_provider/code/proxies/details/BUILD @@ -14,12 +14,12 @@ cc_library( "//score/config_management/config_provider:__subpackages__", ], deps = [ + "//score/config_management/config_provider/code/proxies:internal_config_provider", + "//score/config_management/config_provider/code/proxies/details/mw_com/generated_service:internal_config_provider_type", "@score_baselibs//score/concurrency:condition_variable", "@score_baselibs//score/concurrency/future", "@score_baselibs//score/json", "@score_logging//score/mw/log", - "//score/config_management/config_provider/code/proxies:internal_config_provider", - "//score/config_management/config_provider/code/proxies/details/mw_com/generated_service:internal_config_provider_type", ], ) diff --git a/score/config_management/config_provider/code/proxies/details/mw_com/generated_service/BUILD b/score/config_management/config_provider/code/proxies/details/mw_com/generated_service/BUILD index 322ef0b..12255c4 100644 --- a/score/config_management/config_provider/code/proxies/details/mw_com/generated_service/BUILD +++ b/score/config_management/config_provider/code/proxies/details/mw_com/generated_service/BUILD @@ -12,7 +12,7 @@ # ******************************************************************************* load("@rules_cc//cc:defs.bzl", "cc_library") -load("@safe_posix_platform@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") +load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES") cc_library( name = "internal_config_provider_type", diff --git a/tests/cpp/test_main.cpp b/tests/cpp/test_main.cpp index f523107..4d14df3 100644 --- a/tests/cpp/test_main.cpp +++ b/tests/cpp/test_main.cpp @@ -1,15 +1,15 @@ /******************************************************************************** -* Copyright (c) 2025 Contributors to the Eclipse Foundation -* -* See the NOTICE file(s) distributed with this work for additional -* information regarding copyright ownership. -* -* This program and the accompanying materials are made available under the -* terms of the Apache License Version 2.0 which is available at -* https://www.apache.org/licenses/LICENSE-2.0 -* -* SPDX-License-Identifier: Apache-2.0 -********************************************************************************/ + * Copyright (c) 2025 Contributors to the Eclipse Foundation + * + * See the NOTICE file(s) distributed with this work for additional + * information regarding copyright ownership. + * + * This program and the accompanying materials are made available under the + * terms of the Apache License Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0 + * + * SPDX-License-Identifier: Apache-2.0 + ********************************************************************************/ #include // Function to be tested diff --git a/tests/rust/test_main.rs b/tests/rust/test_main.rs index 9390d5e..c21c0ae 100644 --- a/tests/rust/test_main.rs +++ b/tests/rust/test_main.rs @@ -1,3 +1,16 @@ +// ******************************************************************************* +// Copyright (c) 2025 Contributors to the Eclipse Foundation +// +// See the NOTICE file(s) distributed with this work for additional +// information regarding copyright ownership. +// +// This program and the accompanying materials are made available under the +// terms of the Apache License Version 2.0 which is available at +// +// +// SPDX-License-Identifier: Apache-2.0 +// ******************************************************************************* + #[test] fn test_hello() { assert_eq!(2 + 2, 4); diff --git a/third_party/traceability/tools/source_code_linker/src/source_code_linker/git_utils.py b/third_party/traceability/tools/source_code_linker/src/source_code_linker/git_utils.py index 23c0733..c8d05cb 100644 --- a/third_party/traceability/tools/source_code_linker/src/source_code_linker/git_utils.py +++ b/third_party/traceability/tools/source_code_linker/src/source_code_linker/git_utils.py @@ -123,17 +123,14 @@ def get_default_branch() -> str: try: # Check remote branches to determine if main or master exists result = subprocess.run( - ["git", "branch", "-r"], - capture_output=True, - text=True, - cwd=find_git_root() + ["git", "branch", "-r"], capture_output=True, text=True, cwd=find_git_root() ) if result.returncode == 0: branches = result.stdout.strip() # Check for main first (modern default) - if 'origin/main' in branches: + if "origin/main" in branches: return "main" - elif 'origin/master' in branches: + elif "origin/master" in branches: return "master" except Exception as e: logger.debug(f"Could not determine default branch: {e}") @@ -172,7 +169,9 @@ def get_git_hash(file_path: str) -> str: # If git hash is empty, return the default branch (main or master) if not decoded_result: default_branch = get_default_branch() - logger.debug(f"Empty git hash for {abs_path}, using default branch '{default_branch}'") + logger.debug( + f"Empty git hash for {abs_path}, using default branch '{default_branch}'" + ) return default_branch # sanity check diff --git a/third_party/traceability/tools/source_code_linker/src/source_code_linker/main.py b/third_party/traceability/tools/source_code_linker/src/source_code_linker/main.py index 49881ad..94225da 100644 --- a/third_party/traceability/tools/source_code_linker/src/source_code_linker/main.py +++ b/third_party/traceability/tools/source_code_linker/src/source_code_linker/main.py @@ -48,11 +48,11 @@ def setup_logging(self, log_level: str = "INFO") -> None: """ numeric_level = getattr(logging, log_level.upper(), None) if not isinstance(numeric_level, int): - raise ValueError(f'Invalid log level: {log_level}') + raise ValueError(f"Invalid log level: {log_level}") logging.basicConfig( level=numeric_level, - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s' + format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", ) def parse_arguments(self) -> argparse.Namespace: @@ -70,58 +70,53 @@ def parse_arguments(self) -> argparse.Namespace: # 1. Positional arguments (for Bazel integration) parser.add_argument( "inputs", - nargs='*', - help="Input files containing lists of source files to process (positional)" + nargs="*", + help="Input files containing lists of source files to process (positional)", ) # 2. Named arguments (for direct usage) parser.add_argument( "--input-files", - nargs='+', - help="Input files containing lists of source files to process (named)" + nargs="+", + help="Input files containing lists of source files to process (named)", ) parser.add_argument( - "-o", "--output", - required=True, - help="Output lobster JSON file path" + "-o", "--output", required=True, help="Output lobster JSON file path" ) parser.add_argument( - "--sources_output", - help="Output sources text file path (optional)" + "--sources_output", help="Output sources text file path (optional)" ) parser.add_argument( - "-t", "--trace", + "-t", + "--trace", choices=["code", "plantuml_alias_cpp", "plantuml_alias_req", "plantuml"], default="code", - help="Traceability mode: code, plantuml_alias_cpp, plantuml_alias_req, or plantuml" + help="Traceability mode: code, plantuml_alias_cpp, plantuml_alias_req, or plantuml", ) parser.add_argument( - "--tags", - help="Pipe-separated list of traceability tags to search for" + "--tags", help="Pipe-separated list of traceability tags to search for" ) parser.add_argument( - "-u", "--url", - default="broken_link_g/", - help="Base GitHub URL" + "-u", "--url", default="broken_link_g/", help="Base GitHub URL" ) parser.add_argument( "--log-level", choices=["DEBUG", "INFO", "WARNING", "ERROR"], default="INFO", - help="Logging level" + help="Logging level", ) args = parser.parse_args() # Determine input files from either positional or named arguments # Priority: --input-files (named) > positional inputs - if hasattr(args, 'input_files') and args.input_files: + if hasattr(args, "input_files") and args.input_files: args.inputs = args.input_files else: args.inputs = args.inputs or [] @@ -134,7 +129,7 @@ def parse_arguments(self) -> argparse.Namespace: # Auto-generate sources_output if not provided (but different from input) if not args.sources_output: - base_name = args.output.replace('.lobster', '') + base_name = args.output.replace(".lobster", "") args.sources_output = f"{base_name}_generated_sources.txt" return args @@ -193,7 +188,7 @@ def process_source_files( source_files: List[str], github_base_url: str, tags: List[str], - trace_mode: str + trace_mode: str, ) -> List[dict]: """ Process all source files to extract traceability information. @@ -288,7 +283,7 @@ def run(self) -> None: merged_result, list(source_files), # Convert set back to list args.output, - args.sources_output + args.sources_output, ) logger.info("Source code linking process completed successfully") diff --git a/third_party/traceability/tools/source_code_linker/src/source_code_linker/parser.py b/third_party/traceability/tools/source_code_linker/src/source_code_linker/parser.py index b67fcdb..1007244 100644 --- a/third_party/traceability/tools/source_code_linker/src/source_code_linker/parser.py +++ b/third_party/traceability/tools/source_code_linker/src/source_code_linker/parser.py @@ -44,7 +44,9 @@ def __init__(self, git_hash_func: Optional[Callable[[str], str]] = None): "' trace:", ] - def extract_id_from_line_standard(self, line: str, tags: List[str]) -> Optional[str]: + def extract_id_from_line_standard( + self, line: str, tags: List[str] + ) -> Optional[str]: """ Parse a single line to extract the ID from standard source files. @@ -70,7 +72,9 @@ def extract_id_from_line_standard(self, line: str, tags: List[str]) -> Optional[ return id_part.split()[0] if id_part else None return None - def extract_id_from_plantuml_alias(self, line: str, nodes: List[str]) -> Optional[str]: + def extract_id_from_plantuml_alias( + self, line: str, nodes: List[str] + ) -> Optional[str]: """ Parse a single line to extract the ID from PlantUML alias nodes (e.g., $TopEvent, $BasicEvent). @@ -87,25 +91,27 @@ def extract_id_from_plantuml_alias(self, line: str, nodes: List[str]) -> Optiona The extracted ID if found, None otherwise. """ # Step 1: Clean the line of \n, and \\n - cleaned_line = line.replace('\n', '').replace('\\n', '') + cleaned_line = line.replace("\n", "").replace("\\n", "") # Step 2: Remove all single and double quotes - cleaned_line = cleaned_line.replace('"', '').replace("'", '').replace("{",'').strip() + cleaned_line = ( + cleaned_line.replace('"', "").replace("'", "").replace("{", "").strip() + ) # Step 3: Search for nodes and capture the ID for node in nodes: if cleaned_line.startswith(node): # Scan for Macro - if node.startswith('$'): - parts = cleaned_line.split(',') + if node.startswith("$"): + parts = cleaned_line.split(",") if len(parts) >= 2: - return parts[1].strip().rstrip(')') - else: # scan for normal plantuml element + return parts[1].strip().rstrip(")") + else: # scan for normal plantuml element # Remove the identifier from the start of the line - parts = cleaned_line[len(node):].strip().split() + parts = cleaned_line[len(node) :].strip().split() # If there are at least 3 parts and the second-to-last is 'as', return the last part - if len(parts) >= 3 and parts[-2] == 'as': + if len(parts) >= 3 and parts[-2] == "as": return parts[-1], node # If there's only one part after the identifier, return it @@ -125,7 +131,7 @@ def extract_id_from_plantuml_element(self, line: str, node: str) -> Optional[str Returns: Optional[str]: The extracted ID if found, None otherwise. """ - cleaned_line = line.replace('\n', '').replace('\\n', '').strip() + cleaned_line = line.replace("\n", "").replace("\\n", "").strip() # Escape the node name for safe regex usage escaped_node = re.escape(node) @@ -133,14 +139,16 @@ def extract_id_from_plantuml_element(self, line: str, node: str) -> Optional[str # Special handling for interface methods (e.g., +GetNumber(), +SetNumber()) if node == "interface": # Look for method pattern: +method_name() - method_pattern = r'^\s*\+(\w+)\(' + method_pattern = r"^\s*\+(\w+)\(" match = re.match(method_pattern, cleaned_line) if match: method_name = match.group(1) return method_name # Pattern 1: "SampleLibrary" as SL - quoted_with_alias = re.search(rf'^\s*{escaped_node}\s+"([^"]+)"\s+as\s+(\w+)', cleaned_line) + quoted_with_alias = re.search( + rf'^\s*{escaped_node}\s+"([^"]+)"\s+as\s+(\w+)', cleaned_line + ) if quoted_with_alias: return quoted_with_alias.group(2) # Return alias @@ -150,17 +158,14 @@ def extract_id_from_plantuml_element(self, line: str, node: str) -> Optional[str return quoted_no_alias.group(1) # Return name # Pattern 3: SampleLibrary - simple_no_alias = re.search(rf'^\s*{escaped_node}\s+(\w+)', cleaned_line) + simple_no_alias = re.search(rf"^\s*{escaped_node}\s+(\w+)", cleaned_line) if simple_no_alias: return simple_no_alias.group(1) # Return name return None def parse_standard_file( - self, - source_file: str, - github_base_url: str, - tags: List[str] + self, source_file: str, github_base_url: str, tags: List[str] ) -> Dict[str, List[str]]: """ Extract tags from standard source files (non-PlantUML files). @@ -191,10 +196,7 @@ def parse_standard_file( return requirement_mapping def parse_plantuml_file( - self, - source_file: str, - github_base_url: str, - nodes: List[str] + self, source_file: str, github_base_url: str, nodes: List[str] ) -> Dict[str, List[str]]: """ Extract tags from PlantUML files (.puml files). @@ -217,16 +219,18 @@ def parse_plantuml_file( for line_number, line in enumerate(f): line_number = line_number + 1 - cleaned_line = line.replace('\n', '').replace('\\n', '').strip() + cleaned_line = line.replace("\n", "").replace("\\n", "").strip() # Track interface context for proper method prefixing if "interface" in nodes: # Check if this line defines an interface - interface_name = self.extract_id_from_plantuml_element(line, "interface") - if interface_name and not cleaned_line.strip().startswith('+'): + interface_name = self.extract_id_from_plantuml_element( + line, "interface" + ) + if interface_name and not cleaned_line.strip().startswith("+"): # This is an interface definition, not a method current_interface = interface_name - elif cleaned_line.strip() == '}': + elif cleaned_line.strip() == "}": # End of interface block current_interface = None @@ -235,7 +239,11 @@ def parse_plantuml_file( req_id = self.extract_plantuml_element(line, node) if req_id: # For interface methods, prefix with interface name - if node == "interface" and current_interface and cleaned_line.strip().startswith('+'): + if ( + node == "interface" + and current_interface + and cleaned_line.strip().startswith("+") + ): req_id = f"{current_interface}.{req_id}" link = f"{github_base_url}/blob/{hash}/{source_file}#L{line_number}" @@ -255,7 +263,7 @@ def extract_plantuml_element(self, line: str, node: str) -> Optional[str]: Optional[str]: The extracted ID if found, None otherwise. """ # For plantuml_alias mode (nodes starting with $), use the alias extraction logic - if node.startswith('$'): + if node.startswith("$"): return self.extract_id_from_plantuml_alias(line, [node]) else: # For general plantuml mode, use the element extraction logic @@ -267,7 +275,7 @@ def parse_file( github_base_url: str, tags: List[str], mode: str = "code", - nodes: Optional[List[str]] = None + nodes: Optional[List[str]] = None, ) -> Dict[str, List[str]]: """ Dispatch to appropriate parser based on file extension and mode. @@ -282,8 +290,12 @@ def parse_file( Returns: Dict[str, List[str]]: mapping of requirement IDs to GitHub URLs. """ - if source_file.endswith('.puml'): - if mode == "plantuml_alias_cpp" or mode == "plantuml_alias_req" or mode == "plantuml": + if source_file.endswith(".puml"): + if ( + mode == "plantuml_alias_cpp" + or mode == "plantuml_alias_req" + or mode == "plantuml" + ): # For plantuml modes: process all tags without filtering if tags: return self.parse_plantuml_file(source_file, github_base_url, tags) diff --git a/third_party/traceability/tools/source_code_linker/src/source_code_linker/transformer.py b/third_party/traceability/tools/source_code_linker/src/source_code_linker/transformer.py index ee88e85..f2931df 100644 --- a/third_party/traceability/tools/source_code_linker/src/source_code_linker/transformer.py +++ b/third_party/traceability/tools/source_code_linker/src/source_code_linker/transformer.py @@ -32,20 +32,18 @@ def __init__(self): "data": [], "generator": "lobster_cpp", "schema": "lobster-imp-trace", - "version": 3 + "version": 3, } self.lobster_reqs_template = { "data": [], "generator": "lobster-trlc", "schema": "lobster-req-trace", - "version": 4 + "version": 4, } def transform_to_code_format( - self, - requirement_mapping: Dict[str, List[str]], - source_file: str + self, requirement_mapping: Dict[str, List[str]], source_file: str ) -> Dict[str, Any]: """ Transform parsed data to lobster code format. @@ -85,11 +83,9 @@ def transform_to_code_format( "just_up": [], "just_down": [], "just_global": [], - "refs": [ - f"req {req_id}" - ], + "refs": [f"req {req_id}"], "language": "cpp", - "kind": "Function" + "kind": "Function", } result["data"].append(codetag) @@ -100,7 +96,7 @@ def transform_to_requirements_format( self, requirement_mapping: Dict[str, List[str]], source_file: str, - mode: str = "plantuml" + mode: str = "plantuml", ) -> Dict[str, Any]: """ Transform parsed data to lobster requirements format. @@ -145,9 +141,7 @@ def transform_to_requirements_format( return result def transform_to_interface_format( - self, - requirement_mapping: Dict[str, List[str]], - source_file: str + self, requirement_mapping: Dict[str, List[str]], source_file: str ) -> Dict[str, Any]: """ Transform parsed data to lobster interface requirements format. @@ -199,10 +193,7 @@ def transform_to_interface_format( return result def transform_parsed_data( - self, - requirement_mapping: Dict[str, List[str]], - source_file: str, - mode: str + self, requirement_mapping: Dict[str, List[str]], source_file: str, mode: str ) -> Dict[str, Any]: """ Transform parsed data to the specified output format. @@ -218,9 +209,13 @@ def transform_parsed_data( if mode == "plantuml_alias_cpp": return self.transform_to_code_format(requirement_mapping, source_file) elif mode == "plantuml_alias_req": - return self.transform_to_requirements_format(requirement_mapping, source_file, mode) + return self.transform_to_requirements_format( + requirement_mapping, source_file, mode + ) elif mode == "plantuml": - return self.transform_to_requirements_format(requirement_mapping, source_file, mode) + return self.transform_to_requirements_format( + requirement_mapping, source_file, mode + ) else: # mode == "code" (default) return self.transform_to_code_format(requirement_mapping, source_file) @@ -242,7 +237,7 @@ def merge_results(self, results: List[Dict[str, Any]]) -> Dict[str, Any]: "data": [], "generator": results[0].get("generator", "lobster_cpp"), "schema": results[0].get("schema", "lobster-imp-trace"), - "version": results[0].get("version", 3) + "version": results[0].get("version", 3), } # Collect all data entries diff --git a/third_party/traceability/tools/source_code_linker/src/source_code_linker/writer.py b/third_party/traceability/tools/source_code_linker/src/source_code_linker/writer.py index ee28b87..393eb42 100644 --- a/third_party/traceability/tools/source_code_linker/src/source_code_linker/writer.py +++ b/third_party/traceability/tools/source_code_linker/src/source_code_linker/writer.py @@ -123,8 +123,7 @@ def format_lobster_data(self, data: Dict[str, Any]) -> Dict[str, Any]: # Ensure data is sorted by tag for consistent output if "data" in formatted_data and isinstance(formatted_data["data"], list): formatted_data["data"] = sorted( - formatted_data["data"], - key=lambda x: x.get("tag", "") + formatted_data["data"], key=lambda x: x.get("tag", "") ) return formatted_data @@ -134,7 +133,7 @@ def write_output_files( lobster_data: Dict[str, Any], source_files: list, lobster_output_path: str, - sources_output_path: str + sources_output_path: str, ) -> None: """ Write all output files. @@ -164,11 +163,17 @@ def write_output_files( # Check if sources_output_path is one of the input files try: # Try to determine if this is an input file by checking if we can read from it - with open(sources_output_path, 'r') as f: + with open(sources_output_path, "r") as f: content = f.read().strip() # If file contains source file paths, it's likely an input file - if content and not content.startswith('[') and not content.startswith('{'): - logger.debug(f"Skipping sources file write - appears to be input file: {sources_output_path}") + if ( + content + and not content.startswith("[") + and not content.startswith("{") + ): + logger.debug( + f"Skipping sources file write - appears to be input file: {sources_output_path}" + ) return except (IOError, PermissionError): pass @@ -176,4 +181,6 @@ def write_output_files( # Write the sources file self.write_sources_file(source_files, sources_output_path) - logger.info(f"Successfully wrote {len(formatted_data['data'])} entries to output files") + logger.info( + f"Successfully wrote {len(formatted_data['data'])} entries to output files" + ) diff --git a/third_party/traceability/tools/trlc_renderer/trlc_renderer.py b/third_party/traceability/tools/trlc_renderer/trlc_renderer.py index 694e194..ca7f056 100644 --- a/third_party/traceability/tools/trlc_renderer/trlc_renderer.py +++ b/third_party/traceability/tools/trlc_renderer/trlc_renderer.py @@ -28,15 +28,24 @@ 3: "^^^^^^^^^^", } + class TRLCRenderer: - def __init__(self, input_directory: str, output_path: str, mapping_file: str = None, debug: bool = False): + def __init__( + self, + input_directory: str, + output_path: str, + mapping_file: str = None, + debug: bool = False, + ): self.input_directory = input_directory self.output_path = output_path self.debug = debug self.symbols = None self.requirements = None self.req_objects = None - self.type_mapping = self.load_type_mapping(mapping_file) # Load the mapping file if provided + self.type_mapping = self.load_type_mapping( + mapping_file + ) # Load the mapping file if provided if self.debug: logging.basicConfig(level=logging.DEBUG) @@ -44,7 +53,7 @@ def __init__(self, input_directory: str, output_path: str, mapping_file: str = N def load_type_mapping(self, mapping_file: str) -> dict: """Load the requirement type mapping from a JSON file or return an empty mapping.""" if mapping_file: - with open(mapping_file, 'r') as file: + with open(mapping_file, "r") as file: mapping = json.load(file) logging.debug("Loaded type mapping successfully.") return mapping @@ -79,7 +88,14 @@ def convert_symbols_to_objects(self): if from_node.is_root: continue - found_node = next((to_node for to_node in to_tree.children if to_node.name == from_node.name), None) + found_node = next( + ( + to_node + for to_node in to_tree.children + if to_node.name == from_node.name + ), + None, + ) if found_node is None: to_tree.append(from_node) break @@ -93,7 +109,7 @@ def convert_symbols_to_objects(self): def apply_case_format(self, value: str, case_format: str) -> str: """Apply the specified case format to a string.""" if case_format == "snake_case": - return re.sub(r'(? str: def generate_need_id(self, reqobj) -> str: """Generates a unique identifier for a requirement object based on its type, package, - and its name using the format specified in the mapping file.""" + and its name using the format specified in the mapping file.""" req_type = reqobj.n_typ.name req_package = reqobj.n_package.name req_name = reqobj.name @@ -118,44 +134,67 @@ def generate_need_id(self, reqobj) -> str: # Get the casing formats id_case_format = self.type_mapping.get(req_type, {}).get("id_case_format", {}) - formatted_type = self.apply_case_format(mapped_type, id_case_format.get("type", "")) - formatted_package = self.apply_case_format(req_package, id_case_format.get("package", "")) - formatted_name = self.apply_case_format(req_name, id_case_format.get("name", "")) + formatted_type = self.apply_case_format( + mapped_type, id_case_format.get("type", "") + ) + formatted_package = self.apply_case_format( + req_package, id_case_format.get("package", "") + ) + formatted_name = self.apply_case_format( + req_name, id_case_format.get("name", "") + ) # Format the ID using the specified format - return id_format.format(type=formatted_type, package=formatted_package, name=formatted_name) + return id_format.format( + type=formatted_type, package=formatted_package, name=formatted_name + ) def generate_link_id_score(self, link, objects) -> str: """Generates a unique identifier for a link object based on its identifier and version, - using the same format as defined in generate_id_format.""" - linkobj = objects[link['item']] + using the same format as defined in generate_id_format.""" + linkobj = objects[link["item"]] # Use the same ID format for links return self.generate_need_id(linkobj) + f"@{link['LinkVersion']}" def get_link_attribute_value(self, value) -> str: """Generates the attribute value for link attributes.""" - return ', '.join(self.generate_link_id_score(v, self.req_objects) for v in value if v is not None) + return ", ".join( + self.generate_link_id_score(v, self.req_objects) + for v in value + if v is not None + ) def map_requirement_type(self, req_type: str) -> tuple: """Maps the requirement type using the loaded mapping or returns the original type and attributes.""" mapping = self.type_mapping.get(req_type) if mapping is None: - logging.debug(f"Type {req_type} not found in mapping, using {req_type} with default attributes.") - return req_type, [], [] # Return original type and empty attributes if not found + logging.debug( + f"Type {req_type} not found in mapping, using {req_type} with default attributes." + ) + return ( + req_type, + [], + [], + ) # Return original type and empty attributes if not found # Extract the mapped type, attributes, and links mapped_type = mapping.get("mapped_type", req_type) attributes = mapping.get("attributes", []) links = mapping.get("links", []) - return mapped_type, attributes, links # Return mapped type, attributes, and links + return ( + mapped_type, + attributes, + links, + ) # Return mapped type, attributes, and links + def _convert_to_title(self, identifier: str) -> str: - transformed_title="" + transformed_title = "" for i in identifier: if i.isupper(): - transformed_title+=" "+i + transformed_title += " " + i else: - transformed_title+=i + transformed_title += i return transformed_title.join(" ") def render_restructured_text_file(self): @@ -169,7 +208,9 @@ def render_restructured_text_file(self): if node.is_leaf: reqobj = self.req_objects[node.name] req_type = reqobj.n_typ.name # Get the requirement type - mapped_type, attributes_to_export, links_to_export = self.map_requirement_type(req_type) # Use mapping + mapped_type, attributes_to_export, links_to_export = ( + self.map_requirement_type(req_type) + ) # Use mapping title = self._convert_to_title(node.name) id = self.generate_need_id(reqobj) @@ -181,8 +222,8 @@ def render_restructured_text_file(self): reqobjpython_dict = reqobj.to_python_dict() for attr in attributes_to_export: # Split the attribute and default value if specified - if '=' in attr: - key, default_value = map(str.strip, attr.split('=', 1)) + if "=" in attr: + key, default_value = map(str.strip, attr.split("=", 1)) else: key, default_value = attr, "Not specified" @@ -198,12 +239,19 @@ def render_restructured_text_file(self): else: # Handle regular attributes if isinstance(value, list): - attr_val = ', '.join( - str(v) if not isinstance(v, dict) else ', '.join(f"{v2}" for v2 in v.values()) - for v in value if v is not None + attr_val = ", ".join( + str(v) + if not isinstance(v, dict) + else ", ".join(f"{v2}" for v2 in v.values()) + for v in value + if v is not None ) else: - attr_val = str(value) if not isinstance(value, dict) else ', '.join(f"{v2}" for v2 in value.values()) + attr_val = ( + str(value) + if not isinstance(value, dict) + else ", ".join(f"{v2}" for v2 in value.values()) + ) file.write(f" :{key}: {attr_val}\n") @@ -232,9 +280,13 @@ def run(self): def argument_parser() -> argparse.ArgumentParser: parser = argparse.ArgumentParser() parser.add_argument("-o", "--output", required=True, help="Output file path") - parser.add_argument("-m", "--mapping", help="Path to the JSON mapping file (optional)") - parser.add_argument("--debug", action='store_true', help="Enable debug output") - parser.add_argument("--debugpy", action='store_true', help="Enable debugpy for debugging") + parser.add_argument( + "-m", "--mapping", help="Path to the JSON mapping file (optional)" + ) + parser.add_argument("--debug", action="store_true", help="Enable debug output") + parser.add_argument( + "--debugpy", action="store_true", help="Enable debugpy for debugging" + ) return parser