remove unix scheme from containerd address

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
anchore · Sep 14, 2023 · d09921b · d09921b
1 parent 061d521
commit d09921b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/internal/containerd/client.go b/internal/containerd/client.go
@@ -65,7 +65,7 @@ func getAddress(fs afero.Fs, xdgRuntimeDir, defaultSocketPath string) (string, e
 		log.WithFields("path", candidate).Trace("trying containerd socket")
 		_, err := fs.Stat(candidate)
 		if err == nil {
-			addr = fmt.Sprintf("unix://%s", candidate)
+			addr = candidate
 			break
 		}
 	}

diff --git a/internal/containerd/client_test.go b/internal/containerd/client_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func Test_getContainerHostAddress(t *testing.T) {
+func Test_getAddress(t *testing.T) {
 	type args struct {
 		containerHostEnvVar string
 		xdgRuntimeDir       string
@@ -23,11 +23,11 @@ func Test_getContainerHostAddress(t *testing.T) {
 		{
 			name: "env vars trump default socket values",
 			args: args{
-				containerHostEnvVar: "unix:///somewhere/containerd.sock",
+				containerHostEnvVar: "/somewhere/containerd.sock",
 				xdgRuntimeDir:       "/xdg-runtime",
 				defaultSocketPath:   "/default/containerd.sock",
 			},
-			want:    "unix:///somewhere/containerd.sock",
+			want:    "/somewhere/containerd.sock",
 			wantErr: assert.NoError,
 		},
 
@@ -38,7 +38,7 @@ func Test_getContainerHostAddress(t *testing.T) {
 				xdgRuntimeDir:       "/xdg-runtime",
 				defaultSocketPath:   "/default/containerd.sock",
 			},
-			want:    "unix:///proc/42/root/run/containerd/containerd.sock",
+			want:    "/proc/42/root/run/containerd/containerd.sock",
 			wantErr: assert.NoError,
 		},
 		{
@@ -48,7 +48,7 @@ func Test_getContainerHostAddress(t *testing.T) {
 				xdgRuntimeDir:       "does-not-exist",
 				defaultSocketPath:   "/default/containerd.sock",
 			},
-			want:    "unix:///default/containerd.sock",
+			want:    "/default/containerd.sock",
 			wantErr: assert.NoError,
 		},
 		{
@@ -58,7 +58,7 @@ func Test_getContainerHostAddress(t *testing.T) {
 				xdgRuntimeDir:       "/xdg-runtime-empty",
 				defaultSocketPath:   "/default/containerd.sock",
 			},
-			want:    "unix:///default/containerd.sock",
+			want:    "/default/containerd.sock",
 			wantErr: assert.NoError,
 		},
 		{
@@ -68,7 +68,7 @@ func Test_getContainerHostAddress(t *testing.T) {
 				xdgRuntimeDir:       "/xdg-runtime-stale",
 				defaultSocketPath:   "/default/containerd.sock",
 			},
-			want:    "unix:///default/containerd.sock",
+			want:    "/default/containerd.sock",
 			wantErr: assert.NoError,
 		},
 		{