Skip to content

Commit 4ea68bc

Browse files
committed
Merge branch 'main' into dean/listening-ports
2 parents 3962635 + bbe2baf commit 4ea68bc

File tree

253 files changed

+5572
-3736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+5572
-3736
lines changed

.github/workflows/coder.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ jobs:
489489
go mod download
490490
491491
version="$(./scripts/version.sh)"
492+
make gen/mark-fresh
492493
make -j \
493494
build/coder_"$version"_windows_amd64.zip \
494495
build/coder_"$version"_linux_amd64.{tar.gz,deb}

.github/workflows/dogfood.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get branch name
2121
id: branch-name
22-
uses: tj-actions/branch-names@v5.4
22+
uses: tj-actions/branch-names@v6.1
2323

2424
- name: "Branch name to Docker tag name"
2525
id: docker-tag-name

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
# v5.1.0 has a weird bug that makes stalebot add then remove its own label
1515
# https://github.com/actions/stale/pull/775
16-
- uses: actions/stale@v5.0.0
16+
- uses: actions/stale@v6.0.0
1717
with:
1818
stale-issue-label: stale
1919
stale-pr-label: stale

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ site/**/*.typegen.ts
3131
site/build-storybook.log
3232

3333
# Build
34-
build/
35-
dist/
34+
/build/
35+
/dist/
3636
site/out/
3737

3838
*.tfstate

cli/agent_test.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,11 @@ func TestWorkspaceAgent(t *testing.T) {
6060
ctx := context.WithValue(ctx, "azure-client", metadataClient)
6161
errC <- cmd.ExecuteContext(ctx)
6262
}()
63-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
64-
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
63+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
64+
workspace, err := client.Workspace(ctx, workspace.ID)
6565
require.NoError(t, err)
66-
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
66+
resources := workspace.LatestBuild.Resources
67+
if assert.NotEmpty(t, workspace.LatestBuild.Resources) && assert.NotEmpty(t, resources[0].Agents) {
6768
assert.NotEmpty(t, resources[0].Agents[0].Version)
6869
}
6970
dialer, err := client.DialWorkspaceAgentTailnet(ctx, slog.Logger{}, resources[0].Agents[0].ID)
@@ -120,9 +121,10 @@ func TestWorkspaceAgent(t *testing.T) {
120121
ctx := context.WithValue(ctx, "aws-client", metadataClient)
121122
errC <- cmd.ExecuteContext(ctx)
122123
}()
123-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
124-
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
124+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
125+
workspace, err := client.Workspace(ctx, workspace.ID)
125126
require.NoError(t, err)
127+
resources := workspace.LatestBuild.Resources
126128
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
127129
assert.NotEmpty(t, resources[0].Agents[0].Version)
128130
}
@@ -180,9 +182,10 @@ func TestWorkspaceAgent(t *testing.T) {
180182
ctx := context.WithValue(ctx, "gcp-client", metadata)
181183
errC <- cmd.ExecuteContext(ctx)
182184
}()
183-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
184-
resources, err := client.WorkspaceResourcesByBuild(ctx, workspace.LatestBuild.ID)
185+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
186+
workspace, err := client.Workspace(ctx, workspace.ID)
185187
require.NoError(t, err)
188+
resources := workspace.LatestBuild.Resources
186189
if assert.NotEmpty(t, resources) && assert.NotEmpty(t, resources[0].Agents) {
187190
assert.NotEmpty(t, resources[0].Agents[0].Version)
188191
}

cli/cliui/table.go

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func DisplayTable(out any, sort string, filterColumns []string) (string, error)
6767
}
6868

6969
// Get the list of table column headers.
70-
headersRaw, err := TypeToTableHeaders(v.Type().Elem())
70+
headersRaw, err := typeToTableHeaders(v.Type().Elem())
7171
if err != nil {
7272
return "", xerrors.Errorf("get table headers recursively for type %q: %w", v.Type().Elem().String(), err)
7373
}
@@ -207,10 +207,10 @@ func isStructOrStructPointer(t reflect.Type) bool {
207207
return t.Kind() == reflect.Struct || (t.Kind() == reflect.Pointer && t.Elem().Kind() == reflect.Struct)
208208
}
209209

210-
// TypeToTableHeaders converts a type to a slice of column names. If the given
210+
// typeToTableHeaders converts a type to a slice of column names. If the given
211211
// type is invalid (not a struct or a pointer to a struct, has invalid table
212212
// tags, etc.), an error is returned.
213-
func TypeToTableHeaders(t reflect.Type) ([]string, error) {
213+
func typeToTableHeaders(t reflect.Type) ([]string, error) {
214214
if !isStructOrStructPointer(t) {
215215
return nil, xerrors.Errorf("typeToTableHeaders called with a non-struct or a non-pointer-to-a-struct type")
216216
}
@@ -235,7 +235,7 @@ func TypeToTableHeaders(t reflect.Type) ([]string, error) {
235235
return nil, xerrors.Errorf("field %q in type %q is marked as recursive but does not contain a struct or a pointer to a struct", field.Name, t.String())
236236
}
237237

238-
childNames, err := TypeToTableHeaders(fieldType)
238+
childNames, err := typeToTableHeaders(fieldType)
239239
if err != nil {
240240
return nil, xerrors.Errorf("get child field header names for field %q in type %q: %w", field.Name, fieldType.String(), err)
241241
}
@@ -305,3 +305,18 @@ func valueToTableMap(val reflect.Value) (map[string]any, error) {
305305

306306
return row, nil
307307
}
308+
309+
// TableHeaders returns the table header names of all
310+
// fields in tSlice. tSlice must be a slice of some type.
311+
func TableHeaders(tSlice any) ([]string, error) {
312+
v := reflect.Indirect(reflect.ValueOf(tSlice))
313+
rawHeaders, err := typeToTableHeaders(v.Type().Elem())
314+
if err != nil {
315+
return nil, xerrors.Errorf("type to table headers: %w", err)
316+
}
317+
out := make([]string, 0, len(rawHeaders))
318+
for _, hdr := range rawHeaders {
319+
out = append(out, strings.Replace(hdr, " ", "_", -1))
320+
}
321+
return out, nil
322+
}

cli/cliui/table_test.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,28 @@ baz baz1 baz3 Aug 2 15:49:10
327327
})
328328
}
329329

330+
func Test_TableHeaders(t *testing.T) {
331+
t.Parallel()
332+
s := []tableTest1{}
333+
expectedFields := []string{
334+
"name",
335+
"age",
336+
"roles",
337+
"sub_1_name",
338+
"sub_1_age",
339+
"sub_2_name",
340+
"sub_2_age",
341+
"sub_3_inner_name",
342+
"sub_3_inner_age",
343+
"sub_4",
344+
"time",
345+
"time_ptr",
346+
}
347+
headers, err := cliui.TableHeaders(s)
348+
require.NoError(t, err)
349+
require.EqualValues(t, expectedFields, headers)
350+
}
351+
330352
// compareTables normalizes the incoming table lines
331353
func compareTables(t *testing.T, expected, out string) {
332354
t.Helper()

cli/configssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestConfigSSH(t *testing.T) {
114114
defer func() {
115115
_ = agentCloser.Close()
116116
}()
117-
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
117+
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
118118
agentConn, err := client.DialWorkspaceAgentTailnet(context.Background(), slog.Logger{}, resources[0].Agents[0].ID)
119119
require.NoError(t, err)
120120
defer agentConn.Close()

cli/gitssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*codersdk.Client, str
8181
errC <- cmd.ExecuteContext(ctx)
8282
}()
8383
t.Cleanup(func() { require.NoError(t, <-errC) })
84-
coderdtest.AwaitWorkspaceAgents(t, client, workspace.LatestBuild.ID)
84+
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
8585
return agentClient, agentToken, pubkey
8686
}
8787

cli/list.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cli
22

33
import (
44
"fmt"
5-
"reflect"
65
"strings"
76
"time"
87

@@ -128,14 +127,10 @@ func list() *cobra.Command {
128127
},
129128
}
130129

131-
v := reflect.Indirect(reflect.ValueOf(displayWorkspaces))
132-
availColumns, err := cliui.TypeToTableHeaders(v.Type().Elem())
130+
availColumns, err := cliui.TableHeaders(displayWorkspaces)
133131
if err != nil {
134132
panic(err)
135133
}
136-
for i, s := range availColumns {
137-
availColumns[i] = strings.Replace(s, " ", "_", -1)
138-
}
139134
columnString := strings.Join(availColumns[:], ", ")
140135

141136
cmd.Flags().BoolVarP(&all, "all", "a", false,

0 commit comments

Comments
 (0)