make inventory output mode a constant

Author: sni

pkg/snclient/check_drivesize.go

@@ -230,7 +230,7 @@ func (l *CheckDrivesize) Check(ctx context.Context, snc *Agent, check *CheckData
 			continue
 		}
 		// skip file mount in inventory mode, like ex.: from docker /etc/hostname
-		if check.output == "inventory_json" && utils.IsFile(drive["drive_or_id"]) == nil {
+		if check.output == OutputInventory && utils.IsFile(drive["drive_or_id"]) == nil {
 			continue
 		}
 

pkg/snclient/check_memory.go

@@ -117,8 +117,8 @@ func (l *CheckMemory) Check(ctx context.Context, _ *Agent, check *CheckData, _ [
 			if err != nil {
 				return nil, fmt.Errorf("fetching swap failed: %s", err.Error())
 			}
-			// osx changes swap total on demand, so always return something
-			if swap.Total > 0 || check.hasArgsSupplied["type"] || runtime.GOOS == "darwin" {
+			// osx changes swap total on demand, so always return something in inventory mode
+			if swap.Total > 0 || check.hasArgsSupplied["type"] || (runtime.GOOS == "darwin" && check.output == OutputInventory) {
 				l.addMemType(check, "swap", swap.Used, swap.Free, swap.Total)
 			}
 		case "committed":

pkg/snclient/checkdata.go

@@ -31,6 +31,14 @@ const (
 	NoCallInventory                // does not call this check and puts single entry into inventory
 )
 
+// OutputMode sets available output modes
+type OutputMode uint8
+
+const (
+	OutputDefault   OutputMode = iota
+	OutputInventory            // only reports available inventory
+)
+
 type CommaStringList []string
 
 type CheckArgument struct {
@@ -123,7 +131,7 @@ type CheckData struct {
 	perfConfig             []PerfConfig
 	perfSyntax             string
 	hasInventory           InventoryMode
-	output                 string
+	output                 OutputMode
 	implemented            Implemented
 	attributes             []CheckAttribute
 	listSorted             []string // sort result list by this keys
@@ -159,7 +167,7 @@ func (cd *CheckData) Finalize() (*CheckResult, error) {
 		cd.result = &CheckResult{}
 	}
 	cd.result.Raw = cd
-	if cd.output == "inventory_json" {
+	if cd.output == OutputInventory {
 		return cd.result, nil
 	}
 
@@ -764,7 +772,12 @@ func (cd *CheckData) processArgs(sanitized []Argument, defaultWarning, defaultCr
 		case "perf-syntax":
 			cd.perfSyntax = argValue
 		case "output":
-			cd.output = argValue
+			switch argValue {
+			case "inventory_json":
+				cd.output = OutputInventory
+			default:
+				return nil, false, fmt.Errorf("unknown output mode: %s (valid values are: inventory_json)", argValue)
+			}
 		default:
 			parsed, err2 := cd.parseAnyArg(argExpr, keyword, argValue)
 			switch {

pkg/snclient/inventory.go

@@ -127,7 +127,7 @@ func (snc *Agent) buildInventory(ctx context.Context, modules []string) *Invento
 			if len(modules) > 0 && (!slices.Contains(modules, name)) {
 				continue
 			}
-			meta.output = "inventory_json"
+			meta.output = OutputInventory
 			meta.filter = ConditionList{{isNone: true}}
 			data, err := handler.Check(ctx, snc, meta, []Argument{})
 			if err != nil && (data == nil || data.Raw == nil) {