feat/modules #43

Merged

yorunikakeru merged 22 commits from feat/modules into main 2026-06-21 13:59:40 +02:00

Conversation 0 Commits 22 Files changed 52 +2096 -1276

yorunikakeru commented 2026-06-20 15:24:29 +02:00

Owner

Copy link

Closes #42

Closes #42

yorunikakeru added 6 commits 2026-06-20 15:24:29 +02:00

chore: sync IR to version 3, add irModules=emptyModuleMap to fixtures 99cc6100d1

feat: add UnvalidatedModule and builder infrastructure for module declarations ... a579fd3db1

Adds UnvalidatedModule sum type (Docker/PostgreSQL/Nginx/Forgejo variants),
ucModules field to UnvalidatedConfiguration, and csModules/addModule to the
ConfigBuilder. The lower function still emits emptyModuleMap until lowerModules
is wired in Task 8.

feat: add DSL.Module with lifecycle actions and module ref constructors ... 1df43788d6

Adds enableModule/disableModule/restartModule for use in profile/service
builders, and docker/postgresql/nginx/forgejo as ModuleRef constructors.

feat: add DSL.Module.Docker builder with fixture and expectFail serialization test ... b7113fc473

Adds dockerModule builder with moduleEnable/rootless/storageDriver combinators.
Mirror test is wrapped in expectFail until lowerModules is wired in Task 8.

feat: add DSL.Module.PostgreSQL, Nginx, and Forgejo builders with fixtures ... 54191200b9

Adds named module builders for PostgreSQL, Nginx, and Forgejo. All three
validate the module name eagerly via mkModuleName. Builder-mirror tests are
wrapped in expectFail until lowerModules is wired in Task 8.

feat: wire lowerModules, add DuplicateModuleName, update public API and changelog ... c890c36ca9

Wires lowerModules in DSL.Validate.lower so module configs are included in
IR output. Adds DuplicateModuleName validation error and its Diagnostics
renderer. Removes expectFail wrappers from serialization tests. Adds four
golden fixtures for module configs. Updates CHANGELOG with all issue #42
additions.

yorunikakeru added 9 commits 2026-06-20 17:14:21 +02:00

refactor(types): extend UnvalidatedModule constructors to carry network policies 2ac8496ee0

feat: remove instance names from forgejoModule and postgresqlModule; rename moduleEnable to enable ac200ec5fb

feat: remove name arg from Nginx builder, add enable and withFallback ... 7ffa787504

nginxModule is now a singleton — name auto-filled as "nginx".
Adds enable, and withFallback combinator for backtick infix use.
Fixtures updated: nginx-module.json and server-stack.json now use "nginx".

feat: auto-generate service sections from module declarations ... 64918717a6

Modules now derive their own ServiceSection at lowering time:
- PostgreSQL and Forgejo gain derivePolicies (AllowPorts from declared ports)
- moduleServiceSections in Validate.hs maps enabled modules to service sections
- referenceError now includes module names in the declared set
- Explicit service blocks removed from serverStackConfig and combined tests
- Standalone module fixtures updated with auto-generated service sections

feat: make postgresql/nginx/forgejo module refs zero-arg singletons ... 7e5f6b6891

All three are now fixed-name constants mirroring the builder API —
no name argument needed since each is a singleton with a canonical name.
Remove empty-name rejection tests; those code paths no longer exist.

docs: update CHANGELOG for module DSL redesign ... 95f5ba9d63

Correct stale entries (named module builders, moduleEnable → enable),
add withFallback, singleton module refs, and auto-generated service sections.

chore: wire ServerStack into main demo, update IR lock, add Types comment ... 852d48ab70

- app/Main.hs: include serverStack in the compiled demo
- DSL.cabal: expose ServerStack in test other-modules
- flake.lock: bump frogos-ir to revCount 31
- src/DSL/Types.hs: clarify why UnvalidatedModule carries [Policy]

chore: update frogos-ir for nginx virtual hosts a375d9822b

feat: add nginx virtual host builder 9fde52dcd1

yorunikakeru added 1 commit 2026-06-20 17:32:13 +02:00

refactor: flatten source module layout 042bf20a26

yorunikakeru added 1 commit 2026-06-20 18:10:14 +02:00

feat: instead of modules + services -> just services d7de3895a0

yorunikakeru added 1 commit 2026-06-20 18:11:04 +02:00

choire: update floke.lock 147edc3969

yorunikakeru added 1 commit 2026-06-20 19:53:44 +02:00

fix: fallback port logic 66dae55ee5

yorunikakeru added 1 commit 2026-06-20 20:22:29 +02:00

test: add nginx port validation coverage; drop unused NginxConfig fields ... e82589ffe6

- Remove nginxHttpPort, nginxHttpsPort, nginxDomain from NginxConfig (IR)
  — no DSL path, no downstream consumer; per-host data lives on NginxVirtualHost
- Add two ModuleSpec cases: empty policy list when vhost has no ports,
  and Left result for withFallback port > 65535

yorunikakeru added 2 commits 2026-06-21 13:46:09 +02:00

refactor(module): extract shared policy helpers to Module.Internal ... aa1a071f97

fromRight (error "...") on allowPortsPolicy/fallbackPolicy was
duplicated across Forgejo, Nginx, and PostgreSQL builders.
Centralize in Module.Internal so invariant message and IR wrapping
live in one place.

feat: remove Docker module from DSL ... 3ddb71e0e6

Delete Module.Docker, drop docker export from Module, remove
addDockerConfig from Builder. All tests and fixtures updated to use
nginx in place of docker. Golden JSON fixtures regenerated. flake.lock
updated to pick up the matching IR change (DockerDomain removed).

yorunikakeru merged commit 187584de11 into main 2026-06-21 13:59:40 +02:00

yorunikakeru referenced this pull request from a commit 2026-06-21 13:59:42 +02:00

Merge pull request 'feat/modules' (#43) from feat/modules into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

FrogOS/DSL!43

No description provided.