From 0c817d49cacb2142061cdeee016a2634cf3eef64 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 20 Jan 2021 18:05:33 -0800 Subject: [PATCH] campaigns: temporary switch back to bind for non-root This can be reverted once we land #434. --- internal/campaigns/workspace.go | 2 +- internal/campaigns/workspace_test.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/campaigns/workspace.go b/internal/campaigns/workspace.go index b0b44b3a89..dabfc9c3af 100644 --- a/internal/campaigns/workspace.go +++ b/internal/campaigns/workspace.go @@ -128,7 +128,7 @@ func detectBestWorkspaceCreator(ctx context.Context, steps []Step) workspaceCrea } uids[uid] = struct{}{} - if len(uids) > 1 { + if len(uids) > 1 || uid != 0 { return workspaceCreatorBind } } diff --git a/internal/campaigns/workspace_test.go b/internal/campaigns/workspace_test.go index 9066381a89..27096f10c9 100644 --- a/internal/campaigns/workspace_test.go +++ b/internal/campaigns/workspace_test.go @@ -34,14 +34,13 @@ func TestBestWorkspaceCreator(t *testing.T) { "same user": { behaviours: map[string]expect.Behaviour{ "foo": {Stdout: []byte("1000\n")}, - "bar": {Stdout: []byte("1000\n")}, }, - want: workspaceCreatorVolume, + want: workspaceCreatorBind, }, "different user": { behaviours: map[string]expect.Behaviour{ - "foo": {Stdout: []byte("1000\n")}, - "bar": {Stdout: []byte("0\n")}, + "foo": {Stdout: []byte("0\n")}, + "bar": {Stdout: []byte("1000\n")}, }, want: workspaceCreatorBind, },