Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 bazel/rules/rules_score/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ architectural_design(
```

**`bazel build`** — runs `puml_parser` on every `.puml` file, producing:
- a `.fbs.bin` FlatBuffers binary (diagram AST) — consumed by archver validation
- a `.fbs.bin` FlatBuffers binary (diagram AST) — consumed by validation/core checks
- a `.lobster` traceability file (Interface elements only) — consumed by LOBSTER
- a `plantuml_links.json` — consumed by the `clickable_plantuml` Sphinx extension

Expand Down Expand Up @@ -195,7 +195,7 @@ dependable_element(
**`bazel build`** — generates a complete HTML documentation zip via Sphinx.
Internally:
1. `_dependable_element_index` generates an `index.rst` aggregating all
artifacts, runs archver architecture validation as a subrule, and
artifacts, runs validation/core architecture checks as a subrule, and
produces a DE-level LOBSTER report (`lobster_de.conf` template covering
Feature Req → Component Req → Architecture → Public API → Failure Modes).
2. `sphinx_module` compiles all RST sources + diagrams into an HTML zip.
Expand Down
50 changes: 25 additions & 25 deletions bazel/rules/rules_score/private/dependable_element.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ def _collect_architecture_components(ctx):

return all_components

def _run_archver_validation(ctx, arch_json, static_fbs_files):
def _run_validation(ctx, arch_json, static_fbs_files):
"""Run the architecture verifier tool against a pre-built JSON file.

Args:
Expand All @@ -631,27 +631,27 @@ def _run_archver_validation(ctx, arch_json, static_fbs_files):
static_fbs_files: List of static FlatBuffer files to verify against

Returns:
archver_log File object
validation_log File object
"""

archver_log = ctx.actions.declare_file(ctx.label.name + "/archver.log")
validation_log = ctx.actions.declare_file(ctx.label.name + "/validation.log")

archver_args = ctx.actions.args()
archver_args.add("--architecture-json", arch_json)
archver_args.add_all("--static-fbs", static_fbs_files)
archver_args.add("--output", archver_log)
validation_args = ctx.actions.args()
validation_args.add("--architecture-json", arch_json)
validation_args.add_all("--component-fbs", static_fbs_files)
validation_args.add("--output", validation_log)

# ctx.actions.run will fail the build if archver returns non-zero exit code
# ctx.actions.run will fail the build if validation_cli returns non-zero exit code
ctx.actions.run(
inputs = [arch_json] + static_fbs_files,
outputs = [archver_log],
executable = ctx.executable._archver,
arguments = [archver_args],
progress_message = "Verifying architecture: %s" % ctx.label.name,
mnemonic = "ArchVerify",
outputs = [validation_log],
executable = ctx.executable._validation_cli,
arguments = [validation_args],
progress_message = "Running validation: %s" % ctx.label.name,
mnemonic = "ArchitectureValidate",
)

return archver_log
return validation_log

# ============================================================================
# Index Generation Rule Implementation
Expand Down Expand Up @@ -780,7 +780,7 @@ def _dependable_element_index_impl(ctx):
)

# =========================================================================
# Architecture Verification: build current-architecture JSON and run archver
# Architecture Verification: build current-architecture JSON and run validation
# =========================================================================

# Collect the current architecture from all components (via aspect) and
Expand All @@ -800,13 +800,13 @@ def _dependable_element_index_impl(ctx):
if ArchitecturalDesignInfo in ad:
static_fbs_files.extend(ad[ArchitecturalDesignInfo].static.to_list())

# Run architecture verifier; build fails automatically on non-zero exit
archver_log = _run_archver_validation(ctx, arch_json, static_fbs_files)
# Run validation; build fails automatically on non-zero exit
validation_log = _run_validation(ctx, arch_json, static_fbs_files)

# Both outputs are included so archver always runs in a default build.
# archver_log is also exposed in the debug output group for explicit access.
# Both outputs are included so validation always runs in a default build.
# validation_log is also exposed in the debug output group for explicit access.
output_files.append(arch_json)
output_files.append(archver_log)
output_files.append(validation_log)

# =========================================================================
# Safety Certification Validation: certified scope and integrity level checks
Expand Down Expand Up @@ -961,7 +961,7 @@ def _dependable_element_index_impl(ctx):
lobster_report = lobster_report_file,
lobster_html_report = lobster_html_report,
),
OutputGroupInfo(debug = depset([archver_log])),
OutputGroupInfo(debug = depset([validation_log])),
]

_dependable_element_index = rule(
Expand Down Expand Up @@ -1024,11 +1024,11 @@ _dependable_element_index = rule(
values = _INTEGRITY_LEVELS,
doc = "Integrity level of the dependable element. Allowed values: 'A', 'B', 'C', 'D' (D > C > B > A).",
),
"_archver": attr.label(
default = Label("//validation/archver"),
"_validation_cli": attr.label(
default = Label("//validation/core:validation_cli"),
executable = True,
cfg = "exec",
doc = "Architecture verifier tool",
doc = "Validation CLI tool",
),
"_lobster_de_template": attr.label(
default = Label("//bazel/rules/rules_score/lobster/config:lobster_de_template"),
Expand Down Expand Up @@ -1201,7 +1201,7 @@ def dependable_element(
processed_deps.append("{}_index".format(dep))

# Step 1: Generate index.rst and collect all artifacts
# Note: archver validation runs as a subrule within the index generation
# Note: validation runs as a subrule within the index generation
_dependable_element_index(
name = name + "_index",
module_name = name,
Expand Down
1 change: 1 addition & 0 deletions plantuml/parser/puml_serializer/src/fbs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ rust_library(
],
visibility = [
"//plantuml/parser:__subpackages__",
"//validation/core:__subpackages__",
],
deps = [
"@crates//:flatbuffers",
Expand Down
38 changes: 0 additions & 38 deletions validation/archver/BUILD

This file was deleted.

82 changes: 0 additions & 82 deletions validation/archver/README.md

This file was deleted.

64 changes: 0 additions & 64 deletions validation/archver/design/static_design.puml

This file was deleted.

Loading
Loading