Skip to content

Commit f974add

Browse files
chore: rollback PR #18025 (#18118)
Rollback #18025
1 parent a19539c commit f974add

File tree

15 files changed

+69
-92
lines changed

15 files changed

+69
-92
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 about customizing 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 about customizing how changed files appear on GitHub.

coderd/workspacebuilds.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,8 +1098,7 @@ func (api *API) convertWorkspaceBuild(
10981098
CreatedAt: build.CreatedAt,
10991099
UpdatedAt: build.UpdatedAt,
11001100
WorkspaceOwnerID: workspace.OwnerID,
1101-
WorkspaceOwnerName: workspace.OwnerName,
1102-
WorkspaceOwnerUsername: workspace.OwnerUsername,
1101+
WorkspaceOwnerName: workspace.OwnerUsername,
11031102
WorkspaceOwnerAvatarURL: workspace.OwnerAvatarUrl,
11041103
WorkspaceID: build.WorkspaceID,
11051104
WorkspaceName: workspace.Name,

coderd/workspacebuilds_test.go

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

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
type WorkspaceBuild struct {
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-
WorkspaceName string `json:"workspace_name"`
59-
WorkspaceOwnerID uuid.UUID `json:"workspace_owner_id" format:"uuid"`
60-
WorkspaceOwnerName string `json:"workspace_owner_name,omitempty"`
61-
WorkspaceOwnerUsername string `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+
WorkspaceName string `json:"workspace_name"`
59+
WorkspaceOwnerID uuid.UUID `json:"workspace_owner_id" format:"uuid"`
60+
// WorkspaceOwnerName is the username of the owner of the workspace.
61+
WorkspaceOwnerName string `json:"workspace_owner_name"`
6262
WorkspaceOwnerAvatarURL string `json:"workspace_owner_avatar_url,omitempty"`
6363
TemplateVersionID uuid.UUID `json:"template_version_id" format:"uuid"`
6464
TemplateVersionName string `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 about customizing 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 about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy