From b2b9d7f2f2b213fe4434e06fa6c274429ee53f04 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 20 Apr 2023 18:15:55 +0000 Subject: [PATCH] test: Fix generated workspace name length --- coderd/coderdtest/coderdtest.go | 7 ++++++- coderd/workspaces_test.go | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index 9c98f1cb38aaa..60113ad20feb2 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -1069,7 +1069,12 @@ func NewAzureInstanceIdentity(t *testing.T, instanceID string) (x509.VerifyOptio func randomUsername(t testing.TB) string { suffix, err := cryptorand.String(3) require.NoError(t, err) - return strings.ReplaceAll(namesgenerator.GetRandomName(10), "_", "-") + "-" + suffix + suffix = "-" + suffix + n := strings.ReplaceAll(namesgenerator.GetRandomName(10), "_", "-") + suffix + if len(n) > 32 { + n = n[:32-len(suffix)] + suffix + } + return n } // Used to easily create an HTTP transport! diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go index 26763b7eb967f..54e65939e719d 100644 --- a/coderd/workspaces_test.go +++ b/coderd/workspaces_test.go @@ -106,6 +106,9 @@ func TestWorkspace(t *testing.T) { defer cancel() want := ws1.Name + "-test" + if len(want) > 32 { + want = want[:32-5] + "-test" + } err := client.UpdateWorkspace(ctx, ws1.ID, codersdk.UpdateWorkspaceRequest{ Name: want, })