amp: fix cue modules usage

Author: Gjergj

AGENTS.md

@@ -15,7 +15,7 @@ make build-dev
 make install
 
 # Check version
-./bin/dibra --version
+dibra --version
 
 # Run playbook (released binary — auto-downloads agent from GitHub Releases)
 dibra -config playbook.yaml
@@ -304,7 +304,7 @@ dibra/
 │   │   ├── docker_swarm.cue  # #DockerSwarmService, #DockerNode, etc.
 │   │   └── docker_info.cue   # #DockerContainerInfo, #DockerImageInfo, etc.
 │   └── composed/             # Higher-level composed types
-│       └── deploy_service.cue # #DeployService, #InstallFromAptRepo, etc.
+│       └── deploy_service.cue # #InstallCaddy, etc.
 ├── test/
 │   ├── Dockerfile            # Ubuntu 22.04 + systemd + SSH
 │   ├── docker-compose.yaml   # Test container orchestration
@@ -367,7 +367,7 @@ all:
 ## Modules
 
 `WHEN ADDING OR EDITING A NEW MODULE, ALWAYS ADD OR MODIFY ITS CUE SCHEMA`
-
+`WHEN ADDING A NEW COMMAND OR FLAG YOU MUST ALSO ADD IT IN THE SHELL COMPLETIONS`
 ### ping
 
 A trivial test module to verify SSH connectivity. Returns "pong" on success.
@@ -3461,7 +3461,7 @@ dibra  --config ./dir_with_cue_project
 
 ### Composed Types (Higher-Level Abstractions)
 
-This is the key differentiator from YAML. Composed types encapsulate multiple low-level tasks behind a simplified interface. They use a `_tasks` field (hidden in CUE output) that decomposes into a flat task list.
+This is the key differentiator from YAML. Composed types encapsulate multiple low-level tasks behind a simplified interface. They use a `tasks` field (hidden in CUE output) that decomposes into a flat task list.
 
 #### Defining a Composed Type
 
@@ -3493,8 +3493,8 @@ import (
     ]), "\n")
 
     // Decomposition: flat task list
-    _tasks: [...]
-    _tasks: [
+    tasks: [...]
+    tasks: [
         {name: "Copy \(service_name) binary", copy: {src: binary_src, dest: binary_dest, mode: "0755"}},
         {name: "Deploy \(service_name) unit", copy: {content: _unit, dest: "/etc/systemd/system/\(service_name).service", mode: "0644"}},
         {let _enabled = enabled, name: "Start \(service_name)", systemd_service: {name: service_name, state: "started", enabled: _enabled, daemon_reload: true}},
@@ -3514,7 +3514,7 @@ api: #DeployService & {
 }
 
 hosts: [{name: "web1", host: "10.0.0.1", user: "root"}]
-tasks: api._tasks
+tasks: api.tasks
 ```
 
 This decomposes into 3 concrete tasks: copy binary, deploy unit file, start service.
@@ -3529,7 +3529,7 @@ import "list"
 api: #DeployService & {service_name: "my-api", binary_src: "./build/api"}
 db:  #DeployService & {service_name: "my-db",  binary_src: "./build/db"}
 
-tasks: list.Concat([api._tasks, db._tasks])
+tasks: list.Concat([api.tasks, db.tasks])
 ```
 
 #### Mixing Composed + One-Off Tasks
@@ -3541,7 +3541,7 @@ api: #DeployService & {service_name: "my-api", binary_src: "./build/api"}
 
 tasks: list.Concat([
     [{name: "Install deps", apt: {name: ["curl", "jq"], state: "present"}}],
-    api._tasks,
+    api.tasks,
     [{name: "Verify", shell: {cmd: "curl -sf http://localhost:8080/health"}}],
 ])
 ```
@@ -3578,11 +3578,10 @@ Located in `cue/composed/deploy_service.cue`:
 | Type | Composes | Description |
 |------|----------|-------------|
 | `#DeployService` | `#Copy` + `#SystemdService` | Deploy a binary as a systemd service |
-| `#InstallFromAptRepo` | `#AptKey` + `#AptRepository` + `#Apt` | Add GPG key, repo, install packages |
-| `#DeployDockerStack` | `#File` + `#Copy` + `#DockerCompose` | Copy compose file, deploy stack |
-| `#ConfigureNginxSite` | `#Copy` + `#File` + `#Service` | Deploy nginx config, enable site, reload |
+| `#InstallCaddy` | `#AptKey` + `#AptRepository` + `#Apt` | Install Caddy |
+| `#Copy` + `#File` + `#Service` | Deploy nginx config, enable site, reload |
 
-Users can create their own composed types following the same `_tasks` pattern.
+Users can create their own composed types following the same `tasks` pattern.
 
 ### CUE Schema Definitions
 

README.md

@@ -37,6 +37,17 @@ It's still under heavy development and largely untested in real world.
 ## Documentation
 Unfortunately for the time being the best documentation is the code and AGENTS.md
 
+## CUE Composed Types
+
+Available CUE composed types live in `cue/composed/` and can be imported with:
+
+```cue
+import "dibra.dev/composed"
+```
+
+Included types:
+- `#InstallCaddy`
+
 ## Development
 
 ### Git Hooks (Lint + Unit Tests)

cmd/controller/main.go

@@ -1625,19 +1625,19 @@ func main() {
 
 			case task.DockerPrune != nil:
 				args := map[string]interface{}{
-					"containers":           task.DockerPrune.Containers,
-					"containers_filters":   task.DockerPrune.ContainersFilters,
-					"images":               task.DockerPrune.Images,
-					"images_filters":       task.DockerPrune.ImagesFilters,
-					"networks":             task.DockerPrune.Networks,
-					"networks_filters":     task.DockerPrune.NetworksFilters,
-					"volumes":              task.DockerPrune.Volumes,
-					"volumes_filters":      task.DockerPrune.VolumesFilters,
-					"builder":              task.DockerPrune.Builder,
-					"builder_cache_all":    task.DockerPrune.BuilderCacheAll,
+					"containers":            task.DockerPrune.Containers,
+					"containers_filters":    task.DockerPrune.ContainersFilters,
+					"images":                task.DockerPrune.Images,
+					"images_filters":        task.DockerPrune.ImagesFilters,
+					"networks":              task.DockerPrune.Networks,
+					"networks_filters":      task.DockerPrune.NetworksFilters,
+					"volumes":               task.DockerPrune.Volumes,
+					"volumes_filters":       task.DockerPrune.VolumesFilters,
+					"builder":               task.DockerPrune.Builder,
+					"builder_cache_all":     task.DockerPrune.BuilderCacheAll,
 					"builder_cache_filters": task.DockerPrune.BuilderCacheFilters,
-					"docker_host":          task.DockerPrune.DockerHost,
-					"tls":                  task.DockerPrune.TLS,
+					"docker_host":           task.DockerPrune.DockerHost,
+					"tls":                   task.DockerPrune.TLS,
 				}
 				renderedArgs, err := renderArgs(args, flattened)
 
@@ -2781,6 +2781,7 @@ func runSchema(args []string) error {
 			return err
 		}
 		fmt.Printf("Installed dibra schema (%d file(s)) at %s (version %s)\n", result.Files, result.Path, result.Version)
+		fmt.Printf("Installed dibra composed types (%d file(s)) at %s (version %s)\n", result.ComposedFiles, result.ComposedPath, result.Version)
 		return nil
 	case "status":
 		fs := flag.NewFlagSet("schema status", flag.ContinueOnError)
@@ -2801,16 +2802,20 @@ func runSchema(args []string) error {
 		if status.Installed {
 			if status.UpToDate {
 				fmt.Printf("Schema installed at %s (%d file(s), version %s)\n", status.Path, status.Files, status.Version)
+				fmt.Printf("Composed types installed at %s (%d file(s), version %s)\n", status.ComposedPath, status.ComposedFiles, status.Version)
 				return nil
 			}
 			if status.Version == "" {
 				fmt.Printf("Schema installed at %s (%d file(s), version unknown; current %s)\n", status.Path, status.Files, status.Current)
+				fmt.Printf("Composed types installed at %s (%d file(s), version unknown; current %s)\n", status.ComposedPath, status.ComposedFiles, status.Current)
 				return nil
 			}
 			fmt.Printf("Schema installed at %s (%d file(s), version %s; current %s)\n", status.Path, status.Files, status.Version, status.Current)
+			fmt.Printf("Composed types installed at %s (%d file(s), version %s; current %s)\n", status.ComposedPath, status.ComposedFiles, status.Version, status.Current)
 			return nil
 		}
 		fmt.Printf("Schema not installed (expected at %s, current %s)\n", status.Path, status.Current)
+		fmt.Printf("Composed types not installed (expected at %s, current %s)\n", status.ComposedPath, status.Current)
 		return nil
 	default:
 		return fmt.Errorf("usage: dibra schema <install|upgrade|status> [--force] [path]")
@@ -2976,10 +2981,18 @@ playbook and inventory wired to the local integration-test container.
 
 ## Quick Start
 
-1. Run the playbook:
+1. Start the test container:
+
+   make test-integration-up
+
+2. Run the playbook:
 
    dibra -config ./deploy.cue
 
+3. Tear down the container when done:
+
+   make test-integration-down
+
 ## Next Steps
 
 - Edit deploy.cue to add tasks or update host credentials.

cue/composed/deploy_service.cue

@@ -10,95 +10,75 @@ import (
 	{[string]: _}
 }
 
-#DeployService: {
+#InstallCaddy: {
 	// User-facing fields
-	service_name: string
-	binary_src:   string
-	binary_dest:  string | *"/usr/local/bin/\(service_name)"
-	description:  string | *"Managed by dibra"
-	user:         string | *"root"
-	config_src?:  string
-	config_dest?: string
-	env:          {[string]: string} | *{}
-	enabled:      bool | *true
+	install_method: "apt" | *"apt"
+	version:        string | *"2"
 
-	// Computed: systemd unit content
-	let _env_lines = [ for k, v in env {"Environment=\(k)=\(v)"}]
-	let _unit = strings.Join(list.Concat([
-		[
-			"[Unit]",
-			"Description=\(description)",
-			"After=network.target",
-			"",
-			"[Service]",
-			"Type=simple",
-			"User=\(user)",
-			"ExecStart=\(binary_dest)",
-			"Restart=on-failure",
-		],
-		_env_lines,
-		[
-			"",
-			"[Install]",
-			"WantedBy=multi-user.target",
-		],
-	]), "\n")
+	_versions: {
+		"2": {
+			key_url:       "https://dl.cloudsmith.io/public/caddy/stable/gpg.key"
+			keyring:       "/usr/share/keyrings/caddy-stable-archive-keyring.gpg"
+			repo:          "deb [signed-by=/usr/share/keyrings/caddy-stable-archive-keyring.gpg] https://dl.cloudsmith.io/public/caddy/stable/deb/debian any-version main"
+			repo_filename: "caddy-stable"
+		}
+	}
 
-	// Decomposition: flat task list
-	_tasks: [...#Task]
-	_tasks: [
-		{name: "Copy \(service_name) binary", copy: {src: binary_src, dest: binary_dest, mode: "0755"}},
-		if config_src != _|_ if config_dest != _|_ {
-			name: "Copy \(service_name) config"
-			copy: {src: config_src, dest: config_dest, mode: "0644"}
-		},
-		{name: "Deploy \(service_name) unit", copy: {content: _unit, dest: "/etc/systemd/system/\(service_name).service", mode: "0644"}},
-		{let _enabled = enabled, name: "Start \(service_name)", systemd_service: {name: service_name, state: "started", enabled: _enabled, daemon_reload: true}},
-	]
-}
-
-#InstallFromAptRepo: {
-	// User-facing fields
-	key_url:       string
-	keyring:       string
-	repo:          string
-	repo_filename: string
-	packages:      [...string]
-
-	_tasks: [...#Task]
-	_tasks: [
-		{name: "Add GPG key for \(repo_filename)", apt_key: {url: key_url, "keyring": keyring}},
-		{name: "Add \(repo_filename) repository", apt_repository: {"repo": repo, filename: repo_filename, update_cache: true}},
-		{name: "Install \(repo_filename) packages", apt: {name: packages, state: "present"}},
-	]
-}
-
-#DeployDockerStack: {
-	// User-facing fields
-	stack_name:   string
-	compose_src:  string
-	compose_dest: string | *"/opt/\(stack_name)/docker-compose.yml"
-	compose_dir:  string | *"/opt/\(stack_name)"
-
-	_tasks: [...#Task]
-	_tasks: [
-		{name: "Create \(stack_name) directory", file: {path: compose_dir, state: "directory", mode: "0755"}},
-		{name: "Deploy \(stack_name) compose file", copy: {src: compose_src, dest: compose_dest, mode: "0644"}},
-		{name: "Deploy \(stack_name) stack", docker_compose: {project_src: compose_dir, state: "present"}},
-	]
-}
-
-#ConfigureNginxSite: {
-	// User-facing fields
-	site_name:    string
-	config_src:   string
-	config_dest:  string | *"/etc/nginx/sites-available/\(site_name)"
-	enabled_link: string | *"/etc/nginx/sites-enabled/\(site_name)"
+	let _config = _versions[version]
 
-	_tasks: [...#Task]
-	_tasks: [
-		{name: "Deploy \(site_name) nginx config", copy: {src: config_src, dest: config_dest, mode: "0644"}},
-		{name: "Enable \(site_name) site", file: {path: enabled_link, src: config_dest, state: "link"}},
-		{name: "Reload nginx for \(site_name)", service: {name: "nginx", state: "reloaded"}},
-	]
+	tasks: [...#Task]
+	if install_method == "apt" {
+		tasks: [
+			{
+				name: "Install Caddy prerequisites"
+				apt: {
+					name: [
+						"debian-keyring",
+						"debian-archive-keyring",
+						"apt-transport-https",
+						"curl",
+					]
+					state:        "present"
+					update_cache: true
+				}
+			},
+			{
+				name: "Add Caddy GPG key"
+				apt_key: {
+					keyring: _config.keyring
+					state:   "present"
+					url:     _config.key_url
+				}
+			},
+			{
+				name: "Add Caddy repository"
+				apt_repository: {
+					filename:     _config.repo_filename
+					repo:         _config.repo
+					update_cache: true
+				}
+			},
+			{
+				name: "Ensure Caddy repo file permissions"
+				file: {
+					path: "/etc/apt/sources.list.d/\(_config.repo_filename).list"
+					mode: "0644"
+				}
+			},
+			{
+				name: "Ensure Caddy keyring permissions"
+				file: {
+					path: _config.keyring
+					mode: "0644"
+				}
+			},
+			{
+				name: "Install Caddy"
+				apt: {
+					name:  "caddy"
+					state: "present"
+				}
+			},
+		]
+	}
 }