Commit Graph

132 Commits

Author SHA1 Message Date
2d97cac64b Fix compilation errors 2025-04-18 10:05:12 -04:00
8a1e20bda5 remove unrelated 2025-04-18 10:01:34 -04:00
d92c35987a rset harmony dir to master 2025-04-18 09:59:00 -04:00
9276ec05f0 remove conflict with all and list 2025-04-17 18:32:25 -04:00
b7fcc66fa5 add conflicts for options with interactive 2025-04-17 18:31:24 -04:00
ff568cd1b9 Change help for --yes 2025-04-17 18:25:41 -04:00
92e60b00d2 add index to display 2025-04-17 18:22:39 -04:00
f75d03c570 Update readme, add conflict 2025-04-17 18:04:08 -04:00
tahahawa
b781a7ff4a Add prompt on run if --yes not specified, add tests, separate out function for filtering, bug fixes, etc 2025-04-17 15:21:49 -04:00
tahahawa
ee9270d771 Add failure test 2025-04-16 17:41:13 +00:00
tahahawa
e845544035 Separate filtering from running, and actually invoke interpret to run the scores 2025-04-16 17:41:13 +00:00
tahahawa
0a5d3b531a Updates to address comments 2025-04-16 17:41:13 +00:00
tahahawa
508ca3352d optimize to map and filter in the same step 2025-04-16 17:41:13 +00:00
tahahawa
9a1eac7c8a update README 2025-04-16 17:41:13 +00:00
tahahawa
49b39f403b add assert_cmd to test binaries 2025-04-16 17:41:13 +00:00
tahahawa
83355e140a more idiomatic Ok 2025-04-16 17:41:13 +00:00
tahahawa
8cc5880135 refactor with iter and filter 2025-04-16 17:41:13 +00:00
tahahawa
fbea2a40c3 Get example working 2025-04-16 17:41:13 +00:00
20a8f12160 WIP 2025-04-16 17:41:13 +00:00
5874ea3963 Add new harmony_cli sub-crate 2025-04-16 17:41:13 +00:00
0ba7f2536c docs: ADR for Helm Resource implementation style (#12)
Co-authored-by: tahahawa <tahahawa@gmail.com>
Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/12
2025-04-16 17:39:17 +00:00
3097e6af67 Merge branch 'adr/005-interactive-project' 2025-04-11 11:03:16 -04:00
606ea43b51 fix: improve tests and remove unused code
- Corrected XML test data to remove unnecessary `<descr>` tags, resolving failing tests.
- Removed the unused `ratatui_utils` module and its associated code.
- Simplified example in `harmony_tui/src/lib.rs` to use `tokio::main` and register scores directly with `Maestro`. This aligns with the project's evolving structure.
2025-04-11 11:01:05 -04:00
31ae8365a6 docs: add quick demo and core architecture overview
Adds a quick demo command using `cargo run -p example-tui` to launch a minimalist TUI with demo scores.

Also includes a core architecture diagram and overview in the README for better understanding of the project structure.
2025-04-09 16:09:54 -04:00
1cbf4de2a1 adr: proposal serde for score data representation and UI rendering
Decouples score definitions from UI implementations by mandating `serde::Serialize` and `serde::Deserialize` for all `Score` structs. UIs will interact with scores via their serialized representation, enabling scalability and reducing complexity for score authors.

This approach:

- Scales better with new score types and UI targets.
- Simplifies score authoring by removing the need for UI-specific display traits.
- Leverages the `serde` ecosystem for robust data handling.

Adding new field types requires updates to all UIs, a trade-off acknowledged in the ADR.
2025-04-05 14:38:58 -04:00
b4cc5cff4f feat: add serde derive to Score types
This commit adds `serde` dependency and derives `Serialize` trait for `Score` types. This is necessary for serialization and deserialization of these types, which is required to display Scores to various user interfaces

- Added `serde` dependency to `harmony_types/Cargo.toml`.
- Added `serde::Serialize` derive macro to `MacAddress` in `harmony_types/src/lib.rs`.
- Added `serde::Serialize` derive macro to `Config` in `opnsense-config/src/config/config.rs`.
- Added `serde::Serialize` derive macro to `Score` in `harmony_types/src/lib.rs`.
- Added `serde::Serialize` derive macro to `Config` and `Score` in relevant modules.
- Added placeholder `todo!()` implementations for `serialize` methods. These will be implemented in future commits.
2025-04-05 14:36:08 -04:00
ab9b7476a4 feat: add load balancer score and frontend integration
- Implemented `OKDLoadBalancerScore` and integrated it as a `FrontendScore`.
- Added `FrontendScore` trait for TUI displayable scores.
- Implemented `Display` for `OKDLoadBalancerScore`.
- Updated `ScoreListWidget` to handle `FrontendScore` types.
- Included load balancer score in the TUI.
2025-04-03 13:41:29 -04:00
e6384da57e Working on various ADR, cleaning up some stuff 2025-04-03 13:40:46 -04:00
79213ba8d7 feat: implement passthrough for HAClusterTopology traits
This commit completes the refactoring of the `HAClusterTopology` struct to implement all required traits via passthrough to the underlying infrastructure providers.

- Implemented all traits (`DnsServer`, `LoadBalancer`, `HttpServer`, etc.) on `HAClusterTopology`.
- Each trait method now simply calls the corresponding method on the underlying infrastructure provider.
- This ensures that all functionality is delegated to the correct provider without duplicating logic.
- Updated trait implementations to accept `&self` instead of `&mut self` where appropriate.
- Fixed a compilation error in `remove_record` by changing the signature to accept `&self`.
- Added unimplemented!() stubs for HttpServer traits.
2025-04-03 12:20:51 -04:00
8a1627e728 wip: refactoring 2025-04-02 16:52:24 -04:00
fc718f11cf feat: Introduce Topology Trait for Compile-Time Safe Score Binding
Introduce the `Topology` trait to ensure that `Maestro` can compile-time safely bind compatible `Scores` and `Topologies`. This refactoring includes updating `HarmonyTuiEvent`, `ScoreListWidget`, and related structures to work with generic `Topology` types, enhancing type safety and modularity.
2025-04-02 15:51:28 -04:00
f7dc15cbf0 refactor(topology): remove unused HAClusterTopology import
Remove the unnecessary `HAClusterTopology` import from multiple modules to clean up dependencies and reduce clutter. This change does not affect functionality as `HAClusterTopology` is no longer required in these files.
2025-03-31 15:07:16 -04:00
6e9bf3a4be Add more Topology samples with various architectures 2025-03-31 15:02:41 -04:00
fda007f014 feat(topology): generalize Score and Interpret implementations with topology traits
Refactor various `Score` and `Interpret` implementations to utilize generic `Topology` traits, removing hardcoded dependencies on `HAClusterTopology`. This enhancement allows for more flexible and extensible code, accommodating different types of network topologies.
2025-03-26 23:10:51 -04:00
d7897f29c4 feat(orchestration): introduce Interpret trait and refactor score application
Refactor the orchestration process to use an `Interpret` trait instead of directly applying scores. This change introduces a more flexible and extensible design for executing commands associated with different types of topologies. The `CommandScore` and `K8sResourceScore` now implement this trait, providing a clear separation between score definition and execution logic. Update the `Maestro::orchestrate` method to compile scores into interpreters before executing them against their respective topologies.
2025-03-26 16:39:11 -04:00
3962238f0d spike: Working on abstractions, Topology, Score, Capability, Maestro for strong type safety and nice UX/DX 2025-03-25 08:03:45 -04:00
2433c02de9 feat: select k3d for cross-platform Kubernetes development
Select k3d as the primary solution for running Kubernetes clusters on Windows and macOS, alongside native k3s on Linux, to achieve a consistent "zero setup" experience across platforms while considering resource usage, complexity, and long-term alternatives like WebAssembly.
2025-03-17 22:36:07 -04:00
3d6f646460 feat(adr/007-default-runtime.md): add future work section discussing WASM potential
Add a new section to the ADR document outlining potential future work with WebAssembly (WASM) as an alternative runtime, comparing it to Java's bytecode and JVM model, highlighting potential benefits in observability, heap allocation, and garbage collection. Note current maturity limitations compared to our target customer base.
2025-03-17 16:20:52 -04:00
35fcc295aa ADR: Default runtime for harmony workloads
This ADR proposes to use k3s as a default runtime on linux and k3d on other platforms supporting docker
2025-03-17 15:48:14 -04:00
7291db7ca3 feat(example/lamp): add LAMPScore and configuration support
- Introduce `LAMPScore` struct with additional fields: `domain`, `config`, and `php_version`.
- Define default implementation for `LAMPConfig`.
- Update `Url` enum to use `Url(url::Url)` instead of `Remote(url::Url)`.
- Adjust references in `HttpServer` and `TftpServer` implementations.
- Modify `Interpret` trait implementation to use `name()` method from `LAMPScore`.
2025-03-10 17:04:35 -04:00
fbc18d2fad feat(harmony): add lamp server module and refactor dhcpd tests
Implement LAMP server module with basic configuration.
Refactor and remove commented out Dhcpd struct and associated tests in opnsense/xml_utils.
Ensure codebase adheres to best practices and maintainability standards.
2025-03-10 15:18:40 -04:00
fe42ebd347 feat(adr): add architecture decision record for interactive project setup
Add an Architecture Decision Record (ADR) outlining the approach to integrate LAMP projects into Harmony's automated delivery pipeline using either Score Spec or a custom Rust DSL. A decision will have to be made between the two in the short term to decide which we will implement first. The ADR details the benefits and consequences of each option, focusing on providing a seamless transition for developers while leveraging Harmony's enterprise-grade features.
2025-03-10 00:35:40 -04:00
2950235d23 Actualiser adr/006-secret-management.md 2025-03-10 04:31:06 +00:00
7f56d4d654 feat(adr/006-secret-management): propose using Keycloak for secret management
Introduce Architecture Decision Record (ADR) outlining the use of Keycloak as a secret management solution. The document details the context, considerations, decision workflow, rationale for choosing Keycloak over alternatives, and potential consequences including benefits and challenges.
2025-03-06 12:40:44 -05:00
989f407502 docs(adr): add ADR for using iPXE with chaining for architecture independence
Adopt iPXE as the primary bootloader with chaining to support BIOS and UEFI architectures, enabling dynamic boot configurations, advanced network booting, and diskless machine management. This introduces a dependency on iPXE but offers significant benefits in flexibility and configuration simplicity.
2025-02-23 13:33:47 -05:00
62a554fac7 feat(modules/opnsense): refactor and add upgrade functionality
Refactor OPNSense module to use a mod.rs structure and add an OPNsenseLaunchUpgrade score for launching firmware upgrades.
2025-02-21 11:24:04 -05:00
0eb9e02b99 feat: add .gitignore and update file paths
Add a .gitignore file to exclude target, private_repos, and log directories. Update TftpScore and HttpScore file paths in `main.rs` to use relative paths from the project root. Modify `HarmonyTUI` initialization in `lib.rs` to create log directory if it doesn't exist before setting the log file path.
2025-02-12 16:27:56 -05:00
96bbef8195 chore: Reorganize file tree for easier onboarding. Rust project now at the root for simple git clone && cargo run 2025-02-12 15:32:59 -05:00
83b4efd625 feat(example): add new example crate with basic setup 2025-02-12 14:32:17 -05:00
31e92a08a4 fix: autoload inventory and topology, update dhcp struct, add k8s deployment score
- Updated `Inventory` and `HAClusterTopology` to use `autoload` instead of `dummy`.
- Made fields in `DhcpScore` public for better access.
- Added `K8sDeploymentScore` to the list of modules registered with Maestro.
- Corrected logic in `Config::verify_package_installation` to check if package is installed.
- Updated `CaddyGeneral` struct to include `http_versions`.
2025-02-06 16:24:22 -05:00