Skip to content

Commit f28d141

Browse files
ammarioammario
authored
Rename default agent to "main" instead of "dev" (#3150)
Resolves #3143
1 parent 257e52e commit f28d141

File tree

20 files changed

+23
-31
lines changed

20 files changed

+23
-31
lines changed

‎docs/dotfiles.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ variable "dotfiles_uri" {
2222
default = ""
2323
}
2424
25-
resource "coder_agent" "dev" {
25+
resource "coder_agent" "main" {
2626
...
2727
startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null
2828
}
@@ -41,7 +41,7 @@ In such cases:
4141
- Set the `startup_script` to call a `~/personalize` script that the user can edit
4242

4343
```hcl
44-
resource "coder_agent" "dev" {
44+
resource "coder_agent" "main" {
4545
...
4646
startup_script = "/home/coder/personalize"
4747
}

‎docs/ides/configuring-web-ides.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ vim main.tf
3838
```
3939

4040
```hcl
41-
resource "coder_agent" "dev" {
41+
resource "coder_agent" "main" {
4242
arch = "amd64"
4343
os = "linux"
4444
startup_script = <<EOF
@@ -80,7 +80,6 @@ resource "coder_app" "code-server" {
8080
If the code-server integrated terminal fails to load, (i.e., xterm fails to load), go to DevTools to ensure xterm is loaded, clear your browser cache and refresh.
8181
</blockquote>
8282

83-
8483
## VNC Desktop
8584

8685
![VNC Desktop in Coder](../images/vnc-desktop.png)
@@ -116,7 +115,6 @@ Workspace requirements:
116115
- JetBrains projector CLI
117116
- At least 4 CPU cores and 4 GB RAM
118117

119-
120118
- CLion
121119
- pyCharm
122120
- DataGrip
@@ -130,13 +128,10 @@ Workspace requirements:
130128
- WebStorm
131129
- ➕ code-server (just in case!)
132130

133-
134131
For advanced users who want to make a custom image, you can install the Projector CLI in the `startup_script` of the `coder_agent` resource in a Coder template. Using the Projector CLI, you can use `projector ide autoinstall` and `projector run` to download and start a JetBrains IDE in your workspace.
135132

136-
137133
![IntelliJ in Coder](../images/projector-intellij.png)
138134

139-
140135
In this example, the version of JetBrains IntelliJ IDE is passed in from a Terraform input variable. You create a JetBrains icon in the workspace using a `coder_app` resource.
141136

142137
> There is a known issue passing query string parameters when opening a JetBrains IDE from an icon in your workspace ([#2669](https://github.com/coder/coder/issues/2669)). Note the `grep` statement to remove an optional password token from the configuration so a query string parameter is not passed.
@@ -205,7 +200,6 @@ resource "coder_app" "intellij" {
205200
}
206201
```
207202

208-
209203
**Pre-built templates:**
210204

211205
You can also reference/use to these pre-built templates with JetBrains projector:
@@ -224,8 +218,6 @@ You can also reference/use to these pre-built templates with JetBrains projector
224218
225219
> Coder OSS currently does not perform a health check([#2662](https://github.com/coder/coder/issues/2662)) that any IDE or commands in the `startup_script` have completed, so wait a minute or so before opening the JetBrains or code-server icons. As a precaution, you can open Terminal and run `htop` to see if the processes have completed.
226220
227-
228-
229221
## JupyterLab
230222

231223
Configure your agent and `coder_app` like so to use Jupyter:

‎docs/secrets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ resource "twilio_iam_api_key" "api_key" {
4242
friendly_name = "Test API Key"
4343
}
4444
45-
resource "coder_agent" "dev" {
45+
resource "coder_agent" "main" {
4646
# ...
4747
env = {
4848
# Let users access the secret via $TWILIO_API_SECRET

‎docs/templates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ sets a few environment variables based on the username and email address of the
217217
that you can make Git commits immediately without any manual configuration:
218218

219219
```tf
220-
resource "coder_agent" "dev" {
220+
resource "coder_agent" "main" {
221221
# ...
222222
env = {
223223
GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"

‎dogfood/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ provider "coder" {
2323
data "coder_workspace" "me" {
2424
}
2525

26-
resource "coder_agent" "dev" {
26+
resource "coder_agent" "main" {
2727
arch = "amd64"
2828
os = "linux"
2929
startup_script = <<EOF

‎examples/templates/aws-linux/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ data "aws_ami" "ubuntu" {
7272
owners = ["099720109477"] # Canonical
7373
}
7474

75-
resource "coder_agent" "dev" {
75+
resource "coder_agent" "main" {
7676
arch = "amd64"
7777
auth = "aws-instance-identity"
7878
os = "linux"

‎examples/templates/aws-windows/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ data "aws_ami" "windows" {
6969
}
7070
}
7171

72-
resource "coder_agent" "dev" {
72+
resource "coder_agent" "main" {
7373
arch = "amd64"
7474
auth = "aws-instance-identity"
7575
os = "windows"

‎examples/templates/do-linux/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ provider "digitalocean" {
9393

9494
data "coder_workspace" "me" {}
9595

96-
resource "coder_agent" "dev" {
96+
resource "coder_agent" "main" {
9797
os = "linux"
9898
arch = "amd64"
9999
}

‎examples/templates/docker-code-server/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ provider "docker" {
3535
data "coder_workspace" "me" {
3636
}
3737

38-
resource "coder_agent" "dev" {
38+
resource "coder_agent" "main" {
3939
arch = var.docker_arch
4040
os = "linux"
4141
startup_script = "code-server --auth none"

‎examples/templates/docker-image-builds/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ provider "coder" {
6060
data "coder_workspace" "me" {
6161
}
6262

63-
resource "coder_agent" "dev" {
63+
resource "coder_agent" "main" {
6464
arch = var.step2_arch
6565
os = "linux"
6666
}

‎examples/templates/docker-with-dotfiles/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Develop in Docker with a dotfiles URL
3-
description: Run workspaces on a Docker host using registry images
3+
description: Run workspaces on a Docker host using registry images
44
tags: [local, docker]
55
---
66

@@ -10,7 +10,7 @@ This is an example for deploying workspaces with a prompt for the users' dotfile
1010

1111
## Getting started
1212

13-
Run `coder templates init` and select this template. Follow the instructions that appear.
13+
Run `coder templates init` and select this template. Follow the instructions that appear.
1414

1515
## How it works
1616

@@ -27,7 +27,7 @@ variable "dotfiles_uri" {
2727
default = ""
2828
}
2929
30-
resource "coder_agent" "dev" {
30+
resource "coder_agent" "main" {
3131
...
3232
startup_script = var.dotfiles_uri != "" ? "/tmp/tmp.coder*/coder dotfiles -y ${var.dotfiles_uri}" : null
3333
}

‎examples/templates/docker-with-dotfiles/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ variable "dotfiles_uri" {
3737
default = ""
3838
}
3939

40-
resource "coder_agent" "dev" {
40+
resource "coder_agent" "main" {
4141
arch = "amd64"
4242
os = "linux"
4343
startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null

‎examples/templates/docker/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ provider "coder" {
6565
data "coder_workspace" "me" {
6666
}
6767

68-
resource "coder_agent" "dev" {
68+
resource "coder_agent" "main" {
6969
arch = var.step2_arch
7070
os = "linux"
7171
startup_script = <<EOF

‎examples/templates/gcp-linux/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ resource "google_compute_disk" "root" {
4545
}
4646
}
4747

48-
resource "coder_agent" "dev" {
48+
resource "coder_agent" "main" {
4949
auth = "google-instance-identity"
5050
arch = "amd64"
5151
os = "linux"

‎examples/templates/gcp-vm-container/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data "google_compute_default_service_account" "default" {
3535
data "coder_workspace" "me" {
3636
}
3737

38-
resource "coder_agent" "dev" {
38+
resource "coder_agent" "main" {
3939
auth = "google-instance-identity"
4040
arch = "amd64"
4141
os = "linux"

‎examples/templates/gcp-windows/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ resource "google_compute_disk" "root" {
4545
}
4646
}
4747

48-
resource "coder_agent" "dev" {
48+
resource "coder_agent" "main" {
4949
auth = "google-instance-identity"
5050
arch = "amd64"
5151
os = "windows"

‎provisioner/terraform/testdata/calling-module/calling-module.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
}
88
}
99

10-
resource "coder_agent" "dev" {
10+
resource "coder_agent" "main" {
1111
os = "linux"
1212
arch = "amd64"
1313
}

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
}
88
}
99

10-
resource "coder_agent" "dev" {
10+
resource "coder_agent" "main" {
1111
os = "linux"
1212
arch = "amd64"
1313
}

‎provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
}
88
}
99

10-
resource "coder_agent" "dev" {
10+
resource "coder_agent" "main" {
1111
os = "linux"
1212
arch = "amd64"
1313
}

‎provisioner/terraform/testdata/instance-id/instance-id.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ terraform {
77
}
88
}
99

10-
resource "coder_agent" "dev" {
10+
resource "coder_agent" "main" {
1111
os = "linux"
1212
arch = "amd64"
1313
auth = "google-instance-identity"

0 commit comments

Comments
 (0)