Skip to content

Commit 90c8a07

Browse files
aslilacaslilac
committed
Merge branch 'main' into batch-update
2 parents 3273e75 + 08b4eb3 commit 90c8a07

File tree

78 files changed

+1740
-690
lines changed

Some content is hidden

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

78 files changed

+1740
-690
lines changed

‎.github/fly-wsproxies/paris-coder.toml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ primary_region = "cdg"
1313
CODER_HTTP_ADDRESS = "0.0.0.0:3000"
1414
CODER_PRIMARY_ACCESS_URL = "https://dev.coder.com"
1515
CODER_WILDCARD_ACCESS_URL = "*--apps.paris.fly.dev.coder.com"
16+
CODER_VERBOSE = "true"
1617

1718
[http_service]
1819
internal_port = 3000

‎.github/fly-wsproxies/sao-paulo-coder.toml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ primary_region = "gru"
1313
CODER_HTTP_ADDRESS = "0.0.0.0:3000"
1414
CODER_PRIMARY_ACCESS_URL = "https://dev.coder.com"
1515
CODER_WILDCARD_ACCESS_URL = "*--apps.sao-paulo.fly.dev.coder.com"
16+
CODER_VERBOSE = "true"
1617

1718
[http_service]
1819
internal_port = 3000

‎.github/fly-wsproxies/sydney-coder.toml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ primary_region = "syd"
1313
CODER_HTTP_ADDRESS = "0.0.0.0:3000"
1414
CODER_PRIMARY_ACCESS_URL = "https://dev.coder.com"
1515
CODER_WILDCARD_ACCESS_URL = "*--apps.sydney.fly.dev.coder.com"
16+
CODER_VERBOSE = "true"
1617

1718
[http_service]
1819
internal_port = 3000

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
142142
# Check for any typos
143143
- name: Check for typos
144-
uses: crate-ci/typos@v1.17.0
144+
uses: crate-ci/typos@v1.17.1
145145
with:
146146
config: .github/workflows/typos.toml
147147

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</a>
88

99
<h1>
10-
Self-Hosted Remote Development Environments
10+
Self-Hosted Cloud Development Environments
1111
</h1>
1212

1313
<a href="https://coder.com#gh-light-mode-only">
@@ -31,9 +31,9 @@
3131

3232
</div>
3333

34-
[Coder](https://coder.com) enables organizations to set up development environments in the cloud. Environments are defined with Terraform, connected through a secure high-speed Wireguard® tunnel, and are automatically shut down when not in use to save on costs. Coder gives engineering teams the flexibility to use the cloud for workloads that are most beneficial to them.
34+
[Coder](https://coder.com) enables organizations to set up development environments in their public or private cloud infrastructure. Cloud development environments are defined with Terraform, connected through a secure high-speed Wireguard® tunnel, and are automatically shut down when not in use to save on costs. Coder gives engineering teams the flexibility to use the cloud for workloads that are most beneficial to them.
3535

36-
- Define development environments in Terraform
36+
- Define cloud development environments in Terraform
3737
- EC2 VMs, Kubernetes Pods, Docker Containers, etc.
3838
- Automatically shutdown idle resources to save on costs
3939
- Onboard developers in seconds instead of days
@@ -44,7 +44,7 @@
4444

4545
## Quickstart
4646

47-
The most convenient way to try Coder is to install it on your local machine and experiment with provisioning development environments using Docker (works on Linux, macOS, and Windows).
47+
The most convenient way to try Coder is to install it on your local machine and experiment with provisioning cloud development environments using Docker (works on Linux, macOS, and Windows).
4848

4949
```
5050
# First, install Coder
@@ -100,7 +100,7 @@ Browse our docs [here](https://coder.com/docs/v2) or visit a specific section be
100100

101101
Feel free to [open an issue](https://github.com/coder/coder/issues/new) if you have questions, run into bugs, or have a feature request.
102102

103-
[Join our Discord](https://discord.gg/coder) to provide feedback on in-progress features, and chat with the community using Coder!
103+
[Join our Discord](https://discord.gg/coder) or [Slack](https://cdr.co/join-community) to provide feedback on in-progress features, and chat with the community using Coder!
104104

105105
## Contributing
106106

‎cmd/testidp/main.go

-58
This file was deleted.

‎coderd/apidoc/docs.go

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/coderd.go

+9
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ type Options struct {
184184
// under the enterprise license, and can't be imported into AGPL.
185185
ParseLicenseClaims func(rawJWT string) (email string, trial bool, err error)
186186
AllowWorkspaceRenames bool
187+
188+
// NewTicker is used for unit tests to replace "time.NewTicker".
189+
NewTicker func(duration time.Duration) (tick <-chan time.Time, done func())
187190
}
188191

189192
// @title Coder API
@@ -208,6 +211,12 @@ func New(options *Options) *API {
208211
if options == nil {
209212
options = &Options{}
210213
}
214+
if options.NewTicker == nil {
215+
options.NewTicker = func(duration time.Duration) (tick <-chan time.Time, done func()) {
216+
ticker := time.NewTicker(duration)
217+
return ticker.C, ticker.Stop
218+
}
219+
}
211220

212221
// Safety check: if we're not running a unit test, we *must* have a Prometheus registry.
213222
if options.PrometheusRegistry == nil && flag.Lookup("test.v") == nil {

‎coderd/coderdtest/coderdtest.go

+2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ type Options struct {
145145

146146
WorkspaceAppsStatsCollectorOptions workspaceapps.StatsCollectorOptions
147147
AllowWorkspaceRenames bool
148+
NewTicker func(duration time.Duration) (<-chan time.Time, func())
148149
}
149150

150151
// New constructs a codersdk client connected to an in-memory API instance.
@@ -451,6 +452,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
451452
StatsBatcher: options.StatsBatcher,
452453
WorkspaceAppsStatsCollectorOptions: options.WorkspaceAppsStatsCollectorOptions,
453454
AllowWorkspaceRenames: options.AllowWorkspaceRenames,
455+
NewTicker: options.NewTicker,
454456
}
455457
}
456458

0 commit comments

Comments
 (0)