chore: refactor inspect response

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

Author: coderbirju

cmd/nerdctl/container/container_inspect_linux_test.go

@@ -255,7 +255,7 @@ func TestContainerInspectHostConfig(t *testing.T) {
 		"--shm-size", "256m",
 		"--runtime", "io.containerd.runtime.v1.linux",
 		"--sysctl", "net.core.somaxconn=1024",
-		"--device", "/dev/zero:/dev/null",
+		"--device", "/dev/null:/dev/null",
 		testutil.AlpineImage, "sleep", "infinity").AssertOK()
 
 	inspect := base.InspectContainer(testContainer)

pkg/cmd/container/create.go

@@ -666,6 +666,8 @@ type internalLabels struct {
 // WithInternalLabels sets the internal labels for a container.
 func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerOpts, error) {
 	m := make(map[string]string)
+	var hostConfigLabel dockercompat.HostConfigLabel
+	var dnsSettings dockercompat.DNSSettings
 	m[labels.Namespace] = internalLabels.namespace
 	if internalLabels.name != "" {
 		m[labels.Name] = internalLabels.name
@@ -748,44 +750,40 @@ func withInternalLabels(internalLabels internalLabels) (containerd.NewContainerO
 	}
 
 	if internalLabels.blkioWeight > 0 {
-		m[labels.BlkioWeight] = fmt.Sprintf("%d", internalLabels.blkioWeight)
+		hostConfigLabel.BlkioWeight = internalLabels.blkioWeight
 	}
 
 	if internalLabels.cidFile != "" {
-		m[labels.CIdFile] = internalLabels.cidFile
+		hostConfigLabel.CidFile = internalLabels.cidFile
 	}
 
 	if len(internalLabels.dnsServers) > 0 {
-		dnsServersJSON, err := json.Marshal(internalLabels.dnsServers)
-		if err != nil {
-			return nil, err
-		}
-		m[labels.DNSServer] = string(dnsServersJSON)
+		dnsSettings.DNSServers = internalLabels.dnsServers
 	}
 
 	if len(internalLabels.dnsSearchDomains) > 0 {
-		dnsSearchJSON, err := json.Marshal(internalLabels.dnsSearchDomains)
-		if err != nil {
-			return nil, err
-		}
-		m[labels.DNSSearchDomains] = string(dnsSearchJSON)
+		dnsSettings.DNSSearchDomains = internalLabels.dnsSearchDomains
 	}
 
 	if len(internalLabels.dnsResolvConfOptions) > 0 {
-		dnsResolvConfOptionsJSON, err := json.Marshal(internalLabels.dnsResolvConfOptions)
-		if err != nil {
-			return nil, err
-		}
-		m[labels.DNSResolvConfOptions] = string(dnsResolvConfOptionsJSON)
+		dnsSettings.DNSResolvConfOptions = internalLabels.dnsResolvConfOptions
 	}
 
 	if len(internalLabels.deviceMapping) > 0 {
-		devicesJSON, err := json.Marshal(internalLabels.deviceMapping)
-		if err != nil {
-			return nil, err
-		}
-		m[labels.DeviceMapping] = string(devicesJSON)
+		hostConfigLabel.DeviceMapping = internalLabels.deviceMapping
+	}
+
+	hostConfigJSON, err := json.Marshal(hostConfigLabel)
+	if err != nil {
+		return nil, err
+	}
+	m[labels.HostConfigLabel] = string(hostConfigJSON)
+
+	dnsSettingsJSON, err := json.Marshal(dnsSettings)
+	if err != nil {
+		return nil, err
 	}
+	m[labels.DNSSetting] = string(dnsSettingsJSON)
 
 	return containerd.WithAdditionalContainerLabels(m), nil
 }

pkg/inspecttypes/dockercompat/dockercompat.go

@@ -236,6 +236,12 @@ type DNSSettings struct {
 	DNSSearchDomains     []string
 }
 
+type HostConfigLabel struct {
+	BlkioWeight   uint16
+	CidFile       string
+	DeviceMapping []string
+}
+
 type CPUSettings struct {
 	cpuSetCpus string
 	cpuSetMems string
@@ -359,18 +365,11 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 		}
 	}
 
-	if blkioWeightSet := n.Labels[labels.BlkioWeight]; blkioWeightSet != "" {
-		var blkioWeight uint16
-		_, err := fmt.Sscanf(blkioWeightSet, "%d", &blkioWeight)
-		if err != nil {
-			return nil, fmt.Errorf("failed to convert string to uint: %v", err)
-		}
-		c.HostConfig.BlkioWeight = blkioWeight
-	}
+	// var hostConfigLabel HostConfigLabel
+	hostConfigLabel, err := getHostConfigLabelFromNative(n.Labels)
 
-	if cidFile := n.Labels[labels.CIdFile]; cidFile != "" {
-		c.HostConfig.ContainerIDFile = cidFile
-	}
+	c.HostConfig.BlkioWeight = hostConfigLabel.BlkioWeight
+	c.HostConfig.ContainerIDFile = hostConfigLabel.CidFile
 
 	groupAdd, err := groupAddFromNative(n.Spec.(*specs.Spec))
 	if err != nil {
@@ -479,11 +478,7 @@ func ContainerFromNative(n *native.Container) (*Container, error) {
 	}
 	c.Config.Hostname = hostname
 
-	c.HostConfig.Devices = []string{}
-	if nedctlDeviceMapping := n.Labels[labels.DeviceMapping]; nedctlDeviceMapping != "" {
-		devices, _ := parseDeviceMapping(nedctlDeviceMapping)
-		c.HostConfig.Devices = devices
-	}
+	c.HostConfig.Devices = hostConfigLabel.DeviceMapping
 
 	return c, nil
 }
@@ -737,24 +732,23 @@ func getMemorySettingsFromNative(sp *specs.Spec) (*MemorySetting, error) {
 func getDNSFromNative(Labels map[string]string) (*DNSSettings, error) {
 	res := &DNSSettings{}
 
-	if dnsServers := Labels[labels.DNSServer]; dnsServers != "" {
-		if err := json.Unmarshal([]byte(dnsServers), &res.DNSServers); err != nil {
-			return nil, fmt.Errorf("failed to parse DNS servers: %v", err)
+	if dnsSettingJSON, ok := Labels[labels.DNSSetting]; ok {
+		if err := json.Unmarshal([]byte(dnsSettingJSON), &res); err != nil {
+			return nil, fmt.Errorf("failed to parse DNS settings: %v", err)
 		}
 	}
 
-	if dnsOptions := Labels[labels.DNSResolvConfOptions]; dnsOptions != "" {
-		if err := json.Unmarshal([]byte(dnsOptions), &res.DNSResolvConfOptions); err != nil {
-			return nil, fmt.Errorf("failed to parse DNS options: %v", err)
-		}
-	}
+	return res, nil
+}
 
-	if dnsSearch := Labels[labels.DNSSearchDomains]; dnsSearch != "" {
-		if err := json.Unmarshal([]byte(dnsSearch), &res.DNSSearchDomains); err != nil {
-			return nil, fmt.Errorf("failed to parse DNS search domains: %v", err)
+func getHostConfigLabelFromNative(Labels map[string]string) (*HostConfigLabel, error) {
+	res := &HostConfigLabel{}
+
+	if hostConfigLabelJSON, ok := Labels[labels.HostConfigLabel]; ok {
+		if err := json.Unmarshal([]byte(hostConfigLabelJSON), &res); err != nil {
+			return nil, fmt.Errorf("failed to parse DNS servers: %v", err)
 		}
 	}
-
 	return res, nil
 }
 

pkg/labels/labels.go

@@ -101,27 +101,15 @@ const (
 	// (like "nerdctl/default-network=true" or "nerdctl/default-network=false")
 	NerdctlDefaultNetwork = Prefix + "default-network"
 
-	// LogConfig defines the logging configuration passed to the container
-	LogConfig = Prefix + "log-config"
-
 	// ContainerAutoRemove is to check whether the --rm option is specified.
 	ContainerAutoRemove = Prefix + "auto-remove"
 
-	// BlkioWeight to check if the --blkio-weight is specified
-	BlkioWeight = Prefix + "blkio-weight"
-
-	// Cidfile is the ContainerId file set via the --cidfile flag
-	CIdFile = Prefix + "cid-file"
-
-	// Custom DNS lookup servers.
-	DNSServer = Prefix + "dns"
-
-	// DNSResolvConfOptions set DNS options
-	DNSResolvConfOptions = Prefix + "dns-options"
+	// LogConfig defines the logging configuration passed to the container
+	LogConfig = Prefix + "log-config"
 
-	// DNSSearchDomains set custom DNS search domains
-	DNSSearchDomains = Prefix + "dns-search"
+	// HostConfigLabel sets the dockercompat host config values
+	HostConfigLabel = Prefix + "host-config"
 
-	//DeviceMapping specifies mapping host device to the container
-	DeviceMapping = Prefix + "devices"
+	// DNSSettings sets the dockercompat Dns config values
+	DNSSetting = Prefix + "dns"
 )