Skip to content

Commit 5cf709c

Browse files
kylecarbskylecarbs
committed
Merge branch 'main' into tailnet
2 parents 94e90a3 + 301727d commit 5cf709c

File tree

268 files changed

+7436
-2953
lines changed

Some content is hidden

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

268 files changed

+7436
-2953
lines changed

‎.github/codecov.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ github_checks:
99
annotations: false
1010

1111
coverage:
12+
range: 50..75
13+
round: down
14+
precision: 2
1215
status:
1316
patch:
1417
default:
1518
informational: yes
1619
project:
1720
default:
1821
target: 65%
19-
informational: yes
22+
informational: true
2023

2124
ignore:
2225
# This is generated code.

‎.github/workflows/coder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Checkout
3737
uses: actions/checkout@v2
3838
- name: typos-action
39-
uses: crate-ci/typos@v1.0.4
39+
uses: crate-ci/typos@master
4040
with:
4141
config: .github/workflows/typos.toml
4242
- name: Fix Helper

‎.github/workflows/dogfood.yaml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: dogfood
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
tags:
8+
- "*"
9+
paths:
10+
- "dogfood/**"
11+
pull_request:
12+
paths:
13+
- "dogfood/**"
14+
workflow_dispatch:
15+
16+
jobs:
17+
deploy:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Get branch name
21+
id: branch-name
22+
uses: tj-actions/branch-names@v5.4
23+
24+
- name: Set up QEMU
25+
uses: docker/setup-qemu-action@v2
26+
27+
- name: Set up Docker Buildx
28+
uses: docker/setup-buildx-action@v2
29+
30+
- name: Login to DockerHub
31+
uses: docker/login-action@v2
32+
with:
33+
username: ${{ secrets.DOCKERHUB_USERNAME }}
34+
password: ${{ secrets.DOCKERHUB_PASSWORD }}
35+
36+
- name: Build and push
37+
uses: docker/build-push-action@v3
38+
with:
39+
context: "{{defaultContext}}:dogfood"
40+
push: true
41+
tags: "codercom/oss-dogfood:${{ steps.branch-name.outputs.current_branch }},codercom/oss-dogfood:latest"
42+
cache-from: type=registry,ref=codercom/oss-dogfood:latest
43+
cache-to: type=inline

‎.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ jobs:
187187
- name: Install dependencies
188188
run: |
189189
set -euo pipefail
190-
# The version of bash that MacOS ships with is too old
190+
# The version of bash that macOS ships with is too old
191191
brew install bash
192192
193-
# The version of make that MacOS ships with is too old
193+
# The version of make that macOS ships with is too old
194194
brew install make
195195
echo "$(brew --prefix)/opt/make/libexec/gnubin" >> $GITHUB_PATH
196196

‎.github/workflows/typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
alog = "alog"
33
Jetbrains = "JetBrains"
44
IST = "IST"
5+
MacOS = "macOS"
56

67
[default.extend-words]
78

‎.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"coderdtest",
1313
"codersdk",
1414
"cronstrue",
15+
"databasefake",
1516
"DERP",
1617
"derphttp",
1718
"derpmap",
@@ -65,6 +66,7 @@
6566
"oneof",
6667
"parameterscopeid",
6768
"pqtype",
69+
"prometheusmetrics",
6870
"promptui",
6971
"protobuf",
7072
"provisionerd",

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
[!["Join us on
44
Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache=true&logo=discord&colorB=green)](https://discord.gg/coder)
55
[![codecov](https://codecov.io/gh/coder/coder/branch/main/graph/badge.svg?token=TNLW3OAP6G)](https://codecov.io/gh/coder/coder)
6+
[![Go Reference](https://pkg.go.dev/badge/github.com/coder/coder.svg)](https://pkg.go.dev/github.com/coder/coder)
67
[![Twitter
7-
Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq)
8+
Follow](https://img.shields.io/twitter/follow/coderhq?label=%40coderhq&style=social)](https://twitter.com/coderhq)
89

910
Coder creates remote development machines so your team can develop from anywhere.
1011

@@ -94,4 +95,4 @@ Join our community on [Discord](https://discord.gg/coder) and [Twitter](https://
9495

9596
Read the [contributing docs](https://coder.com/docs/coder-oss/latest/CONTRIBUTING).
9697

97-
Find our list of contributors [here](./docs/CONTRIBUTORS.md).
98+
Find our list of contributors [here](https://github.com/coder/coder/graphs/contributors).

‎agent/agent.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ func (a *agent) run(ctx context.Context) {
136136
// An exponential back-off occurs when the connection is failing to dial.
137137
// This is to prevent server spam in case of a coderd outage.
138138
for retrier := retry.New(50*time.Millisecond, 10*time.Second); retrier.Wait(ctx); {
139+
a.logger.Info(ctx, "connecting")
139140
metadata, err = a.fetchMetadata(ctx)
140141
if err != nil {
141142
if errors.Is(err, context.Canceled) {
@@ -369,6 +370,7 @@ func (a *agent) handlePeerConn(ctx context.Context, conn *peer.Conn) {
369370
}
370371

371372
func (a *agent) init(ctx context.Context) {
373+
a.logger.Info(ctx, "generating host key")
372374
// Clients' should ignore the host key when connecting.
373375
// The agent needs to authenticate with coderd to SSH,
374376
// so SSH authentication doesn't improve security.

‎cli/agent.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ func workspaceAgent() *cobra.Command {
7373
return nil
7474
}
7575

76+
logger.Info(cmd.Context(), "starting agent", slog.F("url", coderURL), slog.F("auth", auth))
7677
client := codersdk.New(coderURL)
7778

7879
if pprofEnabled {
@@ -138,6 +139,7 @@ func workspaceAgent() *cobra.Command {
138139
}
139140

140141
if exchangeToken != nil {
142+
logger.Info(cmd.Context(), "exchanging identity token")
141143
// Agent's can start before resources are returned from the provisioner
142144
// daemon. If there are many resources being provisioned, this time
143145
// could be significant. This is arbitrarily set at an hour to prevent

‎cli/configssh.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ func configSSH() *cobra.Command {
156156
Command: "coder config-ssh --dry-run",
157157
},
158158
),
159-
RunE: func(cmd *cobra.Command, args []string) error {
159+
Args: cobra.ExactArgs(0),
160+
RunE: func(cmd *cobra.Command, _ []string) error {
160161
client, err := createClient(cmd)
161162
if err != nil {
162163
return err

0 commit comments

Comments
 (0)