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

Commit0f380ab

Browse files
BrunoQuaresmajohnstcn
authored andcommitted
chore: rollback PR#18025 (#18118)
Rollback#18025(cherry picked from commitf974add)
1 parent3a68676 commit0f380ab

File tree

14 files changed

+66
-89
lines changed

14 files changed

+66
-89
lines changed

‎cli/testdata/coder_list_--output_json.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"workspace_id": "===========[workspace ID]===========",
2424
"workspace_name": "test-workspace",
2525
"workspace_owner_id": "==========[first user ID]===========",
26-
"workspace_owner_username": "testuser",
26+
"workspace_owner_name": "testuser",
2727
"template_version_id": "============[version ID]============",
2828
"template_version_name": "===========[version name]===========",
2929
"build_number": 1,

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/workspacebuilds.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,8 +1095,7 @@ func (api *API) convertWorkspaceBuild(
10951095
CreatedAt:build.CreatedAt,
10961096
UpdatedAt:build.UpdatedAt,
10971097
WorkspaceOwnerID:workspace.OwnerID,
1098-
WorkspaceOwnerName:workspace.OwnerName,
1099-
WorkspaceOwnerUsername:workspace.OwnerUsername,
1098+
WorkspaceOwnerName:workspace.OwnerUsername,
11001099
WorkspaceOwnerAvatarURL:workspace.OwnerAvatarUrl,
11011100
WorkspaceID:build.WorkspaceID,
11021101
WorkspaceName:workspace.Name,

‎coderd/workspacebuilds_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ func TestWorkspaceBuild(t *testing.T) {
7878
},testutil.WaitShort,testutil.IntervalFast)
7979
wb,err:=client.WorkspaceBuild(testutil.Context(t,testutil.WaitShort),workspace.LatestBuild.ID)
8080
require.NoError(t,err)
81-
require.Equal(t,up.Username,wb.WorkspaceOwnerUsername)
82-
require.Equal(t,up.Name,wb.WorkspaceOwnerName)
81+
require.Equal(t,up.Username,wb.WorkspaceOwnerName)
8382
require.Equal(t,up.AvatarURL,wb.WorkspaceOwnerAvatarURL)
8483
}
8584

‎codersdk/workspacebuilds.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ const (
5151
// WorkspaceBuild is an at-point representation of a workspace state.
5252
// BuildNumbers start at 1 and increase by 1 for each subsequent build
5353
typeWorkspaceBuildstruct {
54-
IDuuid.UUID`json:"id" format:"uuid"`
55-
CreatedAttime.Time`json:"created_at" format:"date-time"`
56-
UpdatedAttime.Time`json:"updated_at" format:"date-time"`
57-
WorkspaceIDuuid.UUID`json:"workspace_id" format:"uuid"`
58-
WorkspaceNamestring`json:"workspace_name"`
59-
WorkspaceOwnerIDuuid.UUID`json:"workspace_owner_id" format:"uuid"`
60-
WorkspaceOwnerNamestring`json:"workspace_owner_name,omitempty"`
61-
WorkspaceOwnerUsernamestring`json:"workspace_owner_username"`
54+
ID uuid.UUID`json:"id" format:"uuid"`
55+
CreatedAt time.Time`json:"created_at" format:"date-time"`
56+
UpdatedAt time.Time`json:"updated_at" format:"date-time"`
57+
WorkspaceID uuid.UUID`json:"workspace_id" format:"uuid"`
58+
WorkspaceNamestring`json:"workspace_name"`
59+
WorkspaceOwnerID uuid.UUID`json:"workspace_owner_id" format:"uuid"`
60+
//WorkspaceOwnerNameis the username of the owner of the workspace.
61+
WorkspaceOwnerNamestring`json:"workspace_owner_name"`
6262
WorkspaceOwnerAvatarURLstring`json:"workspace_owner_avatar_url,omitempty"`
6363
TemplateVersionID uuid.UUID`json:"template_version_id" format:"uuid"`
6464
TemplateVersionNamestring`json:"template_version_name"`

‎docs/reference/api/builds.md

Lines changed: 6 additions & 12 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎docs/reference/api/schemas.md

Lines changed: 33 additions & 37 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