From 52db3b88ef2a54b1f7e65c2ef0ed30b8244e6dee Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 5 Apr 2023 13:12:57 -0500 Subject: [PATCH] fix: increase workspace name randomess in tests ``` workspacequota_test.go:123: Error Trace: /home/runner/work/coder/coder/coderd/coderdtest/coderdtest.go:720 /home/runner/work/coder/coder/enterprise/coderd/workspacequota_test.go:123 Error: Received unexpected error: POST http://localhost:37239/api/v2/organizations/0892af03-155e-4de3-a11f-a9359ca3e807/members/me/workspaces: unexpected status code 409: Workspace "objective-jang3" already exists. name: This value is already in use and should be unique. Test: TestWorkspaceQuota/BlocksBuild ``` --- coderd/coderdtest/coderdtest.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index d26ebd1ce0d92..0526c3299e666 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -484,7 +484,7 @@ func CreateAnotherUser(t *testing.T, client *codersdk.Client, organizationID uui func createAnotherUserRetry(t *testing.T, client *codersdk.Client, organizationID uuid.UUID, retries int, roles ...string) (*codersdk.Client, codersdk.User) { req := codersdk.CreateUserRequest{ Email: namesgenerator.GetRandomName(10) + "@coder.com", - Username: randomUsername(), + Username: randomUsername(t), Password: "SomeSecurePassword!", OrganizationID: organizationID, } @@ -589,8 +589,8 @@ func CreateWorkspaceBuild( // compatibility with testing. The name assigned is randomly generated. func CreateTemplate(t *testing.T, client *codersdk.Client, organization uuid.UUID, version uuid.UUID, mutators ...func(*codersdk.CreateTemplateRequest)) codersdk.Template { req := codersdk.CreateTemplateRequest{ - Name: randomUsername(), - Description: randomUsername(), + Name: randomUsername(t), + Description: randomUsername(t), VersionID: version, } for _, mut := range mutators { @@ -709,7 +709,7 @@ func CreateWorkspace(t *testing.T, client *codersdk.Client, organization uuid.UU t.Helper() req := codersdk.CreateWorkspaceRequest{ TemplateID: templateID, - Name: randomUsername(), + Name: randomUsername(t), AutostartSchedule: ptr.Ref("CRON_TZ=US/Central 30 9 * * 1-5"), TTLMillis: ptr.Ref((8 * time.Hour).Milliseconds()), } @@ -1065,8 +1065,10 @@ func NewAzureInstanceIdentity(t *testing.T, instanceID string) (x509.VerifyOptio } } -func randomUsername() string { - return strings.ReplaceAll(namesgenerator.GetRandomName(10), "_", "-") +func randomUsername(t testing.TB) string { + suffix, err := cryptorand.String(3) + require.NoError(t, err) + return strings.ReplaceAll(namesgenerator.GetRandomName(10), "_", "-") + "-" + suffix } // Used to easily create an HTTP transport! pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy