Refine application processing

- add application arguments to protobuffer - add automatic nix to JSON conversion for application definition - add argument processing to agent: - parsing application manifest - validate extra arguments - add extra (optional) arguments to givc-cli - add admin server args forwarding - remove obsolete application start function from go implementation - update nixpkgs - update go + deps Signed-off-by: Manuel Bluhm <[email protected]>
tiiuae · Sep 17, 2024 · 626df89 · 626df89
1 parent 6a85012
commit 626df89
Show file tree

Hide file tree

Showing 31 changed files with 1,397 additions and 304 deletions.
diff --git a/README.md b/README.md
@@ -17,8 +17,7 @@ This project was started to support the development of system modules across a v
 
 ### Systemd Management Agent
 
-The systemd management agent runs in the host and VMs, and connects to the systemd manager of the system. It provides functionality to control services in host, system VMs, and application VMs. The agent can connect to the system manager to control system units, or
-to the user manager to control applications running as transient systemd services.
+The systemd management agent runs in the host and VMs, and connects to the systemd manager of the system. It provides functionality to control services in host, system VMs, and application VMs. The agent can connect to the system manager to control system units, or to the user manager to control applications running as transient systemd services.
 
 ### Admin Service (System Manager)
 
@@ -137,10 +136,14 @@ To use the agent as application controller, include the `appvm` module as follow
     addr = "192.168.1.123";
     port = "9000";
 
-    # Specify applications with "name":"command" (JSON)
-    applications = ''{
-      "appflowy": "run-waypipe appflowy"
-    }'';
+    # Specify applications by name, command, and argument types accepted
+    applications = [
+      {
+        name = "foot";
+        command = "${pkgs.foot}/bin/foot";
+        args = [ "flag" ];
+      }
+    ];
 
     # Provide TLS configuration files
     tls = {

diff --git a/api/admin/admin.pb.go b/api/admin/admin.pb.go
diff --git a/api/admin/admin.proto b/api/admin/admin.proto
@@ -34,6 +34,7 @@ message RegistryResponse {
 message ApplicationRequest {
     string AppName = 1;
     optional string VmName = 2;
+    repeated string Args = 3;
 }
 
 message ApplicationResponse {
@@ -74,5 +75,5 @@ service AdminService {
     rpc Reboot(Empty) returns (Empty) {}
 
     rpc QueryList(Empty) returns (QueryListResponse) {}
-    rpc Watch(Empty) returns (stream WatchItem) {}  
+    rpc Watch(Empty) returns (stream WatchItem) {}
 }
diff --git a/api/admin/admin_grpc.pb.go b/api/admin/admin_grpc.pb.go
diff --git a/api/hwid/hwid.pb.go b/api/hwid/hwid.pb.go
diff --git a/api/hwid/hwid_grpc.pb.go b/api/hwid/hwid_grpc.pb.go
diff --git a/api/protoc.sh b/api/protoc.sh
@@ -7,6 +7,7 @@ gen_protoc() {
             "$1"/"$2"
 }
 
+gen_protoc api/admin admin.proto
 gen_protoc api/systemd systemd.proto
 gen_protoc api/wifi wifi.proto
 gen_protoc api/hwid hwid.proto