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: Add workspace owner name to response#1448

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
kylecarbs merged 1 commit intomainfromworkspaceowner
May 14, 2022
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
3 changes: 2 additions & 1 deletioncli/templatedelete_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,12 @@ import (
"context"
"testing"

"github.com/stretchr/testify/require"

"github.com/coder/coder/cli/clitest"
"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/pty/ptytest"
"github.com/stretchr/testify/require"
)

func TestTemplateDelete(t *testing.T) {
Expand Down
16 changes: 16 additions & 0 deletionscoderd/database/databasefake/databasefake.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -242,6 +242,22 @@ func (q *fakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams
returnusers,nil
}

func (q*fakeQuerier)GetUsersByIDs(_ context.Context,ids []uuid.UUID) ([]database.User,error) {
q.mutex.RLock()
deferq.mutex.RUnlock()

users:=make([]database.User,0)
for_,user:=rangeq.users {
for_,id:=rangeids {
ifuser.ID.String()!=id.String() {
continue
}
users=append(users,user)
}
}
returnusers,nil
}

func (q*fakeQuerier)GetAllUserRoles(_ context.Context,userID uuid.UUID) (database.GetAllUserRolesRow,error) {
q.mutex.RLock()
deferq.mutex.RUnlock()
Expand Down
1 change: 1 addition & 0 deletionscoderd/database/querier.go
View file
Open in desktop

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

36 changes: 36 additions & 0 deletionscoderd/database/queries.sql.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletioncoderd/database/queries/organizationmembers.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,4 +49,4 @@ SET
WHERE
user_id = @user_id
AND organization_id = @org_id
RETURNING *;
RETURNING *;
3 changes: 3 additions & 0 deletionscoderd/database/queries/users.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,9 @@ WHERE
LIMIT
1;

-- name: GetUsersByIDs :many
SELECT * FROM users WHERE id = ANY(@ids :: uuid [ ]);

-- name: GetUserByEmailOrUsername :one
SELECT
*
Expand Down
11 changes: 9 additions & 2 deletionscoderd/organizations.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -426,7 +426,7 @@ func (api *api) workspaceByOwnerAndName(rw http.ResponseWriter, r *http.Request)
}

httpapi.Write(rw, http.StatusOK, convertWorkspace(workspace,
convertWorkspaceBuild(build, convertProvisionerJob(job)), template))
convertWorkspaceBuild(build, convertProvisionerJob(job)), template, owner))
}

// Create a new workspace for the currently authenticated user.
Expand DownExpand Up@@ -617,9 +617,16 @@ func (api *api) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
})
return
}
user, err := api.Database.GetUserByID(r.Context(), apiKey.UserID)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: fmt.Sprintf("get user: %s", err),
})
return
}

httpapi.Write(rw, http.StatusCreated, convertWorkspace(workspace,
convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(templateVersionJob)), template))
convertWorkspaceBuild(workspaceBuild, convertProvisionerJob(templateVersionJob)), template, user))
}

// convertOrganization consumes the database representation and outputs an API friendly representation.
Expand Down
55 changes: 42 additions & 13 deletionscoderd/workspaces.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import (
"github.com/go-chi/chi/v5"
"github.com/google/uuid"
"github.com/moby/moby/pkg/namesgenerator"
"golang.org/x/sync/errgroup"
"golang.org/x/xerrors"

"github.com/coder/coder/coderd/autobuild/schedule"
Expand All@@ -30,21 +31,34 @@ func (api *api) workspace(rw http.ResponseWriter, r *http.Request) {
})
return
}
job,err:=api.Database.GetProvisionerJobByID(r.Context(),build.JobID)
var (
group errgroup.Group
job database.ProvisionerJob
template database.Template
owner database.User
)
group.Go(func() (errerror) {
job,err=api.Database.GetProvisionerJobByID(r.Context(),build.JobID)
returnerr
})
group.Go(func() (errerror) {
template,err=api.Database.GetTemplateByID(r.Context(),workspace.TemplateID)
returnerr
})
group.Go(func() (errerror) {
owner,err=api.Database.GetUserByID(r.Context(),workspace.OwnerID)
returnerr
})
err=group.Wait()
iferr!=nil {
httpapi.Write(rw,http.StatusInternalServerError, httpapi.Response{
Message:fmt.Sprintf("get workspace build job: %s",err),
Message:fmt.Sprintf("fetch resource: %s",err),
})
return
}
template,err:=api.Database.GetTemplateByID(r.Context(),workspace.TemplateID)
iferr!=nil {
httpapi.Write(rw,http.StatusInternalServerError, httpapi.Response{
Message:fmt.Sprintf("get template: %s",err),
})
return
}
httpapi.Write(rw,http.StatusOK,convertWorkspace(workspace,convertWorkspaceBuild(build,convertProvisionerJob(job)),template))

httpapi.Write(rw,http.StatusOK,
convertWorkspace(workspace,convertWorkspaceBuild(build,convertProvisionerJob(job)),template,owner))
}

func (api*api)workspaceBuilds(rw http.ResponseWriter,r*http.Request) {
Expand DownExpand Up@@ -359,9 +373,11 @@ func (api *api) putWorkspaceAutostop(rw http.ResponseWriter, r *http.Request) {
funcconvertWorkspaces(ctx context.Context,db database.Store,workspaces []database.Workspace) ([]codersdk.Workspace,error) {
workspaceIDs:=make([]uuid.UUID,0,len(workspaces))
templateIDs:=make([]uuid.UUID,0,len(workspaces))
ownerIDs:=make([]uuid.UUID,0,len(workspaces))
for_,workspace:=rangeworkspaces {
workspaceIDs=append(workspaceIDs,workspace.ID)
templateIDs=append(templateIDs,workspace.TemplateID)
ownerIDs=append(ownerIDs,workspace.OwnerID)
}
workspaceBuilds,err:=db.GetWorkspaceBuildsByWorkspaceIDsWithoutAfter(ctx,workspaceIDs)
iferrors.Is(err,sql.ErrNoRows) {
Expand All@@ -377,6 +393,10 @@ func convertWorkspaces(ctx context.Context, db database.Store, workspaces []data
iferr!=nil {
returnnil,xerrors.Errorf("get templates: %w",err)
}
users,err:=db.GetUsersByIDs(ctx,ownerIDs)
iferr!=nil {
returnnil,xerrors.Errorf("get users: %w",err)
}
jobIDs:=make([]uuid.UUID,0,len(workspaceBuilds))
for_,build:=rangeworkspaceBuilds {
jobIDs=append(jobIDs,build.JobID)
Expand All@@ -397,6 +417,10 @@ func convertWorkspaces(ctx context.Context, db database.Store, workspaces []data
for_,template:=rangetemplates {
templateByID[template.ID]=template
}
userByID:=map[uuid.UUID]database.User{}
for_,user:=rangeusers {
userByID[user.ID]=user
}
jobByID:=map[uuid.UUID]database.ProvisionerJob{}
for_,job:=rangejobs {
jobByID[job.ID]=job
Expand All@@ -413,20 +437,25 @@ func convertWorkspaces(ctx context.Context, db database.Store, workspaces []data
}
job,exists:=jobByID[build.JobID]
if!exists {
returnnil,xerrors.Errorf("build job not found for workspace: %q",err)
returnnil,xerrors.Errorf("build job not found for workspace: %w",err)
}
user,exists:=userByID[workspace.OwnerID]
if!exists {
returnnil,xerrors.Errorf("owner not found for workspace: %q",workspace.Name)
}
apiWorkspaces=append(apiWorkspaces,
convertWorkspace(workspace,convertWorkspaceBuild(build,convertProvisionerJob(job)),template))
convertWorkspace(workspace,convertWorkspaceBuild(build,convertProvisionerJob(job)),template,user))
}
returnapiWorkspaces,nil
}

funcconvertWorkspace(workspace database.Workspace,workspaceBuild codersdk.WorkspaceBuild,template database.Template) codersdk.Workspace {
funcconvertWorkspace(workspace database.Workspace,workspaceBuild codersdk.WorkspaceBuild,template database.Template,owner database.User) codersdk.Workspace {
return codersdk.Workspace{
ID:workspace.ID,
CreatedAt:workspace.CreatedAt,
UpdatedAt:workspace.UpdatedAt,
OwnerID:workspace.OwnerID,
OwnerName:owner.Username,
TemplateID:workspace.TemplateID,
LatestBuild:workspaceBuild,
TemplateName:template.Name,
Expand Down
1 change: 1 addition & 0 deletionscodersdk/workspaces.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ type Workspace struct {
CreatedAt time.Time`json:"created_at"`
UpdatedAt time.Time`json:"updated_at"`
OwnerID uuid.UUID`json:"owner_id"`
OwnerNamestring`json:"owner_name"`
TemplateID uuid.UUID`json:"template_id"`
TemplateNamestring`json:"template_name"`
LatestBuildWorkspaceBuild`json:"latest_build"`
Expand Down
7 changes: 4 additions & 3 deletionssite/src/api/typesGenerated.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ export interface CreateUserRequest {
readonlyorganization_id:string
}

// From codersdk/workspaces.go:33:6
// From codersdk/workspaces.go:34:6
exportinterfaceCreateWorkspaceBuildRequest{
readonlytemplate_version_id?:string
// This is likely an enum in an external package ("github.com/coder/coder/coderd/database.WorkspaceTransition")
Expand DownExpand Up@@ -289,12 +289,12 @@ export interface UpdateUserProfileRequest {
readonlyusername:string
}

// From codersdk/workspaces.go:95:6
// From codersdk/workspaces.go:96:6
exportinterfaceUpdateWorkspaceAutostartRequest{
readonlyschedule:string
}

// From codersdk/workspaces.go:115:6
// From codersdk/workspaces.go:116:6
exportinterfaceUpdateWorkspaceAutostopRequest{
readonlyschedule:string
}
Expand DownExpand Up@@ -355,6 +355,7 @@ export interface Workspace {
readonlycreated_at:string
readonlyupdated_at:string
readonlyowner_id:string
readonlyowner_name:string
readonlytemplate_id:string
readonlytemplate_name:string
readonlylatest_build:WorkspaceBuild
Expand Down
1 change: 1 addition & 0 deletionssite/src/testHelpers/entities.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ export const MockWorkspace: TypesGen.Workspace = {
template_name:MockTemplate.name,
outdated:false,
owner_id:MockUser.id,
owner_name:MockUser.username,
autostart_schedule:MockWorkspaceAutostartEnabled.schedule,
autostop_schedule:MockWorkspaceAutostopEnabled.schedule,
latest_build:MockWorkspaceBuild,
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp