Skip to content

Commit 5ca11b0

Browse files
committed
fmt and typos
1 parent 34b2ed6 commit 5ca11b0

File tree

19 files changed

+132
-80
lines changed

19 files changed

+132
-80
lines changed

.github/workflows/typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ pn = "pn"
2222
EDE = "EDE"
2323
# HELO is an SMTP command
2424
HELO = "HELO"
25+
LKE = "LKE"
2526

2627
[files]
2728
extend-exclude = [

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -632,15 +632,7 @@ coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/mai
632632
codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
633633
go run scripts/rbacgen/main.go codersdk > codersdk/rbacresources_gen.go
634634

635-
<<<<<<< HEAD
636-
site/src/api/rbacresources_gen.ts: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
637-
go run scripts/rbacgen/main.go typescript > site/src/api/rbacresources_gen.ts
638-
639-
640-
docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
641-
=======
642635
docs/admin/integrations/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
643-
>>>>>>> 0e1703387 (modify prometheus location)
644636
go run scripts/metricsdocgen/main.go
645637
./scripts/pnpm_install.sh
646638
pnpm exec prettier --write ./docs/admin/integrations/prometheus.md

docs/admin/integrations/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can host your deployment on almost any infrastructure. To learn how, read ou
99

1010
The following resources may help as you're deploying Coder.
1111

12-
- [Deploy workpsaces on multiple Kubernetes Clusters](./multiple-kube-clusters.md)
12+
- [Deploy workspaces on multiple Kubernetes Clusters](./multiple-kube-clusters.md)
1313
- [Get workspace build logs from Kubernetes](./kubernetes-logs.md)
1414
- [Track deployment metrics with Prometheus](./prometheus.md)
1515
- [Coder packages: one-click install on cloud providers](https://github.com/coder/packages)

docs/admin/integrations/multiple-kube-clusters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ If you deployed Coder on a VM, copy the kubeconfig file to
5858

5959
You can start from our
6060
[example template](https://github.com/coder/coder/tree/main/examples/templates/kubernetes).
61-
From there, add [template parameters](../../templates/concepts/parameters.md) to allow
62-
developers to pick their desired cluster.
61+
From there, add [template parameters](../../templates/concepts/parameters.md) to
62+
allow developers to pick their desired cluster.
6363

6464
```hcl
6565
# main.tf

docs/admin/integrations/opentofu.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,22 @@
22

33
<!-- Keeping this in as a placeholder for supporting OpenTofu. We should fix support for custom terraform binaries ASAP. -->
44

5-
> ⚠️ This guide is a work in progress. We do not officially support using custom Terraform binaries in your Coder deployment. To track progress on the work, see this related [Github Issue](https://github.com/coder/coder/issues/12009).
6-
7-
Coder deployments support any custom Terraform binary, including [OpenTofu](https://opentofu.org/docs/) - an open source alternative to Terraform.
8-
9-
> You can read more about OpenTofu and Hashicorp's licensing in our [blog post](https://coder.com/blog/hashicorp-license) on the Terraform licensing changes.
5+
> ⚠️ This guide is a work in progress. We do not officially support using custom
6+
> Terraform binaries in your Coder deployment. To track progress on the work,
7+
> see this related [Github Issue](https://github.com/coder/coder/issues/12009).
108
9+
Coder deployments support any custom Terraform binary, including
10+
[OpenTofu](https://opentofu.org/docs/) - an open source alternative to
11+
Terraform.
1112

13+
> You can read more about OpenTofu and Hashicorp's licensing in our
14+
> [blog post](https://coder.com/blog/hashicorp-license) on the Terraform
15+
> licensing changes.
1216
1317
## Using a custom Terraform binary
1418

15-
You can change your deployment custom Terraform binary as long as it is in `PATH` and is within the [supported versions](https://github.com/coder/coder/blob/f57ce97b5aadd825ddb9a9a129bb823a3725252b/provisioner/terraform/install.go#L22-L25). The hardcoded version check ensures compatibility with our [example templates](https://github.com/coder/coder/tree/main/examples/templates).
16-
17-
19+
You can change your deployment custom Terraform binary as long as it is in
20+
`PATH` and is within the
21+
[supported versions](https://github.com/coder/coder/blob/f57ce97b5aadd825ddb9a9a129bb823a3725252b/provisioner/terraform/install.go#L22-L25).
22+
The hardcoded version check ensures compatibility with our
23+
[example templates](https://github.com/coder/coder/tree/main/examples/templates).

docs/admin/integrations/vault.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Integrating HashiCorp Vault with Coder
32

43
<div>

docs/admin/monitoring/health-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Coder includes an operator-friendly deployment health page that provides a
44
number of details about the health of your Coder deployment.
55

6-
![Health check in Coder Dashbord](../../images/admin/monitoring/health-check.png)
6+
![Health check in Coder Dashboard](../../images/admin/monitoring/health-check.png)
77

88
You can view it at `https://${CODER_URL}/health`, or you can alternatively view
99
the [JSON response directly](../api/debug.md#debug-info-deployment-health).

docs/admin/security/secrets.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Secrets
32

43
<blockquote class="info">

docs/admin/templates/extending-templates/README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<!-- TODO: Review structure and links -->
44

5-
There are a variety of Coder-native features to extend the configuration of your development environments. Many of the following features are defined in your templates using the [Coder Terraform provider](https://registry.terraform.io/providers/coder/coder/latest/docs). The provider docs will provide code examples for usage; alternatively, you can view our [example templates](https://github.com/coder/coder/tree/main/examples/templates) to get started.
5+
There are a variety of Coder-native features to extend the configuration of your development environments. Many of the following features are defined in your templates using the [Coder Terraform provider](https://registry.terraform.io/providers/coder/coder/latest/docs). The provider docs will provide code examples for usage; alternatively, you can view our [example templates](https://github.com/coder/coder/tree/main/examples/templates) to get started.
66

77
## Workspace agents
88

9-
For users to connect to a workspace, the template must include a [`coder_agent`](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/agent). The associated agent will facilitate [workspace connections](../../../user-guides/workspace-access/README.md) via SSH, port forwarding, and IDEs. The agent may also display real-time [workspace metadata](./agent-metadata.md) like resource usage.
9+
For users to connect to a workspace, the template must include a [`coder_agent`](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/agent). The associated agent will facilitate [workspace connections](../../../user-guides/workspace-access/README.md) via SSH, port forwarding, and IDEs. The agent may also display real-time [workspace metadata](./agent-metadata.md) like resource usage.
1010

1111
```hcl
1212
resource "coder_agent" "dev" {
@@ -21,23 +21,22 @@ resource "coder_agent" "dev" {
2121

2222
You can also leverage [resource metadata](./resource-metadata.md) to display static resource information from your template.
2323

24-
Templates must include some computational resource to start the agent. All processes on the workspace are then spawned from the agent. It also provides all information displayed in the dashboard's workspace view.
24+
Templates must include some computational resource to start the agent. All processes on the workspace are then spawned from the agent. It also provides all information displayed in the dashboard's workspace view.
2525

2626
![A healthy workspace agent](../../../images/templates/healthy-workspace-agent.png)
2727

28-
Multiple agents may be used in a single template or even a single resource. Each agent may have it's own apps, startup script, and metadata. This can be used to associate multiple containers or VMs with a workspace.
28+
Multiple agents may be used in a single template or even a single resource. Each agent may have it's own apps, startup script, and metadata. This can be used to associate multiple containers or VMs with a workspace.
2929

3030
## Resource persistence
3131

3232
The resources you define in a template may be _ephemeral_ or _persistent_. Persistent resources stay provisioned when workspaces are stopped, where as ephemeral resources are destroyed and recreated on restart. All resources are destroyed when a workspace is deleted.
3333

34-
> You can read more about how resource behavior and workspace state in the [workspace lifecycle documentation](../../workspaces/lifecycle.md).
34+
> You can read more about how resource behavior and workspace state in the [workspace lifecycle documentation](../../workspaces/lifecycle.md).
3535
3636
Template resources follow the [behavior of Terraform resources](https://developer.hashicorp.com/terraform/language/resources/behavior#how-terraform-applies-a-configuration) and can be further configured  using the [lifecycle argument](https://developer.hashicorp.com/terraform/language/meta-arguments/lifecycle).
3737

3838
A common configuration is a template whose only persistent resource is the home directory. This allows the developer to retain their work while ensuring the rest of their environment is consistently up-to-date on each workspace restart.
3939

40-
4140
## Coder apps
4241

4342
Additional IDEs, documentation, or services can be associated to your workspace using the [`coder_app`](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/app) resource.
@@ -46,7 +45,7 @@ Additional IDEs, documentation, or services can be associated to your workspace
4645

4746
Note that some apps are associated to the agent by default as [`display_apps`](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/agent#nested-schema-for-display_apps) and can be hidden directly in the [`coder_agent`](https://registry.terraform.io/providers/coder/coder/latest/docs/resources/agent) resource. You can arrange the display orientation of Coder apps in your template using [resource ordering](./resource-ordering.md).
4847

49-
Check out our [module registry](https://registry.coder.com/modules) for additional Coder apps from the team and our OSS community.
48+
Check out our [module registry](https://registry.coder.com/modules) for additional Coder apps from the team and our OSS community.
5049

5150
<children>
5251

docs/admin/templates/extending-templates/agent-metadata.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ All of these examples use
1515
for the script declaration. With heredoc strings, you can script without messy
1616
escape codes, just as if you were working in your terminal.
1717

18-
Some of the examples use the [`coder stat`](../../../reference/cli/stat.md) command. This is
19-
useful for determining CPU and memory usage of the VM or container that the
20-
workspace is running in, which is more accurate than resource usage about the
21-
workspace's host.
18+
Some of the examples use the [`coder stat`](../../../reference/cli/stat.md)
19+
command. This is useful for determining CPU and memory usage of the VM or
20+
container that the workspace is running in, which is more accurate than resource
21+
usage about the workspace's host.
2222

2323
Here's a standard set of metadata snippets for Linux agents:
2424

docs/admin/templates/managing-templates.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ infrastructure, software, or security patches. Learn more about
6060

6161
### Template update policies (enterprise)
6262

63-
Enterprise template admins may want workspaces to always remain on the latest version of their parent template. To do so, enable **Template Update Policies** in the template's general settings. All non-admin users of the template will be forced to update their workspaces before starting them once the setting is applied. Workspaces which leverage autostart or start-on-connect will be automatically updated on the next startup.
63+
Enterprise template admins may want workspaces to always remain on the latest
64+
version of their parent template. To do so, enable **Template Update Policies**
65+
in the template's general settings. All non-admin users of the template will be
66+
forced to update their workspaces before starting them once the setting is
67+
applied. Workspaces which leverage autostart or start-on-connect will be
68+
automatically updated on the next startup.
6469

6570
![Template update policies](../../images/templates/update-policies.png)
6671

docs/admin/users/organizations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ Organizations are a logical bucket of users with unique administrators,
99
templates, provisioners, and workspaces into the Coder platform.
1010

1111
## Organizations vs Groups
12+
1213
TODO

docs/admin/workspaces/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Administering workspaces
22

3-
<!--
3+
<!--
44
Layout of admin/workspaces/
55
66
README.md
@@ -37,7 +37,6 @@ The following filters are supported:
3737
statuses, see
3838
[WorkspaceStatus documentation](https://pkg.go.dev/github.com/coder/coder/codersdk#WorkspaceStatus).
3939

40-
4140
## Updating workspaces
4241

4342
After updating the default version of the template that a workspace was created
@@ -56,6 +55,7 @@ Update a workspace through the command line:
5655
```shell
5756
coder update <workspace-name>
5857
```
58+
5959
### Automatic updates
6060

6161
It can be tedious to manually update a workspace every time an update is pushed
@@ -72,7 +72,6 @@ manually updated the workspace.
7272

7373
Template admins can require workspaces be on the latest version before starting. When this is enabled, you will be presented with an "Update and Start" button in the UI. Workspaces that start on connect will automatically update on the first out-of-date connection.
7474

75-
7675
<!-- TODO: Link force update policies -->
7776

7877
## Bulk operations (enterprise)

0 commit comments

Comments
 (0)