include error handling

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

pkg/inspecttypes/dockercompat/dockercompat.go

@@ -96,7 +96,7 @@ type ImageMetadata struct {
 	LastTagTime time.Time `json:",omitempty"`
 }
 
-type LoggerLogConfig struct {
+type loggerLogConfig struct {
 	Driver  string            `json:"driver"`
 	Opts    map[string]string `json:"opts,omitempty"`
 	LogURI  string            `json:"-"`
@@ -140,7 +140,7 @@ type Container struct {
 type HostConfig struct {
 	// Binds           []string      // List of volume bindings for this container
 	ContainerIDFile string          // File (path) where the containerId is written
-	LogConfig       LoggerLogConfig // Configuration of the logs for this container
+	LogConfig       loggerLogConfig // Configuration of the logs for this container
 	// NetworkMode     NetworkMode   // Network mode to use for the container
 	PortBindings nat.PortMap // Port mapping between the exposed port (container) and the host
 	// RestartPolicy   RestartPolicy // Restart policy to be used for the container
@@ -265,7 +265,7 @@ type DeviceMapping struct {
 	CgroupPermissions string
 }
 
-type CPUSettings struct {
+type cpuSettings struct {
 	cpuSetCpus string
 	cpuSetMems string
 	cpuShares  uint64
@@ -378,7 +378,7 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 		c.HostConfig.LogConfig.LogURI = nerdctlLoguri
 	}
 	if logConfigJSON, ok := n.Labels[labels.LogConfig]; ok {
-		var logConfig LoggerLogConfig
+		var logConfig loggerLogConfig
 		err := json.Unmarshal([]byte(logConfigJSON), &logConfig)
 		if err != nil {
 			return nil, fmt.Errorf("failed to unmarshal log config: %v", err)
@@ -388,14 +388,16 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 		c.HostConfig.LogConfig = logConfig
 	} else {
 		// If LogConfig label is not present, set default values
-		c.HostConfig.LogConfig = LoggerLogConfig{
+		c.HostConfig.LogConfig = loggerLogConfig{
 			Driver: "json-file",
 			Opts:   make(map[string]string),
 		}
 	}
 
-	// var hostConfigLabel HostConfigLabel
-	hostConfigLabel, _ := getHostConfigLabelFromNative(n.Labels)
+	hostConfigLabel, err := getHostConfigLabelFromNative(n.Labels)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch HostConfigLabel: %v", err)
+	}
 
 	c.HostConfig.BlkioWeight = hostConfigLabel.BlkioWeight
 	c.HostConfig.ContainerIDFile = hostConfigLabel.CidFile
@@ -485,18 +487,27 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 	c.HostConfig.DNSOptions = dnsSettings.DNSResolvConfOptions
 	c.HostConfig.DNSSearch = dnsSettings.DNSSearchDomains
 
-	oomScoreAdj, _ := getOomScoreAdjFromNative(n.Spec.(*specs.Spec))
+	oomScoreAdj, err := getOomScoreAdjFromNative(n.Spec.(*specs.Spec))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get OomScoreAdj value: %v", err)
+	}
 	c.HostConfig.OomScoreAdj = oomScoreAdj
 
 	c.HostConfig.ReadonlyRootfs = false
 	if n.Spec.(*specs.Spec).Root != nil && n.Spec.(*specs.Spec).Root.Readonly {
 		c.HostConfig.ReadonlyRootfs = n.Spec.(*specs.Spec).Root.Readonly
 	}
 
-	utsMode, _ := getUtsModeFromNative(n.Spec.(*specs.Spec))
+	utsMode, err := getUtsModeFromNative(n.Spec.(*specs.Spec))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get UtsMode value: %v", err)
+	}
 	c.HostConfig.UTSMode = utsMode
 
-	sysctls, _ := getSysctlFromNative(n.Spec.(*specs.Spec))
+	sysctls, err := getSysctlFromNative(n.Spec.(*specs.Spec))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get UtsMode value: %v", err)
+	}
 	c.HostConfig.Sysctls = sysctls
 
 	if n.Runtime.Name != "" {
@@ -680,8 +691,8 @@ func networkSettingsFromNative(n *native.NetNS, sp *specs.Spec) (*NetworkSetting
 	return res, nil
 }
 
-func cpuSettingsFromNative(sp *specs.Spec) (*CPUSettings, error) {
-	res := &CPUSettings{}
+func cpuSettingsFromNative(sp *specs.Spec) (*cpuSettings, error) {
+	res := &cpuSettings{}
 	if sp.Linux != nil && sp.Linux.Resources != nil && sp.Linux.Resources.CPU != nil {
 		if sp.Linux.Resources.CPU.Cpus != "" {
 			res.cpuSetCpus = sp.Linux.Resources.CPU.Cpus

pkg/inspecttypes/dockercompat/dockercompat_test.go

@@ -78,7 +78,7 @@ func TestContainerFromNative(t *testing.T) {
 				HostConfig: &HostConfig{
 					PortBindings: nat.PortMap{},
 					GroupAdd:     []string{},
-					LogConfig: LoggerLogConfig{
+					LogConfig: loggerLogConfig{
 						Driver: "json-file",
 						Opts:   map[string]string{},
 					},
@@ -163,7 +163,7 @@ func TestContainerFromNative(t *testing.T) {
 				HostConfig: &HostConfig{
 					PortBindings: nat.PortMap{},
 					GroupAdd:     []string{},
-					LogConfig: LoggerLogConfig{
+					LogConfig: loggerLogConfig{
 						Driver: "json-file",
 						Opts:   map[string]string{},
 					},
@@ -245,7 +245,7 @@ func TestContainerFromNative(t *testing.T) {
 				HostConfig: &HostConfig{
 					PortBindings: nat.PortMap{},
 					GroupAdd:     []string{},
-					LogConfig: LoggerLogConfig{
+					LogConfig: loggerLogConfig{
 						Driver: "json-file",
 						Opts:   map[string]string{},
 					},