refactor

Author: rjtokenring

internal/orchestrator/orchestrator.go

@@ -1043,12 +1043,12 @@ func getCurrentUser() string {
 }
 
 type deviceResult struct {
-	devicePaths             []string
-	deviceCgroupRules       []string
-	additionalDeviceVolumes []string
-	hasVideoDevice          bool
-	hasSoundDevice          bool
-	hasGPUDevice            bool
+	devicePaths       []string
+	deviceCgroupRules []string
+	deviceVolumes     []string
+	hasVideoDevice    bool
+	hasSoundDevice    bool
+	hasGPUDevice      bool
 }
 
 func getDevices() (*deviceResult, error) {
@@ -1068,17 +1068,17 @@ func getDevices() (*deviceResult, error) {
 	}
 	// Verify if there are real video devices (cameras) in /dev/v4l/by-id
 	if camDevices := getVideoDevices(); len(camDevices) > 0 {
-		res.deviceCgroupRules = append(res.deviceCgroupRules, "\"c 81:* rwm\"") // rule for V4L devices
+		res.deviceCgroupRules = append(res.deviceCgroupRules, "c 81:* rwm") // rule for V4L devices
 		if paths.New("/dev/v4l").Exist() {
-			res.additionalDeviceVolumes = append(res.additionalDeviceVolumes, "/dev/v4l")
+			res.deviceVolumes = append(res.deviceVolumes, "/dev/v4l")
 		}
 		res.hasVideoDevice = true
 	}
 	// Verify if there are real sound devices in /dev/snd/by-id
 	if sndDev := getSoundDevices(); len(sndDev) > 0 {
-		res.deviceCgroupRules = append(res.deviceCgroupRules, "\"c 116:* rwm\"") // rule for ALSA devices
+		res.deviceCgroupRules = append(res.deviceCgroupRules, "c 116:* rwm") // rule for ALSA devices
 		if paths.New("/dev/snd").Exist() {
-			res.additionalDeviceVolumes = append(res.additionalDeviceVolumes, "/dev/snd")
+			res.deviceVolumes = append(res.deviceVolumes, "/dev/snd")
 		}
 		res.hasSoundDevice = true
 	}

internal/orchestrator/provision.go

@@ -326,8 +326,8 @@ func generateMainComposeFile(
 	if err = validateDevices(devices, requiredDeviceClasses); err != nil {
 		return fmt.Errorf("missing required device: %w", err)
 	}
-	if len(devices.additionalDeviceVolumes) > 0 {
-		for _, devVolume := range devices.additionalDeviceVolumes {
+	if len(devices.deviceVolumes) > 0 {
+		for _, devVolume := range devices.deviceVolumes {
 			volumes = append(volumes, volume{
 				Type:   "bind",
 				Source: devVolume,