Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit293764d

Browse files
committed
fix(coderd/database): ensure task name uniqueness
This change ensures task names are unique per user the same way we dofor workspaces. This ensures we don't create tasks that are impossibleto start due to another task being named the same creating a workspacename conflict.Updatescoder/internal#948Supersedes#20212
1 parenteca24da commit293764d

File tree

5 files changed

+89
-0
lines changed

5 files changed

+89
-0
lines changed

‎coderd/database/dump.sql‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
DROPINDEX IF EXISTS tasks_owner_id_name_unique_idx;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CREATEUNIQUE INDEXIF NOT EXISTS tasks_owner_id_name_unique_idxON tasks (owner_id,LOWER(name))WHERE deleted_at ISNULL;
2+
COMMENT ON INDEX tasks_owner_id_name_unique_idx IS'Index to ensure uniqueness for task owner/name';

‎coderd/database/querier_test.go‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7105,6 +7105,87 @@ func TestGetTaskByWorkspaceID(t *testing.T) {
71057105
}
71067106
}
71077107

7108+
funcTestTaskNameUniqueness(t*testing.T) {
7109+
t.Parallel()
7110+
7111+
ctx:=testutil.Context(t,testutil.WaitLong)
7112+
db,_:=dbtestutil.NewDB(t)
7113+
7114+
org:=dbgen.Organization(t,db, database.Organization{})
7115+
user1:=dbgen.User(t,db, database.User{})
7116+
user2:=dbgen.User(t,db, database.User{})
7117+
template:=dbgen.Template(t,db, database.Template{
7118+
OrganizationID:org.ID,
7119+
CreatedBy:user1.ID,
7120+
})
7121+
tv:=dbgen.TemplateVersion(t,db, database.TemplateVersion{
7122+
TemplateID: uuid.NullUUID{UUID:template.ID,Valid:true},
7123+
OrganizationID:org.ID,
7124+
CreatedBy:user1.ID,
7125+
})
7126+
7127+
taskName:="my-task"
7128+
7129+
// Create initial task for user1.
7130+
task1:=dbgen.Task(t,db, database.TaskTable{
7131+
OrganizationID:org.ID,
7132+
OwnerID:user1.ID,
7133+
Name:taskName,
7134+
TemplateVersionID:tv.ID,
7135+
Prompt:"Test prompt",
7136+
})
7137+
require.NotEqual(t,uuid.Nil,task1.ID)
7138+
7139+
tests:= []struct {
7140+
namestring
7141+
ownerID uuid.UUID
7142+
taskNamestring
7143+
wantErrbool
7144+
}{
7145+
{
7146+
name:"duplicate task name same user",
7147+
ownerID:user1.ID,
7148+
taskName:taskName,
7149+
wantErr:true,
7150+
},
7151+
{
7152+
name:"duplicate task name different case same user",
7153+
ownerID:user1.ID,
7154+
taskName:"MY-TASK",
7155+
wantErr:true,
7156+
},
7157+
{
7158+
name:"same task name different user",
7159+
ownerID:user2.ID,
7160+
taskName:taskName,
7161+
wantErr:false,
7162+
},
7163+
}
7164+
7165+
for_,tt:=rangetests {
7166+
t.Run(tt.name,func(t*testing.T) {
7167+
t.Parallel()
7168+
7169+
task,err:=db.InsertTask(ctx, database.InsertTaskParams{
7170+
OrganizationID:org.ID,
7171+
OwnerID:tt.ownerID,
7172+
Name:tt.taskName,
7173+
TemplateVersionID:tv.ID,
7174+
TemplateParameters:json.RawMessage("{}"),
7175+
Prompt:"Test prompt",
7176+
CreatedAt:dbtime.Now(),
7177+
})
7178+
iftt.wantErr {
7179+
require.Error(t,err)
7180+
}else {
7181+
require.NoError(t,err)
7182+
require.NotEqual(t,uuid.Nil,task.ID)
7183+
require.NotEqual(t,task1.ID,task.ID)
7184+
}
7185+
})
7186+
}
7187+
}
7188+
71087189
funcTestUsageEventsTrigger(t*testing.T) {
71097190
t.Parallel()
71107191

‎coderd/database/unique_constraint.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp