From c9b2364e81ae86e03c742b97f4f9c8c8fd68666c Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 10 Apr 2025 17:44:39 +0100 Subject: [PATCH 1/3] feat(testutil): add GetRandomNameHyphenated --- cli/templatepush_test.go | 2 +- coderd/templateversions_test.go | 2 +- testutil/names.go | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go index 89fd024b0c33a..b8e4147e6bab4 100644 --- a/cli/templatepush_test.go +++ b/cli/templatepush_test.go @@ -534,7 +534,7 @@ func TestTemplatePush(t *testing.T) { "test_name": tt.name, })) - templateName := strings.ReplaceAll(testutil.GetRandomName(t), "_", "-") + templateName := testutil.GetRandomNameHyphenated(t) inv, root := clitest.New(t, "templates", "push", templateName, "-d", tempDir, "--yes") clitest.SetupConfig(t, templateAdmin, root) diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go index 4e3e3d2f7f2b0..433441fdd4cf9 100644 --- a/coderd/templateversions_test.go +++ b/coderd/templateversions_test.go @@ -617,7 +617,7 @@ func TestPostTemplateVersionsByOrganization(t *testing.T) { require.NoError(t, err) // Create a template version from the archive - tvName := strings.ReplaceAll(testutil.GetRandomName(t), "_", "-") + tvName := testutil.GetRandomNameHyphenated(t) tv, err := templateAdmin.CreateTemplateVersion(ctx, owner.OrganizationID, codersdk.CreateTemplateVersionRequest{ Name: tvName, StorageMethod: codersdk.ProvisionerStorageMethodFile, diff --git a/testutil/names.go b/testutil/names.go index ee182ed50b68d..4703e92bacf6d 100644 --- a/testutil/names.go +++ b/testutil/names.go @@ -2,6 +2,7 @@ package testutil import ( "strconv" + "strings" "sync/atomic" "testing" @@ -25,6 +26,15 @@ func GetRandomName(t testing.TB) string { return incSuffix(name, n.Add(1), maxNameLen) } +// GetRandomnameHyphenated is as GetRandomName but uses a hyphen "-" instead of +// an underscore. +func GetRandomNameHyphenated(t testing.TB) string { + t.Helper() + name := namesgenerator.GetRandomName(0) + name = strings.ReplaceAll(name, "_", "-") + return incSuffix(name, n.Add(1), maxNameLen) +} + func incSuffix(s string, num int64, maxLen int) string { suffix := strconv.FormatInt(num, 10) if len(s)+len(suffix) <= maxLen { From 512a26cac8e893b15ccb3626290f9896f13911d7 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 10 Apr 2025 17:47:08 +0100 Subject: [PATCH 2/3] Update testutil/names.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- testutil/names.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testutil/names.go b/testutil/names.go index 4703e92bacf6d..27268c76518d3 100644 --- a/testutil/names.go +++ b/testutil/names.go @@ -26,7 +26,7 @@ func GetRandomName(t testing.TB) string { return incSuffix(name, n.Add(1), maxNameLen) } -// GetRandomnameHyphenated is as GetRandomName but uses a hyphen "-" instead of +// GetRandomNameHyphenated is as GetRandomName but uses a hyphen "-" instead of // an underscore. func GetRandomNameHyphenated(t testing.TB) string { t.Helper() From 371476a9c5bbb5eeec9375a83456b63cc050636f Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 10 Apr 2025 17:57:52 +0100 Subject: [PATCH 3/3] Update testutil/names.go no need to double-inc --- testutil/names.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testutil/names.go b/testutil/names.go index 27268c76518d3..e53e854fae239 100644 --- a/testutil/names.go +++ b/testutil/names.go @@ -31,8 +31,7 @@ func GetRandomName(t testing.TB) string { func GetRandomNameHyphenated(t testing.TB) string { t.Helper() name := namesgenerator.GetRandomName(0) - name = strings.ReplaceAll(name, "_", "-") - return incSuffix(name, n.Add(1), maxNameLen) + return strings.ReplaceAll(name, "_", "-") } func incSuffix(s string, num int64, maxLen int) string {