Revert "check-in and embed latest supported-gpus.json file"

This reverts commit 758ab9c.

Author: tariq1890

gpu-driver-util/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	_ "embed"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -24,6 +23,8 @@ const (
 	PCIDeviceClassVGA = "0x030000"
 	// PCIDeviceClassGPU represents the pci device class code for GPU devices
 	PCIDeviceClassGPU = "0x030200"
+	// DefaultSupportedGpusJsonPath represents the default install location of the supported-gpus.json file
+	DefaultSupportedGpusJsonPath = "/usr/share/nvidia-driver-assistant/supported-gpus/supported-gpus.json"
 
 	// DriverHintUnknown is used when the gpu device is not found in supported-gpus.json
 	DriverHintUnknown = "unknown"
@@ -50,9 +51,6 @@ var (
 	driverBranch          int
 )
 
-//go:embed supported-gpus.json
-var defaultSupportedGpusJson string
-
 type GPUDevice struct {
 	ID           string   `json:"devid"`
 	Name         string   `json:"name"`
@@ -89,6 +87,7 @@ func main() {
 			Name:        "supported-gpus-file",
 			Aliases:     []string{"f"},
 			Usage:       "Specify location of the supported-gpus.json file",
+			Value:       DefaultSupportedGpusJsonPath,
 			Destination: &supportedGpusJsonPath,
 			Required:    false,
 		},
@@ -140,36 +139,33 @@ func GetKernelModule(c *cli.Context) error {
 		return err
 	}
 
-	var jsonData []byte
-	if len(supportedGpusJsonPath) > 0 {
-		jsonData, err = os.ReadFile(supportedGpusJsonPath)
-		if err != nil {
-			return fmt.Errorf("error opening the supported gpus file %s: %w", supportedGpusJsonPath, err)
-		}
-	} else {
-		jsonData = []byte(defaultSupportedGpusJson)
+	var gpuData GPUData
+	gpuJSONString, err := os.ReadFile(supportedGpusJsonPath)
+	if err != nil {
+		log.Errorf("error opening the supported gpus file %s: %v", supportedGpusJsonPath, err)
+		return err
 	}
 
-	var gpuData GPUData
-	err = json.Unmarshal(jsonData, &gpuData)
+	err = json.Unmarshal(gpuJSONString, &gpuData)
 	if err != nil {
-		return fmt.Errorf("error unmarshaling the supported gpus json %s: %w", supportedGpusJsonPath, err)
+		return err
 	}
 
 	searchMap := buildGPUSearchMap(gpuData)
 
 	if len(gpuDevices) > 0 {
 		kernelModuleType, err := resolveKernelModuleType(gpuDevices, searchMap)
 		if err != nil {
-			return fmt.Errorf("error resolving kernel module type: %w", err)
+			log.Errorf("error resolving kernel module type: %v", err)
+			return err
 		}
 		fmt.Println(kernelModuleType)
 	}
 	return nil
 }
 
 func resolveKernelModuleType(gpuDevices []string, searchMap map[string]GPUDevice) (string, error) {
-	var kernelModuleType string
+
 	driverHints := getDriverHints(gpuDevices, searchMap)
 	log.Debugf("driverHints: %v", driverHints)
 
@@ -181,14 +177,12 @@ func resolveKernelModuleType(gpuDevices []string, searchMap map[string]GPUDevice
 	if requiresOpenRM && requiresProprietary {
 		return "", fmt.Errorf("unsupported GPU topology")
 	} else if requiresOpenRM {
-		kernelModuleType = KernelModuleTypeOpen
+		return KernelModuleTypeOpen, nil
 	} else if requiresProprietary {
-		kernelModuleType = KernelModuleTypeProprietary
+		return KernelModuleTypeProprietary, nil
 	} else {
-		kernelModuleType = getDriverBranchDefault(driverBranch)
+		return getDriverBranchDefault(driverBranch), nil
 	}
-	log.Debugf("printing the recommended kernel module type: %s", kernelModuleType)
-	return kernelModuleType, nil
 }
 
 func getDriverHints(gpuDevices []string, searchMap map[string]GPUDevice) []string {