fixes exeternal prefix cleaning (#61)

Author: MaximilianSoerenPollak

MODULE.bazel

@@ -66,7 +66,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
 bazel_dep(name = "aspect_rules_lint", version = "1.4.2")
 
 # PlantUML for docs
-bazel_dep(name = "rules_java", version = "8.6.3")
+bazel_dep(name = "rules_java", version = "8.11.0")
 
 http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
 

src/extensions/score_metamodel/BUILD

@@ -33,6 +33,8 @@ score_py_pytest(
     size = "small",
     srcs = glob(["tests/*.py"]),
     # All requirements already in the library so no need to have it double
-    data = ["//src:test_rst_files"] + glob(["**/*.rst"]),
+    data = ["//src:test_rst_files"] + glob(
+        ["tests/**/*.rst"],
+    ),
     deps = [":score_metamodel"],
 )

src/extensions/score_metamodel/checks/check_options.py

@@ -53,10 +53,10 @@ def validate_fields(
     :param field_type: A string indicating the field type ('option' or 'link').
     """
 
-    def remove_prefix(values: list[str], prefixes: list[str]) -> list[str]:
+    def remove_prefix(word: str, prefixes: list[str]) -> str:
         # Memory and allocation wise better to use a generator here.
         # Removes any prefix allowed by configuration, if prefix is there.
-        return [word.removeprefix(p) for word in values for p in prefixes]
+        return [word.removeprefix(prefix) for prefix in prefixes][0]
 
     for field, pattern in fields.items():
         raw_value: str | list[str] | None = need.get(field, None)
@@ -77,10 +77,10 @@ def remove_prefix(values: list[str], prefixes: list[str]) -> list[str]:
             values = [str(raw_value)]
 
         # The filter ensures that the function is only called when needed.
-        if field_type == "link" and allowed_prefixes:
-            values = remove_prefix(values, allowed_prefixes)
 
         for value in values:
+            if field_type == "link" and allowed_prefixes:
+                value = remove_prefix(value, allowed_prefixes)
             try:
                 if not re.match(pattern, value):
                     log.warning_for_option(

src/extensions/score_metamodel/metamodel.yaml

@@ -227,7 +227,7 @@ needs_types:
       safety: "^(QM|ASIL_B|ASIL_D)$"
       status: "^(valid|invalid)$"
     mandatory_links:
-      satisfies: "^stkh_req__.*$"
+      satisfies: "^.*_req__.*$"
     optional_options:
       codelink: "^.*$"
       testlink: "^.*$"

src/extensions/score_metamodel/tests/rst/attributes/test_attributes_external_prefix.rst

@@ -0,0 +1,36 @@
+..
+   # *******************************************************************************
+   # 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
+   # *******************************************************************************
+
+#CHECK: check_options
+
+.. Cleaning of 'external prefix' before checking regex confirmity
+#EXPECT-NOT tool_req__test_abcd.satisfies (PROCESS_doc_getstrt__req__process): does not follow pattern `^doc_.+$`.
+
+.. tool_req:: This is a test
+   :id: tool_req__test_abcd
+   :satisfies: PROCESS_doc_getstrt__req__process
+
+   This should not give a warning
+
+
+.. Also make sure it works wit lists of links
+
+#EXPECT-NOT: tool_req__test_aaaa.satisfies (PROCESS_doc_getstrt__req__process): does not follow pattern `^doc_.+$`.
+#EXPECT-NOT: tool_req__test_aaaa.satisfies (PROCESS_gd_guidl__req__engineering): does not follow pattern `^gd_.+$`.
+
+.. tool_req:: This is a test
+   :id: tool_req__test_aaaa
+   :satisfies: PROCESS_doc_getstrt__req__process;PROCESS_gd_guidl__req__engineering
+
+   This should give a warning

src/extensions/score_metamodel/tests/rst/conf.py

@@ -20,3 +20,11 @@
     "sphinx_needs",
     "score_metamodel",
 ]
+
+needs_external_needs = [
+    {
+        "base_url": "https://eclipse-score.github.io/process_description/main/",
+        "json_url": "https://eclipse-score.github.io/process_description/main/needs.json",
+        "id_prefix": "process_",
+    }
+]