Merge pull request tiiuae#23 from mbssrc/add-freeze-state

Add FreezerState to UnitStatus

api/protoc.sh

@@ -7,6 +7,10 @@ gen_protoc() {
             "$1"/"$2"
 }
 
-for api in admin systemd wifi hwid locale; do
-	gen_protoc api/$api $api.proto
+if [ $# -eq 0 ]; then
+    set -- admin hwid locale systemd wifi
+fi
+
+for protob in "$@"; do
+	gen_protoc api/"$protob" "$protob".proto
 done

api/systemd/systemd.proto

@@ -24,6 +24,7 @@ message UnitStatus {
 	string ActiveState = 4;
     string SubState = 5;
 	string Path = 6;
+    string FreezerState = 7;
 }
 
 message UnitStatusResponse {

devshell.nix

@@ -43,9 +43,9 @@
             help = "update git pre-commit hooks";
           }
           {
-            help = "Generate go files from protobuffers";
+            help = "Generate go files from protobuffers. Examples: '$ protogen systemd'";
             name = "protogen";
-            command = "./api/protoc.sh";
+            command = "./api/protoc.sh $@";
           }
           {
             help = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers";

internal/pkgs/serviceclient/transport.go

@@ -43,12 +43,13 @@ func GetRemoteStatus(cfg *types.EndpointConfig, unitName string) (*types.UnitSta
 	}
 
 	response := &types.UnitStatus{
-		Name:        resp.UnitStatus.Name,
-		Description: resp.UnitStatus.Description,
-		LoadState:   resp.UnitStatus.LoadState,
-		ActiveState: resp.UnitStatus.ActiveState,
-		SubState:    resp.UnitStatus.SubState,
-		Path:        string(resp.UnitStatus.Path),
+		Name:         resp.UnitStatus.Name,
+		Description:  resp.UnitStatus.Description,
+		LoadState:    resp.UnitStatus.LoadState,
+		ActiveState:  resp.UnitStatus.ActiveState,
+		SubState:     resp.UnitStatus.SubState,
+		Path:         string(resp.UnitStatus.Path),
+		FreezerState: resp.UnitStatus.FreezerState,
 	}
 
 	return response, nil

internal/pkgs/servicemanager/controller.go

@@ -329,6 +329,29 @@ func (c *SystemdController) GetUnitProperties(ctx context.Context, unitName stri
 	return props, nil
 }
 
+func (c *SystemdController) GetUnitPropertyString(ctx context.Context, unitName string, propertyName string) (string, error) {
+
+	// Input validation
+	if ctx == nil {
+		return "", fmt.Errorf("context cannot be nil")
+	}
+	if unitName == "" {
+		return "", fmt.Errorf("incorrect input, must be unit name")
+	}
+	if propertyName == "" {
+		return "", fmt.Errorf("incorrect input, must be property name")
+	}
+
+	// Get unit properties
+	prop, err := c.conn.GetUnitPropertyContext(ctx, unitName, propertyName)
+	if err != nil {
+		return "", err
+	}
+
+	propString := strings.Trim(prop.Value.String(), "\"")
+	return propString, nil
+}
+
 func (c *SystemdController) StartApplication(ctx context.Context, serviceName string, serviceArgs []string) (string, error) {
 
 	cmdFailure := "Command failed."

internal/pkgs/servicemanager/transport.go

@@ -66,15 +66,22 @@ func (s *SystemdControlServer) GetUnitStatus(ctx context.Context, req *systemd_a
 		return nil, grpc_status.Error(grpc_codes.NotFound, errStr)
 	}
 
+	freezerState, err := s.Controller.GetUnitPropertyString(context.Background(), req.UnitName, "FreezerState")
+	if err != nil {
+		log.Infof("[GetUnitStatus] Error fetching freezer state: %v\n", err)
+		freezerState = "error"
+	}
+
 	resp := &systemd_api.UnitStatusResponse{
 		CmdStatus: "Command successful",
 		UnitStatus: &systemd_api.UnitStatus{
-			Name:        unitStatus[0].Name,
-			Description: unitStatus[0].Description,
-			LoadState:   unitStatus[0].LoadState,
-			ActiveState: unitStatus[0].ActiveState,
-			SubState:    unitStatus[0].SubState,
-			Path:        string(unitStatus[0].Path),
+			Name:         unitStatus[0].Name,
+			Description:  unitStatus[0].Description,
+			LoadState:    unitStatus[0].LoadState,
+			ActiveState:  unitStatus[0].ActiveState,
+			SubState:     unitStatus[0].SubState,
+			Path:         string(unitStatus[0].Path),
+			FreezerState: freezerState,
 		},
 	}
 

internal/pkgs/types/types.go

@@ -37,12 +37,13 @@ const (
 )
 
 type UnitStatus struct {
-	Name        string
-	Description string
-	LoadState   string
-	ActiveState string
-	SubState    string
-	Path        string
+	Name         string
+	Description  string
+	LoadState    string
+	ActiveState  string
+	SubState     string
+	Path         string
+	FreezerState string
 }
 
 type TransportConfig struct {