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

Commitc0ae056

Browse files
committed
pr comments
1 parentf676ba4 commitc0ae056

File tree

7 files changed

+37
-16
lines changed

7 files changed

+37
-16
lines changed

‎coderd/database/db2sdk/db2sdk.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,11 +544,6 @@ func ProvisionerDaemon(dbDaemon database.ProvisionerDaemon) codersdk.Provisioner
544544
funcRecentProvisionerDaemons(now time.Time,staleInterval time.Duration,daemons []database.ProvisionerDaemon) []codersdk.ProvisionerDaemon {
545545
results:= []codersdk.ProvisionerDaemon{}
546546

547-
// Ensure stable order for display and for tests
548-
sort.Slice(daemons,func(i,jint)bool {
549-
returndaemons[i].Name<daemons[j].Name
550-
})
551-
552547
for_,daemon:=rangedaemons {
553548
// Daemon never connected, skip.
554549
if!daemon.LastSeenAt.Valid {
@@ -562,6 +557,11 @@ func RecentProvisionerDaemons(now time.Time, staleInterval time.Duration, daemon
562557
results=append(results,ProvisionerDaemon(daemon))
563558
}
564559

560+
// Ensure stable order for display and for tests
561+
sort.Slice(results,func(i,jint)bool {
562+
returnresults[i].Name<results[j].Name
563+
})
564+
565565
returnresults
566566
}
567567

‎coderd/database/dbmem/dbmem.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func New() database.Store {
115115
OrganizationID:defaultOrg.ID,
116116
CreatedAt:dbtime.Now(),
117117
HashedSecret: []byte{},
118-
Name:"built-in",
118+
Name:codersdk.ProvisionerKeyNameBuiltIn,
119119
Tags:map[string]string{},
120120
})
121121
iferr!=nil {
@@ -126,7 +126,7 @@ func New() database.Store {
126126
OrganizationID:defaultOrg.ID,
127127
CreatedAt:dbtime.Now(),
128128
HashedSecret: []byte{},
129-
Name:"user-auth",
129+
Name:codersdk.ProvisionerKeyNameUserAuth,
130130
Tags:map[string]string{},
131131
})
132132
iferr!=nil {
@@ -137,7 +137,7 @@ func New() database.Store {
137137
OrganizationID:defaultOrg.ID,
138138
CreatedAt:dbtime.Now(),
139139
HashedSecret: []byte{},
140-
Name:"psk",
140+
Name:codersdk.ProvisionerKeyNamePSK,
141141
Tags:map[string]string{},
142142
})
143143
iferr!=nil {

‎coderd/database/dbpurge/dbpurge_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/coder/coder/v2/coderd/database/dbrollup"
2727
"github.com/coder/coder/v2/coderd/database/dbtestutil"
2828
"github.com/coder/coder/v2/coderd/database/dbtime"
29+
"github.com/coder/coder/v2/codersdk"
2930
"github.com/coder/coder/v2/provisionerd/proto"
3031
"github.com/coder/coder/v2/provisionersdk"
3132
"github.com/coder/coder/v2/testutil"
@@ -412,6 +413,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
412413
Version:"1.0.0",
413414
APIVersion:proto.CurrentVersion.String(),
414415
OrganizationID:defaultOrg.ID,
416+
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
415417
})
416418
require.NoError(t,err)
417419
_,err=db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
@@ -424,6 +426,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
424426
Version:"1.0.0",
425427
APIVersion:proto.CurrentVersion.String(),
426428
OrganizationID:defaultOrg.ID,
429+
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
427430
})
428431
require.NoError(t,err)
429432
_,err=db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
@@ -438,6 +441,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
438441
Version:"1.0.0",
439442
APIVersion:proto.CurrentVersion.String(),
440443
OrganizationID:defaultOrg.ID,
444+
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
441445
})
442446
require.NoError(t,err)
443447
_,err=db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
@@ -453,6 +457,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
453457
Version:"1.0.0",
454458
APIVersion:proto.CurrentVersion.String(),
455459
OrganizationID:defaultOrg.ID,
460+
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
456461
})
457462
require.NoError(t,err)
458463

‎coderd/database/queries/provisionerkeys.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,13 @@ FROM
4545
WHERE
4646
organization_id= $1
4747
AND
48+
-- exclude reserved built-in key
4849
id!='11111111-1111-1111-1111-111111111111'::uuid
4950
AND
51+
-- exclude reserved user-auth key
5052
id!='22222222-2222-2222-2222-222222222222'::uuid
5153
AND
54+
-- exclude reserved psk key
5255
id!='33333333-3333-3333-3333-333333333333'::uuid;
5356

5457
-- name: DeleteProvisionerKey :exec

‎codersdk/provisionerdaemons.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,20 @@ const (
289289
ProvisionerKeyIDPSK="33333333-3333-3333-3333-333333333333"
290290
)
291291

292+
const (
293+
ProvisionerKeyNameBuiltIn="built-in"
294+
ProvisionerKeyNameUserAuth="user-auth"
295+
ProvisionerKeyNamePSK="psk"
296+
)
297+
298+
funcReservedProvisionerKeyNames() []string {
299+
return []string{
300+
ProvisionerKeyNameBuiltIn,
301+
ProvisionerKeyNameUserAuth,
302+
ProvisionerKeyNamePSK,
303+
}
304+
}
305+
292306
typeCreateProvisionerKeyRequeststruct {
293307
Namestring`json:"name"`
294308
Tagsmap[string]string`json:"tags"`

‎enterprise/coderd/provisionerkeys.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ func (api *API) postProvisionerKey(rw http.ResponseWriter, r *http.Request) {
5555
return
5656
}
5757

58-
reserved:= []string{"built-in","psk","user-auth"}
59-
ifslices.Contains(reserved,req.Name) {
58+
ifslices.Contains(codersdk.ReservedProvisionerKeyNames(),req.Name) {
6059
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
6160
Message:fmt.Sprintf("Name cannot be reserved name '%s'",req.Name),
6261
Validations: []codersdk.ValidationError{

‎enterprise/coderd/provisionerkeys_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ func TestProvisionerKeys(t *testing.T) {
6666

6767
// org admin cannot create reserved provisioner keys
6868
_,err=orgAdmin.CreateProvisionerKey(ctx,owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
69-
Name:"built-in",
69+
Name:codersdk.ProvisionerKeyNameBuiltIn,
7070
})
7171
require.ErrorContains(t,err,"reserved")
7272
_,err=orgAdmin.CreateProvisionerKey(ctx,owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
73-
Name:"user-auth",
73+
Name:codersdk.ProvisionerKeyNameUserAuth,
7474
})
7575
require.ErrorContains(t,err,"reserved")
7676
_,err=orgAdmin.CreateProvisionerKey(ctx,owner.OrganizationID, codersdk.CreateProvisionerKeyRequest{
77-
Name:"psk",
77+
Name:codersdk.ProvisionerKeyNamePSK,
7878
})
7979
require.ErrorContains(t,err,"reserved")
8080

@@ -127,10 +127,10 @@ func TestProvisionerKeys(t *testing.T) {
127127
require.ErrorContains(t,err,"Resource not found")
128128

129129
// org admin cannot delete reserved provisioner keys
130-
err=orgAdmin.DeleteProvisionerKey(ctx,owner.OrganizationID,"built-in")
130+
err=orgAdmin.DeleteProvisionerKey(ctx,owner.OrganizationID,codersdk.ProvisionerKeyNameBuiltIn)
131131
require.ErrorContains(t,err,"reserved")
132-
err=orgAdmin.DeleteProvisionerKey(ctx,owner.OrganizationID,"user-auth")
132+
err=orgAdmin.DeleteProvisionerKey(ctx,owner.OrganizationID,codersdk.ProvisionerKeyNameUserAuth)
133133
require.ErrorContains(t,err,"reserved")
134-
err=orgAdmin.DeleteProvisionerKey(ctx,owner.OrganizationID,"psk")
134+
err=orgAdmin.DeleteProvisionerKey(ctx,owner.OrganizationID,codersdk.ProvisionerKeyNamePSK)
135135
require.ErrorContains(t,err,"reserved")
136136
}

0 commit comments

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