Make version mandatory & further fixes regarding process (#634)

This is making the version mandatory.

The other changes in the tool_requirements etc. are needed to enable building for the newest process commit done as a git_override here.

Author: MaximilianSoerenPollak

MODULE.bazel

@@ -70,6 +70,11 @@ http_file(
 )
 
 bazel_dep(name = "score_process", version = "2.0.1")
+git_override(
+    module_name = "score_process",
+    commit = "292ec1c913a88ed1b724e33fdae658df6dc7b033",
+    remote = "https://github.com/eclipse-score/process_description",
+)
 
 # Provide the tools from the devcontainer to Bazel
 bazel_dep(name = "score_devcontainer", version = "1.8.0")

MODULE.bazel.lock

@@ -1,5 +1,6 @@
 :::{dec_rec} Decision Record 001: Test results in Docs-As-Code Workflows
 :id: dec_rec__dac__001_test_results_in_workflows
+:version: 1
 :status: accepted
 :context: Need to embed test results into docs, but tests are slow.
 :decision: Run quick docs checks and tests in parallel, then full docs generation sequentially.

docs/internals/decisions/001-test-results-in-workflow.md

@@ -460,21 +460,6 @@ Versioning
   * Process
   * Non-Functional
 
-.. tool_req:: Enables marking requirements as "covered"
-  :id: tool_req__docs_req_attr_reqcov
-  :tags: Requirements
-  :implemented: PARTIAL
-  :version: 1
-  :satisfies: gd_req__req_attr_req_cov
-
-  Docs as code shall shall enable marking requirements as covered by their linked children.
-
-  Attribute ``reqcov`` must be one of the following values:
-      * Yes
-      * No
-
-  .. note::
-     No concept yet, as parents are generally not aware of their children.
 
 .. tool_req:: Support requirements test coverage
   :id: tool_req__docs_req_attr_testcov

docs/internals/requirements/requirements.rst

@@ -19,6 +19,7 @@ needs_types_base_options:
     testlink: ^https://github.com/.*
     # Version will be mandatory global option in future releases
     # For now giving grace periods to consumers
+  mandatory_options:
     # req-Id: tool_req__docs_common_attr_version
     version: ^[0-9]*$
 
@@ -265,8 +266,6 @@ needs_types:
       security: ^(YES|NO)$
       valid_from: ^v(0|[1-9]\d*)\.(0|[1-9]\d*)(\.(0|[1-9]\d*))?$
     optional_options:
-      # req-Id: tool_req__docs_req_attr_reqcov
-      reqcovered: ^(YES|NO)$
       # req-Id: tool_req__docs_req_attr_testcov
       testcovered: ^(YES|NO)$
       hash: ^.*$
@@ -301,8 +300,6 @@ needs_types:
       # req-Id: tool_req__docs_req_link_covers_aou
       covers: aou_req
     optional_options:
-      # req-Id: tool_req__docs_req_attr_reqcov
-      reqcovered: ^(YES|NO)$
       # req-Id: tool_req__docs_req_attr_testcov
       testcovered: ^(YES|NO)$
       hash: ^.*$
@@ -336,8 +333,6 @@ needs_types:
       # req-Id: tool_req__docs_req_link_covers_aou
       covers: aou_req
     optional_options:
-      # req-Id: tool_req__docs_req_attr_reqcov
-      reqcovered: ^(YES|NO)$
       # req-Id: tool_req__docs_req_attr_testcov
       testcovered: ^(YES|NO)$
       hash: ^.*$
@@ -358,8 +353,6 @@ needs_types:
       satisfies: gd_req, stkh_req, feat_req, comp_req
     optional_options:
       tags: ^.*$
-      # req-Id: tool_req__docs_req_attr_reqcov
-      reqcovered: ^(YES|NO)$
       # req-Id: tool_req__docs_req_attr_testcov
       testcovered: ^(YES|NO)$
       hash: ^.*$
@@ -388,8 +381,6 @@ needs_types:
       # req-Id: tool_req__docs_common_attr_description
       content: ^[\s\S]+$
     optional_options:
-      # req-Id: tool_req__docs_req_attr_reqcov
-      reqcovered: ^(YES|NO)$
       # req-Id: tool_req__docs_req_attr_testcov
       testcovered: ^(YES|NO)$
       hash: ^.*$

src/extensions/score_metamodel/metamodel.yaml

@@ -35,6 +35,7 @@
 .. std_wp:: This is a test
    :id: std_wp__test_options__abce
    :status: active
+   :version: 1
    :expect_not: attribute
 
 
@@ -558,6 +559,7 @@
 
 .. feat_sec_threat:: Valid threat
    :id: feat_sec_threat__test_options__ok_3
+   :version: 1
    :threat_id: MT_01_03
    :status: valid
    :expect_not: feat_sec_threat__test_options__ok_3
@@ -621,6 +623,7 @@
 
 .. feat_sec_ana:: Valid threat scenario
    :id: feat_sec_ana__test_options__ok_8
+   :version: 1
    :threat_scenario_id: SC_01_02
    :status: valid
    :sufficient: yes
@@ -634,6 +637,7 @@
 
 .. feat_sec_ana:: Valid threat scenario with optional mitigation_issue
    :id: feat_sec_ana__test_options__ok_9
+   :version: 1
    :threat_scenario_id: SC_01_03
    :status: invalid
    :sufficient: no

src/extensions/score_metamodel/tests/rst/options/test_options_options.rst

@@ -67,7 +67,8 @@ def default_options():
 def _parse_need_type(
     directive_name: str,
     yaml_data: dict[str, Any],
-    global_base_opts: dict[str, Any],
+    global_base_optional_opts: dict[str, Any],
+    global_base_mandatory_opts: dict[str, Any],
 ):
     """Build a single ScoreNeedType dict from the metamodel entry, incl defaults."""
 
@@ -77,14 +78,15 @@ def _parse_need_type(
     optional_options = yaml_data.get("optional_options", {})
     mandatory_links = yaml_data.get("mandatory_links", {})
     optional_links = yaml_data.get("optional_links", {})
+    global_opts = global_base_optional_opts | global_base_mandatory_opts
 
     overlap_checks: list[tuple[str, dict[str, Any], str, dict[str, Any]]] = [
         ("mandatory_options", mandatory_options, "optional_options", optional_options),
-        ("mandatory_options", mandatory_options, "global_base_opts", global_base_opts),
-        ("optional_options", optional_options, "global_base_opts", global_base_opts),
+        ("mandatory_options", mandatory_options, "global_base_opts", global_opts),
+        ("optional_options", optional_options, "global_base_opts", global_opts),
         ("mandatory_links", mandatory_links, "optional_links", optional_links),
-        ("mandatory_links", mandatory_links, "global_base_opts", global_base_opts),
-        ("optional_links", optional_links, "global_base_opts", global_base_opts),
+        ("mandatory_links", mandatory_links, "global_base_opts", global_opts),
+        ("optional_links", optional_links, "global_base_opts", global_opts),
     ]
     errors: list[str] = []
     for a_name, a, b_name, b in overlap_checks:
@@ -99,8 +101,8 @@ def _parse_need_type(
         "prefix": yaml_data.get("prefix", f"{directive_name}__"),
         "tags": yaml_data.get("tags", []),
         "parts": yaml_data.get("parts", 3),
-        "mandatory_options": mandatory_options,
-        "optional_options": optional_options | global_base_opts,
+        "mandatory_options": mandatory_options | global_base_mandatory_opts,
+        "optional_options": optional_options | global_base_optional_opts,
         "mandatory_links_str": mandatory_links,
         "mandatory_links": None,
         "optional_links_str": optional_links,
@@ -123,6 +125,7 @@ def _parse_need_type(
 def _parse_needs_types(
     types_dict: dict[str, Any],
     global_base_options_optional_opts: dict[str, Any],
+    global_base_mandatory_options: dict[str, Any],
 ) -> dict[str, ScoreNeedType]:
     """Parse the 'needs_types' section of the metamodel.yaml."""
 
@@ -133,7 +136,10 @@ def _parse_needs_types(
         assert isinstance(directive_data, dict)
 
         needs_types[directive_name], parsing_errors = _parse_need_type(
-            directive_name, directive_data, global_base_options_optional_opts
+            directive_name,
+            directive_data,
+            global_base_options_optional_opts,
+            global_base_mandatory_options,
         )
         all_errors.extend(parsing_errors)
 
@@ -218,6 +224,9 @@ def load_metamodel_data(yaml_path: Path | None = None) -> MetaModelData:
     global_base_options_optional_opts = data.get("needs_types_base_options", {}).get(
         "optional_options", {}
     )
+    global_base_options_mandatory_opts = data.get("needs_types_base_options", {}).get(
+        "mandatory_options", {}
+    )
 
     # Get the stop_words and weak_words as separate lists
     prohibited_words_checks = _parse_prohibited_words(
@@ -226,7 +235,9 @@ def load_metamodel_data(yaml_path: Path | None = None) -> MetaModelData:
 
     # Convert "types" from {directive_name: {...}, ...} to a list of dicts
     needs_types = _parse_needs_types(
-        data.get("needs_types", {}), global_base_options_optional_opts
+        data.get("needs_types", {}),
+        global_base_options_optional_opts,
+        global_base_options_mandatory_opts,
     )
 
     return MetaModelData(