test: buildkit with defaults

.github/workflows/build.yml

@@ -43,6 +43,10 @@ jobs:
         with:
           go-version: "1.22"
           check-latest: true
+      - name: Add containerd-snapshotter to docker daemon
+        run: |
+          echo '{"features": { "containerd-snapshotter": true }}' | sudo tee /etc/docker/daemon.json
+          sudo systemctl restart docker
       - name: Unit test
         shell: bash
         env:

go.mod

@@ -6,7 +6,7 @@ toolchain go1.22.1
 
 require (
 	github.com/aquasecurity/trivy v0.51.4
-	github.com/containerd/containerd v1.7.19
+	github.com/containerd/platforms v0.2.1
 	github.com/cpuguy83/dockercfg v0.3.1
 	github.com/cpuguy83/go-docker v0.3.0
 	github.com/distribution/reference v0.6.0
@@ -57,11 +57,11 @@ require (
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/containerd/console v1.0.4 // indirect
+	github.com/containerd/containerd v1.7.19 // indirect
 	github.com/containerd/containerd/api v1.7.19 // indirect
 	github.com/containerd/continuity v0.4.3 // indirect
 	github.com/containerd/errdefs v0.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/containerd/ttrpc v1.2.5 // indirect
 	github.com/containerd/typeurl/v2 v2.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

pkg/buildkit/buildkit.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 
-	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/platforms"
 	"github.com/moby/buildkit/client/llb"
 	"github.com/moby/buildkit/client/llb/sourceresolver"
 	gwclient "github.com/moby/buildkit/frontend/gateway/client"

pkg/buildkit/buildkit_test.go

@@ -197,6 +197,18 @@ func TestNewClient(t *testing.T) {
 			cancel()
 			checkMissingCapsError(t, err, requiredCaps...)
 		})
+		t.Run("Invalid key path", func(t *testing.T) {
+			t.Parallel()
+			addr := newMockBuildkitAPI(t)
+			ctxT, cancel := context.WithTimeout(ctx, time.Second)
+			defer cancel()
+			bkOpts := Opts{
+				Addr:    `https://` + addr,
+				KeyPath: `No-Keys-Exist/Here`,
+			}
+			_, err := NewClient(ctxT, bkOpts)
+			assert.ErrorContains(t, err, "could not read certificate/key")
+		})
 		t.Run("with caps", func(t *testing.T) {
 			t.Parallel()
 			addr := newMockBuildkitAPI(t, requiredCaps...)
@@ -213,10 +225,16 @@ func TestNewClient(t *testing.T) {
 			err = ValidateClient(ctxT, client)
 			assert.NoError(t, err)
 		})
+		t.Run("default buildkit addr", func(t *testing.T) {
+			t.Parallel()
+			bkOpts := Opts{} // Initialize with default values
+			client, err := NewClient(context.TODO(), bkOpts)
+			assert.NoError(t, err)
+			defer client.Close()
+			err = ValidateClient(context.TODO(), client)
+			assert.NoError(t, err)
+		})
 	})
-
-	// TODO: Test with defaults, but then we need to control those socket paths.
-	// I considered doing this in a chroot, but it is fairly complicated to do so and requires root privileges anyway (or CAP_SYS_CHROOT).
 }
 
 func TestArrayFile(t *testing.T) {

pkg/patch/patch.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/platforms"
 	"github.com/docker/buildx/build"
 	"github.com/docker/cli/cli/config"
 	log "github.com/sirupsen/logrus"