Skip to content

Commit d715ea6

Browse files
sreyasreya
committed
Revert "merge main into groups (#4439)"
This reverts commit b101ae7.
1 parent b101ae7 commit d715ea6

File tree

209 files changed

+2150
-3723
lines changed

Some content is hidden

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

209 files changed

+2150
-3723
lines changed

‎.github/workflows/coder.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
push:
55
branches:
66
- main
7+
tags:
8+
- "*"
79

810
pull_request:
911

@@ -34,7 +36,7 @@ jobs:
3436
- name: Checkout
3537
uses: actions/checkout@v2
3638
- name: typos-action
37-
uses: crate-ci/typos@v1.12.8
39+
uses: crate-ci/typos@master
3840
with:
3941
config: .github/workflows/typos.toml
4042
- name: Fix Helper
@@ -628,7 +630,7 @@ jobs:
628630
with:
629631
name: failed-test-videos
630632
path: ./site/test-results/**/*.webm
631-
retention-days: 7
633+
retention:days: 7
632634

633635
chromatic:
634636
# REMARK: this is only used to build storybook and deploy it to Chromatic.

‎.github/workflows/dogfood.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
push:
55
branches:
66
- main
7+
tags:
8+
- "*"
79
paths:
810
- "dogfood/**"
911
pull_request:

‎.vscode/settings.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"cliflag",
1010
"cliui",
1111
"codecov",
12+
"Codespaces",
1213
"coderd",
13-
"coderdenttest",
1414
"coderdtest",
1515
"codersdk",
1616
"cronstrue",
@@ -24,7 +24,6 @@
2424
"drpcmux",
2525
"drpcserver",
2626
"Dsts",
27-
"enablements",
2827
"fatih",
2928
"Formik",
3029
"gitsshkey",

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Once installed, you can start a production deployment<sup>1</sup> with a single
5858

5959
```sh
6060
# Automatically sets up an external access URL on *.try.coder.app
61-
coder server
61+
coder server --tunnel
6262

6363
# Requires a PostgreSQL instance and external access URL
6464
coder server --postgres-url <url> --access-url <url>

‎agent/agent.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"fmt"
1111
"io"
1212
"net"
13-
"net/http"
1413
"net/netip"
1514
"os"
1615
"os/exec"
@@ -207,7 +206,6 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
207206
go a.sshServer.HandleConn(a.stats.wrapConn(conn))
208207
}
209208
}()
210-
211209
reconnectingPTYListener, err := a.network.Listen("tcp", ":"+strconv.Itoa(codersdk.TailnetReconnectingPTYPort))
212210
if err != nil {
213211
a.logger.Critical(ctx, "listen for reconnecting pty", slog.Error(err))
@@ -242,7 +240,6 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
242240
go a.handleReconnectingPTY(ctx, msg, conn)
243241
}
244242
}()
245-
246243
speedtestListener, err := a.network.Listen("tcp", ":"+strconv.Itoa(codersdk.TailnetSpeedtestPort))
247244
if err != nil {
248245
a.logger.Critical(ctx, "listen for speedtest", slog.Error(err))
@@ -264,31 +261,6 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
264261
}()
265262
}
266263
}()
267-
268-
statisticsListener, err := a.network.Listen("tcp", ":"+strconv.Itoa(codersdk.TailnetStatisticsPort))
269-
if err != nil {
270-
a.logger.Critical(ctx, "listen for statistics", slog.Error(err))
271-
return
272-
}
273-
go func() {
274-
defer statisticsListener.Close()
275-
server := &http.Server{
276-
Handler: a.statisticsHandler(),
277-
ReadTimeout: 20 * time.Second,
278-
ReadHeaderTimeout: 20 * time.Second,
279-
WriteTimeout: 20 * time.Second,
280-
ErrorLog: slog.Stdlib(ctx, a.logger.Named("statistics_http_server"), slog.LevelInfo),
281-
}
282-
go func() {
283-
<-ctx.Done()
284-
_ = server.Close()
285-
}()
286-
287-
err = server.Serve(statisticsListener)
288-
if err != nil && !xerrors.Is(err, http.ErrServerClosed) && !strings.Contains(err.Error(), "use of closed network connection") {
289-
a.logger.Critical(ctx, "serve statistics HTTP server", slog.Error(err))
290-
}
291-
}()
292264
}
293265

294266
// runCoordinator listens for nodes and updates the self-node as it changes.

‎agent/ports_supported.go

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎agent/ports_unsupported.go

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎agent/statsendpoint.go

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎cli/agent.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,15 @@ func workspaceAgent() *cobra.Command {
168168
}
169169
}
170170

171-
retryCtx, cancelRetry := context.WithTimeout(cmd.Context(), time.Hour)
172-
defer cancelRetry()
173-
for retrier := retry.New(100*time.Millisecond, 5*time.Second); retrier.Wait(retryCtx); {
174-
err := client.PostWorkspaceAgentVersion(retryCtx, version)
171+
ctx, cancelFunc := context.WithTimeout(cmd.Context(), time.Hour)
172+
defer cancelFunc()
173+
for retry.New(100*time.Millisecond, 5*time.Second).Wait(ctx) {
174+
err := client.PostWorkspaceAgentVersion(cmd.Context(), version)
175175
if err != nil {
176-
logger.Warn(retryCtx, "post agent version: %w", slog.Error(err), slog.F("version", version))
176+
logger.Warn(cmd.Context(), "post agent version: %w", slog.Error(err), slog.F("version", version))
177177
continue
178178
}
179-
logger.Info(retryCtx, "updated agent version", slog.F("version", version))
179+
logger.Info(ctx, "updated agent version", slog.F("version", version))
180180
break
181181
}
182182

‎cli/cliui/table.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,10 @@ func DisplayTable(out any, sort string, filterColumns []string) (string, error)
153153
// Special type formatting.
154154
switch val := v.(type) {
155155
case time.Time:
156-
v = val.Format(time.RFC3339)
156+
v = val.Format(time.Stamp)
157157
case *time.Time:
158158
if val != nil {
159-
v = val.Format(time.RFC3339)
160-
}
161-
case *int64:
162-
if val != nil {
163-
v = *val
159+
v = val.Format(time.Stamp)
164160
}
165161
case fmt.Stringer:
166162
if val != nil {

0 commit comments

Comments
 (0)