Rename default agent to "main" instead of "dev" (#3150)

ammario · web-flow · commit f28d14197a12 · 2022-07-23T20:26:56.000Z
Resolves #3143
diff --git a/docs/dotfiles.md b/docs/dotfiles.md
@@ -22,7 +22,7 @@ variable "dotfiles_uri" {
   default = ""
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   ...
   startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null
 }
@@ -41,7 +41,7 @@ In such cases:
 - Set the `startup_script` to call a `~/personalize` script that the user can edit
 
 ```hcl
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   ...
   startup_script = "/home/coder/personalize"
 }
diff --git a/docs/ides/configuring-web-ides.md b/docs/ides/configuring-web-ides.md
@@ -38,7 +38,7 @@ vim main.tf
 ```
 
 ```hcl
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
     arch          = "amd64"
     os            = "linux"
     startup_script = <<EOF
@@ -80,7 +80,6 @@ resource "coder_app" "code-server" {
 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.
 </blockquote>
 
-
 ## VNC Desktop
 
 ![VNC Desktop in Coder](../images/vnc-desktop.png)
@@ -116,7 +115,6 @@ Workspace requirements:
 - JetBrains projector CLI
 - At least 4 CPU cores and 4 GB RAM
 
-
 - CLion
 - pyCharm
 - DataGrip
@@ -130,13 +128,10 @@ Workspace requirements:
 - WebStorm
 - ➕ code-server (just in case!)
 
-
 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.
 
-
 ![IntelliJ in Coder](../images/projector-intellij.png)
 
-
 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.
 
 > 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" {
 }
 ```
 
-
 **Pre-built templates:**
 
 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
 
 > 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.
 
-
-
 ## JupyterLab
 
 Configure your agent and `coder_app` like so to use Jupyter:
diff --git a/docs/secrets.md b/docs/secrets.md
@@ -42,7 +42,7 @@ resource "twilio_iam_api_key" "api_key" {
   friendly_name = "Test API Key"
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   # ...
   env = {
     # Let users access the secret via $TWILIO_API_SECRET
diff --git a/docs/templates.md b/docs/templates.md
@@ -217,7 +217,7 @@ sets a few environment variables based on the username and email address of the
 that you can make Git commits immediately without any manual configuration:
 
 ```tf
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   # ...
   env = {
     GIT_AUTHOR_NAME = "${data.coder_workspace.me.owner}"
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -23,7 +23,7 @@ provider "coder" {
 data "coder_workspace" "me" {
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   arch           = "amd64"
   os             = "linux"
   startup_script = <<EOF
diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
@@ -72,7 +72,7 @@ data "aws_ami" "ubuntu" {
   owners = ["099720109477"] # Canonical
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   arch = "amd64"
   auth = "aws-instance-identity"
   os   = "linux"
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
@@ -69,7 +69,7 @@ data "aws_ami" "windows" {
   }
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   arch = "amd64"
   auth = "aws-instance-identity"
   os   = "windows"
diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
@@ -93,7 +93,7 @@ provider "digitalocean" {
 
 data "coder_workspace" "me" {}
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
 }
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
@@ -35,7 +35,7 @@ provider "docker" {
 data "coder_workspace" "me" {
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   arch           = var.docker_arch
   os             = "linux"
   startup_script = "code-server --auth none"
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
@@ -60,7 +60,7 @@ provider "coder" {
 data "coder_workspace" "me" {
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   arch = var.step2_arch
   os   = "linux"
 }
diff --git a/examples/templates/docker-with-dotfiles/README.md b/examples/templates/docker-with-dotfiles/README.md
@@ -1,6 +1,6 @@
 ---
 name: Develop in Docker with a dotfiles URL
-description: Run workspaces on a Docker host using registry images 
+description: Run workspaces on a Docker host using registry images
 tags: [local, docker]
 ---
 
@@ -10,7 +10,7 @@ This is an example for deploying workspaces with a prompt for the users' dotfile
 
 ## Getting started
 
-Run `coder templates init` and select this template. Follow the instructions that appear. 
+Run `coder templates init` and select this template. Follow the instructions that appear.
 
 ## How it works
 
@@ -27,7 +27,7 @@ variable "dotfiles_uri" {
   default = ""
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   ...
   startup_script = var.dotfiles_uri != "" ? "/tmp/tmp.coder*/coder dotfiles -y ${var.dotfiles_uri}" : null
 }
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
@@ -37,7 +37,7 @@ variable "dotfiles_uri" {
   default     = ""
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   arch           = "amd64"
   os             = "linux"
   startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -65,7 +65,7 @@ provider "coder" {
 data "coder_workspace" "me" {
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   arch           = var.step2_arch
   os             = "linux"
   startup_script = <<EOF
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
@@ -45,7 +45,7 @@ resource "google_compute_disk" "root" {
   }
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   auth = "google-instance-identity"
   arch = "amd64"
   os   = "linux"
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
@@ -35,7 +35,7 @@ data "google_compute_default_service_account" "default" {
 data "coder_workspace" "me" {
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   auth = "google-instance-identity"
   arch = "amd64"
   os   = "linux"
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
@@ -45,7 +45,7 @@ resource "google_compute_disk" "root" {
   }
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   auth = "google-instance-identity"
   arch = "amd64"
   os   = "windows"
diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tf b/provisioner/terraform/testdata/calling-module/calling-module.tf
@@ -7,7 +7,7 @@ terraform {
   }
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
 }
diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf
@@ -7,7 +7,7 @@ terraform {
   }
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
 }
diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf
@@ -7,7 +7,7 @@ terraform {
   }
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
 }
diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tf b/provisioner/terraform/testdata/instance-id/instance-id.tf
@@ -7,7 +7,7 @@ terraform {
   }
 }
 
-resource "coder_agent" "dev" {
+resource "coder_agent" "main" {
   os   = "linux"
   arch = "amd64"
   auth = "google-instance-identity"

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ variable "dotfiles_uri" {`
`22`	`22`	`default = ""`
`23`	`23`	`}`
`24`	`24`
`25`		`-resource "coder_agent" "dev" {`
	`25`	`+resource "coder_agent" "main" {`
`26`	`26`	`...`
`27`	`27`	`startup_script = var.dotfiles_uri != "" ? "coder dotfiles -y ${var.dotfiles_uri}" : null`
`28`	`28`	`}`
`@@ -41,7 +41,7 @@ In such cases:`
`41`	`41`	- Set the `startup_script` to call a `~/personalize` script that the user can edit
`42`	`42`
`43`	`43`	```hcl
`44`		`-resource "coder_agent" "dev" {`
	`44`	`+resource "coder_agent" "main" {`
`45`	`45`	`...`
`46`	`46`	`startup_script = "/home/coder/personalize"`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ resource "twilio_iam_api_key" "api_key" {`
`42`	`42`	`friendly_name = "Test API Key"`
`43`	`43`	`}`
`44`	`44`
`45`		`-resource "coder_agent" "dev" {`
	`45`	`+resource "coder_agent" "main" {`
`46`	`46`	`# ...`
`47`	`47`	`env = {`
`48`	`48`	`# Let users access the secret via $TWILIO_API_SECRET`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ provider "coder" {`
`23`	`23`	`data "coder_workspace" "me" {`
`24`	`24`	`}`
`25`	`25`
`26`		`-resource "coder_agent" "dev" {`
	`26`	`+resource "coder_agent" "main" {`
`27`	`27`	`arch = "amd64"`
`28`	`28`	`os = "linux"`
`29`	`29`	`startup_script = <<EOF`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ data "aws_ami" "ubuntu" {`
`72`	`72`	`owners = ["099720109477"] # Canonical`
`73`	`73`	`}`
`74`	`74`
`75`		`-resource "coder_agent" "dev" {`
	`75`	`+resource "coder_agent" "main" {`
`76`	`76`	`arch = "amd64"`
`77`	`77`	`auth = "aws-instance-identity"`
`78`	`78`	`os = "linux"`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ data "aws_ami" "windows" {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-resource "coder_agent" "dev" {`
	`72`	`+resource "coder_agent" "main" {`
`73`	`73`	`arch = "amd64"`
`74`	`74`	`auth = "aws-instance-identity"`
`75`	`75`	`os = "windows"`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ provider "digitalocean" {`
`93`	`93`
`94`	`94`	`data "coder_workspace" "me" {}`
`95`	`95`
`96`		`-resource "coder_agent" "dev" {`
	`96`	`+resource "coder_agent" "main" {`
`97`	`97`	`os = "linux"`
`98`	`98`	`arch = "amd64"`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ provider "docker" {`
`35`	`35`	`data "coder_workspace" "me" {`
`36`	`36`	`}`
`37`	`37`
`38`		`-resource "coder_agent" "dev" {`
	`38`	`+resource "coder_agent" "main" {`
`39`	`39`	`arch = var.docker_arch`
`40`	`40`	`os = "linux"`
`41`	`41`	`startup_script = "code-server --auth none"`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ provider "coder" {`
`60`	`60`	`data "coder_workspace" "me" {`
`61`	`61`	`}`
`62`	`62`
`63`		`-resource "coder_agent" "dev" {`
	`63`	`+resource "coder_agent" "main" {`
`64`	`64`	`arch = var.step2_arch`
`65`	`65`	`os = "linux"`
`66`	`66`	`}`