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

fix: show user-auth provisioners for all organizations#16350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
aslilac merged 2 commits intomainfromlilac/user-auth-provisioners-fix
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletionscli/provisioners_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,7 @@ func TestProvisioners_Golden(t *testing.T) {
Name: "provisioner-1",
CreatedAt: dbtime.Now().Add(1 * time.Second),
LastSeenAt: sql.NullTime{Time: coderdAPI.Clock.Now().Add(time.Hour), Valid: true}, // Stale interval can't be adjusted, keep online.
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
Tags: database.StringMap{"owner": "", "scope": "organization", "foo": "bar"},
})
w1 := dbgen.Workspace(t, coderdAPI.Database, database.WorkspaceTable{
Expand All@@ -122,7 +122,7 @@ func TestProvisioners_Golden(t *testing.T) {
Name: "provisioner-2",
CreatedAt: dbtime.Now().Add(2 * time.Second),
LastSeenAt: sql.NullTime{Time: coderdAPI.Clock.Now().Add(-time.Hour), Valid: true},
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
Tags: database.StringMap{"owner": "", "scope": "organization"},
})
w2 := dbgen.Workspace(t, coderdAPI.Database, database.WorkspaceTable{
Expand DownExpand Up@@ -168,7 +168,7 @@ func TestProvisioners_Golden(t *testing.T) {
Name: "provisioner-3",
CreatedAt: dbtime.Now().Add(3 * time.Second),
LastSeenAt: sql.NullTime{Time: coderdAPI.Clock.Now().Add(time.Hour), Valid: true}, // Stale interval can't be adjusted, keep online.
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
Tags: database.StringMap{"owner": "", "scope": "organization"},
})

Expand Down
6 changes: 3 additions & 3 deletionscoderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,7 +114,7 @@ func New() database.Store {
q.defaultProxyIconURL = "/emojis/1f3e1.png"

_, err = q.InsertProvisionerKey(context.Background(), database.InsertProvisionerKeyParams{
ID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
ID: codersdk.ProvisionerKeyUUIDBuiltIn,
OrganizationID: defaultOrg.ID,
CreatedAt: dbtime.Now(),
HashedSecret: []byte{},
Expand All@@ -125,7 +125,7 @@ func New() database.Store {
panic(xerrors.Errorf("failed to create built-in provisioner key: %w", err))
}
_, err = q.InsertProvisionerKey(context.Background(), database.InsertProvisionerKeyParams{
ID:uuid.MustParse(codersdk.ProvisionerKeyIDUserAuth),
ID: codersdk.ProvisionerKeyUUIDUserAuth,
OrganizationID: defaultOrg.ID,
CreatedAt: dbtime.Now(),
HashedSecret: []byte{},
Expand All@@ -136,7 +136,7 @@ func New() database.Store {
panic(xerrors.Errorf("failed to create user-auth provisioner key: %w", err))
}
_, err = q.InsertProvisionerKey(context.Background(), database.InsertProvisionerKeyParams{
ID:uuid.MustParse(codersdk.ProvisionerKeyIDPSK),
ID: codersdk.ProvisionerKeyUUIDPSK,
OrganizationID: defaultOrg.ID,
CreatedAt: dbtime.Now(),
HashedSecret: []byte{},
Expand Down
8 changes: 4 additions & 4 deletionscoderd/database/dbpurge/dbpurge_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -413,7 +413,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
Version: "1.0.0",
APIVersion: proto.CurrentVersion.String(),
OrganizationID: defaultOrg.ID,
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
})
require.NoError(t, err)
_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All@@ -426,7 +426,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
Version: "1.0.0",
APIVersion: proto.CurrentVersion.String(),
OrganizationID: defaultOrg.ID,
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
})
require.NoError(t, err)
_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All@@ -441,7 +441,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
Version: "1.0.0",
APIVersion: proto.CurrentVersion.String(),
OrganizationID: defaultOrg.ID,
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
})
require.NoError(t, err)
_, err = db.UpsertProvisionerDaemon(ctx, database.UpsertProvisionerDaemonParams{
Expand All@@ -457,7 +457,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
Version: "1.0.0",
APIVersion: proto.CurrentVersion.String(),
OrganizationID: defaultOrg.ID,
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
})
require.NoError(t, err)

Expand Down
2 changes: 1 addition & 1 deletioncoderd/provisionerdserver/provisionerdserver_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2272,7 +2272,7 @@ func setup(t *testing.T, ignoreLogErrors bool, ov *overrides) (proto.DRPCProvisi
Version: buildinfo.Version(),
APIVersion: proto.CurrentVersion.String(),
OrganizationID: defOrg.ID,
KeyID:uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
KeyID: codersdk.ProvisionerKeyUUIDBuiltIn,
})
require.NoError(t, err)

Expand Down
6 changes: 6 additions & 0 deletionscodersdk/provisionerdaemons.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -352,6 +352,12 @@ const (
ProvisionerKeyIDPSK = "00000000-0000-0000-0000-000000000003"
)

var (
ProvisionerKeyUUIDBuiltIn = uuid.MustParse(ProvisionerKeyIDBuiltIn)
ProvisionerKeyUUIDUserAuth = uuid.MustParse(ProvisionerKeyIDUserAuth)
ProvisionerKeyUUIDPSK = uuid.MustParse(ProvisionerKeyIDPSK)
)

const (
ProvisionerKeyNameBuiltIn = "built-in"
ProvisionerKeyNameUserAuth = "user-auth"
Expand Down
6 changes: 5 additions & 1 deletionenterprise/coderd/provisionerdaemons_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -782,10 +782,14 @@ func TestGetProvisionerDaemons(t *testing.T) {
pkDaemons, err := orgAdmin.ListProvisionerKeyDaemons(ctx, org.ID)
require.NoError(t, err)

require.Len(t, pkDaemons,1)
require.Len(t, pkDaemons,2)
require.Len(t, pkDaemons[0].Daemons, 1)
assert.Equal(t, keys[0].ID, pkDaemons[0].Key.ID)
assert.Equal(t, keys[0].Name, pkDaemons[0].Key.Name)
// user-auth provisioners
require.Len(t, pkDaemons[1].Daemons, 0)
assert.Equal(t, codersdk.ProvisionerKeyUUIDUserAuth, pkDaemons[1].Key.ID)
assert.Equal(t, codersdk.ProvisionerKeyNameUserAuth, pkDaemons[1].Key.Name)

assert.Equal(t, daemonName, pkDaemons[0].Daemons[0].Name)
assert.Equal(t, buildinfo.Version(), pkDaemons[0].Daemons[0].Version)
Expand Down
14 changes: 14 additions & 0 deletionsenterprise/coderd/provisionerkeys.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,6 +137,20 @@ func (api *API) provisionerKeyDaemons(rw http.ResponseWriter, r *http.Request) {
}
sdkKeys := convertProvisionerKeys(pks)

// For the default organization, we insert three rows for the special
// provisioner key types (built-in, user-auth, and psk). We _don't_ insert
// those into the database for any other org, but we still need to include the
// user-auth key in this list, so we just insert it manually.
if !slices.ContainsFunc(sdkKeys, func(key codersdk.ProvisionerKey) bool {
return key.ID == codersdk.ProvisionerKeyUUIDUserAuth
}) {
sdkKeys = append(sdkKeys, codersdk.ProvisionerKey{
ID: codersdk.ProvisionerKeyUUIDUserAuth,
Name: codersdk.ProvisionerKeyNameUserAuth,
Tags: map[string]string{},
})
}

daemons, err := api.Database.GetProvisionerDaemonsByOrganization(ctx, database.GetProvisionerDaemonsByOrganizationParams{OrganizationID: organization.ID})
if err != nil {
httpapi.InternalServerError(rw, err)
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp