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

feat(coderd): add endpoint to list provisioner daemons#16028

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
mafredri merged 7 commits intomainfrommafredri/feat-coderd-provisioner-list
Jan 14, 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
61 changes: 60 additions & 1 deletioncoderd/apidoc/docs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

53 changes: 52 additions & 1 deletioncoderd/apidoc/swagger.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

3 changes: 3 additions & 0 deletionscoderd/coderd.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1007,6 +1007,9 @@ func New(options *Options) *API {
})
})
})
r.Route("/provisionerdaemons", func(r chi.Router) {
r.Get("/", api.provisionerDaemons)
})
})
})
r.Route("/templates", func(r chi.Router) {
Expand Down
4 changes: 4 additions & 0 deletionscoderd/database/dbauthz/dbauthz.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1936,6 +1936,10 @@ func (q *querier) GetProvisionerDaemonsByOrganization(ctx context.Context, organ
return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetProvisionerDaemonsByOrganization)(ctx, organizationID)
}

func (q *querier) GetProvisionerDaemonsWithStatusByOrganization(ctx context.Context, arg database.GetProvisionerDaemonsWithStatusByOrganizationParams) ([]database.GetProvisionerDaemonsWithStatusByOrganizationRow, error) {
return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetProvisionerDaemonsWithStatusByOrganization)(ctx, arg)
}

func (q *querier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (database.ProvisionerJob, error) {
job, err := q.db.GetProvisionerJobByID(ctx, id)
if err != nil {
Expand Down
18 changes: 18 additions & 0 deletionscoderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3189,6 +3189,24 @@ func (s *MethodTestSuite) TestExtraMethods() {
s.NoError(err, "get provisioner daemon by org")
check.Args(database.GetProvisionerDaemonsByOrganizationParams{OrganizationID: org.ID}).Asserts(d, policy.ActionRead).Returns(ds)
}))
s.Run("GetProvisionerDaemonsWithStatusByOrganization", s.Subtest(func(db database.Store, check *expects) {
org := dbgen.Organization(s.T(), db, database.Organization{})
d := dbgen.ProvisionerDaemon(s.T(), db, database.ProvisionerDaemon{
OrganizationID: org.ID,
Tags: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
},
})
ds, err := db.GetProvisionerDaemonsWithStatusByOrganization(context.Background(), database.GetProvisionerDaemonsWithStatusByOrganizationParams{
OrganizationID: org.ID,
StaleIntervalMS: 24 * time.Hour.Milliseconds(),
})
s.NoError(err, "get provisioner daemon with status by org")
check.Args(database.GetProvisionerDaemonsWithStatusByOrganizationParams{
OrganizationID: org.ID,
StaleIntervalMS: 24 * time.Hour.Milliseconds(),
}).Asserts(d, policy.ActionRead).Returns(ds)
}))
s.Run("GetEligibleProvisionerDaemonsByProvisionerJobIDs", s.Subtest(func(db database.Store, check *expects) {
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
org := dbgen.Organization(s.T(), db, database.Organization{})
Expand Down
45 changes: 26 additions & 19 deletionscoderd/database/dbgen/dbgen.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -505,9 +505,27 @@ func GroupMember(t testing.TB, db database.Store, member database.GroupMemberTab

// ProvisionerDaemon creates a provisioner daemon as far as the database is concerned. It does not run a provisioner daemon.
// If no key is provided, it will create one.
funcProvisionerDaemon(t testing.TB,db database.Store,daemon database.ProvisionerDaemon) database.ProvisionerDaemon {
funcProvisionerDaemon(t testing.TB,db database.Store,orig database.ProvisionerDaemon) database.ProvisionerDaemon {
t.Helper()

vardefOrgID uuid.UUID
iforig.OrganizationID==uuid.Nil {
defOrg,_:=db.GetDefaultOrganization(genCtx)
defOrgID=defOrg.ID
}

daemon:= database.UpsertProvisionerDaemonParams{
Name:takeFirst(orig.Name,testutil.GetRandomName(t)),
OrganizationID:takeFirst(orig.OrganizationID,defOrgID,uuid.New()),
CreatedAt:takeFirst(orig.CreatedAt,dbtime.Now()),
Provisioners:takeFirstSlice(orig.Provisioners, []database.ProvisionerType{database.ProvisionerTypeEcho}),
Tags:takeFirstMap(orig.Tags, database.StringMap{}),
KeyID:takeFirst(orig.KeyID,uuid.Nil),
LastSeenAt:takeFirst(orig.LastSeenAt, sql.NullTime{Time:dbtime.Now(),Valid:true}),
Version:takeFirst(orig.Version,"v0.0.0"),
APIVersion:takeFirst(orig.APIVersion,"1.1"),
}

ifdaemon.KeyID==uuid.Nil {
key,err:=db.InsertProvisionerKey(genCtx, database.InsertProvisionerKeyParams{
ID:uuid.New(),
Expand All@@ -521,24 +539,7 @@ func ProvisionerDaemon(t testing.TB, db database.Store, daemon database.Provisio
daemon.KeyID=key.ID
}

ifdaemon.CreatedAt.IsZero() {
daemon.CreatedAt=dbtime.Now()
}
ifdaemon.Name=="" {
daemon.Name="test-daemon"
}

d,err:=db.UpsertProvisionerDaemon(genCtx, database.UpsertProvisionerDaemonParams{
Name:daemon.Name,
OrganizationID:daemon.OrganizationID,
CreatedAt:daemon.CreatedAt,
Provisioners:daemon.Provisioners,
Tags:daemon.Tags,
KeyID:daemon.KeyID,
LastSeenAt:daemon.LastSeenAt,
Version:daemon.Version,
APIVersion:daemon.APIVersion,
})
d,err:=db.UpsertProvisionerDaemon(genCtx,daemon)
require.NoError(t,err)
returnd
}
Expand DownExpand Up@@ -1109,6 +1110,12 @@ func takeFirstSlice[T any](values ...[]T) []T {
})
}

functakeFirstMap[T,Ecomparable](values...map[T]E)map[T]E {
returntakeFirstF(values,func(vmap[T]E)bool {
returnv!=nil
})
}

// takeFirstF takes the first value that returns true
functakeFirstF[Valueany](values []Value,takefunc(vValue)bool)Value {
for_,v:=rangevalues {
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp