build(deps): update nerdctl to v2.1.6 from v2.1.3

Signed-off-by: Swapnanil-Gupta <[email protected]>

Author: Swapnanil-Gupta

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ on:
       - '**.md'
   workflow_dispatch:
 env:
-  GO_VERSION: '1.23.8'
+  GO_VERSION: '1.24.6'
   GOLANGCI_LINT_VERSION: '1.64.8'
 jobs:
   git-secrets:
@@ -80,7 +80,7 @@ jobs:
     strategy:
       matrix:
         containerd: ["1.7.27", "2.1.3"]
-        nerdctl: ["2.1.2", "2.1.3"]
+        nerdctl: ["2.1.3", "2.1.4", "2.1.5", "2.1.6"]
       fail-fast: false
     timeout-minutes: 10
     steps:

.github/workflows/finch-vm-test.yaml

@@ -12,7 +12,7 @@ on:
       - '**.md'
   workflow_dispatch:
 env:
-  GO_VERSION: '1.24.x'
+  GO_VERSION: '1.24.6'
 jobs:
   mac-test-e2e:
     runs-on: codebuild-finch-daemon-arm64-2-instance-${{ github.run_id }}-${{ github.run_attempt }}

.github/workflows/release-automation.yaml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   workflow_call:
 env:
-  GO_VERSION: '1.23.8'
+  GO_VERSION: '1.24.6'
 permissions:
   contents: write
   deployments: write

.github/workflows/samcli-direct.yaml

@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 env:
-  GO_VERSION: '1.24.x'
+  GO_VERSION: '1.24.6'
   CONTAINERD_VERSION: '2.0.x'
 
 permissions:

.github/workflows/samcli-vm.yaml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  GO_VERSION: '1.24.x'
+  GO_VERSION: '1.24.6'
   PYTHON_VERSION: '3.11'
   PYTHON_BINARY: 'python3.11'
   AWS_DEFAULT_REGION: "${{ secrets.REGION }}"

e2e/tests/container_create.go

@@ -15,12 +15,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containerd/continuity/testutil/loopback"
 	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/moby/api/types/blkiodev"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/runfinch/common-tests/command"
 	"github.com/runfinch/common-tests/ffs"
 	"github.com/runfinch/common-tests/option"
@@ -841,21 +841,16 @@ func ContainerCreate(opt *option.Option, pOpt util.NewOpt) {
 				Skip("Blkio settings are only supported on Linux")
 			}
 
-			// Create dummy device paths
-			dummyDev1 := "/dev/dummy-zero1"
-			dummyDev2 := "/dev/dummy-zero2"
+			// check if our nerdctl version is >= 2.1.5 or not
+			// because nerdctl 2.1.5 saw changes in container inspect's hostconfig object
+			// where Blkio fields were changed from LinuxBlkio* to Blkio* and instead of device
+			// major:minor numbers, device paths are returned. See - https://github.com/containerd/nerdctl/pull/4512
+			RequireNerdctlVersion(opt, ">=2.1.5")
 
-			// Create dummy devices (major number 1 for char devices)
-			mknodOpt1, _ := pOpt([]string{"mknod", dummyDev1, "c", "1", "5"})
-			command.Run(mknodOpt1)
-			mknodOpt2, _ := pOpt([]string{"mknod", dummyDev2, "c", "1", "6"})
-			command.Run(mknodOpt2)
-
-			// Cleanup dummy devices after test
-			defer func() {
-				rmOpt, _ := pOpt([]string{"rm", "-f", dummyDev1, dummyDev2})
-				command.Run(rmOpt)
-			}()
+			// setup loop device
+			lo, err := loopback.New(4096)
+			Expect(err).Should(BeNil())
+			defer lo.Close()
 
 			// define options
 			options.Cmd = []string{"sleep", "Infinity"}
@@ -864,40 +859,36 @@ func ContainerCreate(opt *option.Option, pOpt util.NewOpt) {
 			// Create WeightDevice objects for input
 			weightDevices := []*blkiodev.WeightDevice{
 				{
-					Path:   dummyDev1,
+					Path:   lo.Device,
 					Weight: 400,
 				},
-				{
-					Path:   dummyDev2,
-					Weight: 300,
-				},
 			}
 
 			// Create ThrottleDevice objects for input
 			readBpsDevices := []*blkiodev.ThrottleDevice{
 				{
-					Path: dummyDev1,
+					Path: lo.Device,
 					Rate: 1048576, // 1MB/s
 				},
 			}
 
 			writeBpsDevices := []*blkiodev.ThrottleDevice{
 				{
-					Path: dummyDev1,
+					Path: lo.Device,
 					Rate: 2097152, // 2MB/s
 				},
 			}
 
 			readIopsDevices := []*blkiodev.ThrottleDevice{
 				{
-					Path: dummyDev1,
+					Path: lo.Device,
 					Rate: 1000,
 				},
 			}
 
 			writeIopsDevices := []*blkiodev.ThrottleDevice{
 				{
-					Path: dummyDev1,
+					Path: lo.Device,
 					Rate: 2000,
 				},
 			}
@@ -920,93 +911,23 @@ func ContainerCreate(opt *option.Option, pOpt util.NewOpt) {
 			// inspect container
 			resp := command.Stdout(opt, "inspect", testContainerName)
 			var inspect []*dockercompat.Container
-			err := json.Unmarshal(resp, &inspect)
+			err = json.Unmarshal(resp, &inspect)
 			Expect(err).Should(BeNil())
 			Expect(inspect).Should(HaveLen(1))
 
 			// Verify blkio settings in LinuxBlkioSettings
-			blkioSettings := inspect[0].HostConfig.LinuxBlkioSettings
+			blkioSettings := inspect[0].HostConfig.BlkioSettings
 			// Verify BlkioWeight
 			Expect(blkioSettings.BlkioWeight).Should(Equal(options.HostConfig.BlkioWeight))
 
-			// Helper function to map major/minor to device path
-			devicePathFromMajorMinor := func(major, minor int64) string {
-				if major == 1 && minor == 5 {
-					return dummyDev1
-				}
-				if major == 1 && minor == 6 {
-					return dummyDev2
-				}
-				return fmt.Sprintf("/dev/unknown-%d-%d", major, minor)
-			}
-
-			// Helper function to convert specs.LinuxWeightDevice to blkiodev.WeightDevice
-			convertWeightDevice := func(wd *specs.LinuxWeightDevice) *blkiodev.WeightDevice {
-				if wd == nil || wd.Weight == nil {
-					return nil
-				}
-				return &blkiodev.WeightDevice{
-					Path:   devicePathFromMajorMinor(wd.Major, wd.Minor),
-					Weight: *wd.Weight,
-				}
-			}
-
-			// Helper function to convert specs.LinuxThrottleDevice to blkiodev.ThrottleDevice
-			convertThrottleDevice := func(td *specs.LinuxThrottleDevice) *blkiodev.ThrottleDevice {
-				if td == nil {
-					return nil
-				}
-				return &blkiodev.ThrottleDevice{
-					Path: devicePathFromMajorMinor(td.Major, td.Minor),
-					Rate: td.Rate,
-				}
-			}
-
-			// Convert response devices to blkiodev types
-			responseWeightDevices := make([]*blkiodev.WeightDevice, 0, len(blkioSettings.BlkioWeightDevice))
-			for _, d := range blkioSettings.BlkioWeightDevice {
-				if converted := convertWeightDevice(d); converted != nil {
-					responseWeightDevices = append(responseWeightDevices, converted)
-				}
-			}
-
-			responseReadBpsDevices := make([]*blkiodev.ThrottleDevice, 0, len(blkioSettings.BlkioDeviceReadBps))
-			for _, d := range blkioSettings.BlkioDeviceReadBps {
-				if converted := convertThrottleDevice(d); converted != nil {
-					responseReadBpsDevices = append(responseReadBpsDevices, converted)
-				}
-			}
-
-			responseWriteBpsDevices := make([]*blkiodev.ThrottleDevice, 0, len(blkioSettings.BlkioDeviceWriteBps))
-			for _, d := range blkioSettings.BlkioDeviceWriteBps {
-				if converted := convertThrottleDevice(d); converted != nil {
-					responseWriteBpsDevices = append(responseWriteBpsDevices, converted)
-				}
-			}
-
-			responseReadIopsDevices := make([]*blkiodev.ThrottleDevice, 0, len(blkioSettings.BlkioDeviceReadIOps))
-			for _, d := range blkioSettings.BlkioDeviceReadIOps {
-				if converted := convertThrottleDevice(d); converted != nil {
-					responseReadIopsDevices = append(responseReadIopsDevices, converted)
-				}
-			}
-
-			responseWriteIopsDevices := make([]*blkiodev.ThrottleDevice, 0, len(blkioSettings.BlkioDeviceWriteIOps))
-			for _, d := range blkioSettings.BlkioDeviceWriteIOps {
-				if converted := convertThrottleDevice(d); converted != nil {
-					responseWriteIopsDevices = append(responseWriteIopsDevices, converted)
-				}
-			}
-
 			// Compare string representations
 			for i, wd := range weightDevices {
-				Expect(responseWeightDevices[i].String()).Should(Equal(wd.String()))
+				Expect(blkioSettings.BlkioWeightDevice[i].String()).Should(Equal(wd.String()))
 			}
-
-			Expect(responseReadBpsDevices[0].String()).Should(Equal(readBpsDevices[0].String()))
-			Expect(responseWriteBpsDevices[0].String()).Should(Equal(writeBpsDevices[0].String()))
-			Expect(responseReadIopsDevices[0].String()).Should(Equal(readIopsDevices[0].String()))
-			Expect(responseWriteIopsDevices[0].String()).Should(Equal(writeIopsDevices[0].String()))
+			Expect(blkioSettings.BlkioDeviceReadBps[0].String()).Should(Equal(readBpsDevices[0].String()))
+			Expect(blkioSettings.BlkioDeviceWriteBps[0].String()).Should(Equal(writeBpsDevices[0].String()))
+			Expect(blkioSettings.BlkioDeviceReadIOps[0].String()).Should(Equal(readIopsDevices[0].String()))
+			Expect(blkioSettings.BlkioDeviceWriteIOps[0].String()).Should(Equal(writeIopsDevices[0].String()))
 		})
 
 		It("should create container with volumes from another container", func() {

e2e/tests/container_inspect.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/containerd/continuity/testutil/loopback"
 	"github.com/docker/go-connections/nat"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -104,25 +105,13 @@ func ContainerInspect(opt *option.Option, pOpt util.NewOpt) {
 			}
 
 			// setup devices
-			tmpFileOpt, _ := pOpt([]string{"touch", "/tmp/loopdev"})
-			command.Run(tmpFileOpt)
-			defer func() {
-				rmOpt, _ := pOpt([]string{"rm", "-f", "/tmp/loopdev"})
-				command.Run(rmOpt)
-			}()
-			ddOpt, _ := pOpt([]string{"dd", "if=/dev/zero", "of=/tmp/loopdev", "bs=4096", "count=1"})
-			command.Run(ddOpt)
-			loopDevOpt, _ := pOpt([]string{"losetup", "-f", "--show", "/tmp/loopdev"})
-			loopDev := command.StdoutStr(loopDevOpt)
-			Expect(loopDev).ShouldNot(BeEmpty())
-			defer func() {
-				detachOpt, _ := pOpt([]string{"losetup", "-d", loopDev})
-				command.Run(detachOpt)
-			}()
+			lo, err := loopback.New(4096)
+			Expect(err).Should(BeNil())
+			defer lo.Close()
 			createOptions.HostConfig.Devices = []types.DeviceMapping{
 				{
-					PathOnHost:        loopDev,
-					PathInContainer:   loopDev,
+					PathOnHost:        lo.Device,
+					PathInContainer:   lo.Device,
 					CgroupPermissions: "rwm",
 				},
 			}

e2e/tests/tests.go

@@ -15,8 +15,10 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
 
+	"github.com/Masterminds/semver/v3"
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	"github.com/runfinch/common-tests/command"
@@ -234,3 +236,29 @@ func GetFinchDaemonExe() string {
 	}
 	return daemonPath
 }
+
+func GetNerdctlVersion(opt *option.Option) (string, error) {
+	output := command.StdoutStr(opt, "--version")
+	if output == "" {
+		return "", fmt.Errorf("failed to get nerdctl version")
+	}
+
+	re := regexp.MustCompile(`^nerdctl\s+version\s+(.*)$`)
+	matches := re.FindStringSubmatch(output)
+	if matches == nil || len(matches) != 2 {
+		return "", fmt.Errorf("regexp did not match properly, output: %s", output)
+	}
+	return matches[1], nil
+}
+
+func RequireNerdctlVersion(opt *option.Option, constraint string) {
+	nerdctlVersion, err := GetNerdctlVersion(opt)
+	gomega.Expect(err).Should(gomega.BeNil())
+	nerdctlSemver, err := semver.NewVersion(nerdctlVersion)
+	gomega.Expect(err).Should(gomega.BeNil())
+	nerdctlVersionConstraint, err := semver.NewConstraint(constraint)
+	gomega.Expect(err).Should(gomega.BeNil())
+	if nerdctlVersionConstraint.Check(nerdctlSemver) {
+		ginkgo.Skip(fmt.Sprintf("Test requires nerdctl version: %s, but got: %s", constraint, nerdctlVersion))
+	}
+}