feat: add healthcheck parameters to coder_app (#52)

f0ssel · web-flow · commit 4d7165afb1f2 · 2022-09-22T11:52:41.000-04:00
diff --git a/docs/resources/app.md b/docs/resources/app.md
@@ -26,11 +26,16 @@ EOF
 }
 
 resource "coder_app" "code-server" {
-  agent_id          = coder_agent.dev.id
-  name              = "VS Code"
-  icon              = data.coder_workspace.me.access_url + "/icons/vscode.svg"
-  url               = "http://localhost:13337"
-  relative_path     = true
+  agent_id      = coder_agent.dev.id
+  name          = "VS Code"
+  icon          = data.coder_workspace.me.access_url + "/icons/vscode.svg"
+  url           = "http://localhost:13337"
+  relative_path = true
+  healthcheck {
+    url       = "http://localhost:13337/healthz"
+    interval  = 5
+    threshold = 6
+  }
 }
 
 resource "coder_app" "vim" {
@@ -58,6 +63,7 @@ resource "coder_app" "intellij" {
 ### Optional
 
 - `command` (String) A command to run in a terminal opening this app. In the web, this will open in a new tab. In the CLI, this will SSH and execute the command. Either "command" or "url" may be specified, but not both.
+- `healthcheck` (Block Set) HTTP health checking to determine the application readiness. (see [below for nested schema](#nestedblock--healthcheck))
 - `icon` (String) A URL to an icon that will display in the dashboard. View built-in icons here: https://github.com/coder/coder/tree/main/site/static/icons. Use a built-in icon with `data.coder_workspace.me.access_url + "/icons/<path>"`.
 - `name` (String) A display name to identify the app.
 - `relative_path` (Boolean) Specifies whether the URL will be accessed via a relative path or wildcard. Use if wildcard routing is unavailable.
@@ -67,4 +73,13 @@ resource "coder_app" "intellij" {
 
 - `id` (String) The ID of this resource.
 
+<a id="nestedblock--healthcheck"></a>
+### Nested Schema for `healthcheck`
+
+Required:
+
+- `interval` (Number) Duration in seconds to wait between healthcheck requests.
+- `threshold` (Number) Number of consecutive heathcheck failures before returning an unhealthy status.
+- `url` (String) HTTP address used determine the application readiness. A successful health check is a HTTP response code less than 500 returned before healthcheck.interval seconds.
+
 
diff --git a/docs/resources/metadata.md b/docs/resources/metadata.md
@@ -21,25 +21,25 @@ resource "kubernetes_pod" "dev" {
 }
 
 resource "tls_private_key" "example_key_pair" {
-  algorithm = "ECDSA"
+  algorithm   = "ECDSA"
   ecdsa_curve = "P256"
 }
 
 resource "coder_metadata" "pod_info" {
-  count = data.coder_workspace.me.start_count
+  count       = data.coder_workspace.me.start_count
   resource_id = kubernetes_pod.dev[0].id
   item {
-    key = "description"
+    key   = "description"
     value = "This description will show up in the Coder dashboard."
   }
   item {
-    key = "pod_uid"
+    key   = "pod_uid"
     value = kubernetes_pod.dev[0].uid
   }
   item {
-    key = "public_key"
+    key   = "public_key"
     value = tls_private_key.example_key_pair.public_key_openssh
-     # The value of this item will be hidden from view by default
+    # The value of this item will be hidden from view by default
     sensitive = true
   }
 }
diff --git a/examples/resources/coder_app/resource.tf b/examples/resources/coder_app/resource.tf
@@ -11,11 +11,16 @@ EOF
 }
 
 resource "coder_app" "code-server" {
-  agent_id          = coder_agent.dev.id
-  name              = "VS Code"
-  icon              = data.coder_workspace.me.access_url + "/icons/vscode.svg"
-  url               = "http://localhost:13337"
-  relative_path     = true
+  agent_id      = coder_agent.dev.id
+  name          = "VS Code"
+  icon          = data.coder_workspace.me.access_url + "/icons/vscode.svg"
+  url           = "http://localhost:13337"
+  relative_path = true
+  healthcheck {
+    url       = "http://localhost:13337/healthz"
+    interval  = 5
+    threshold = 6
+  }
 }
 
 resource "coder_app" "vim" {
diff --git a/examples/resources/coder_metadata/resource.tf b/examples/resources/coder_metadata/resource.tf
@@ -6,25 +6,25 @@ resource "kubernetes_pod" "dev" {
 }
 
 resource "tls_private_key" "example_key_pair" {
-  algorithm = "ECDSA"
+  algorithm   = "ECDSA"
   ecdsa_curve = "P256"
 }
 
 resource "coder_metadata" "pod_info" {
-  count = data.coder_workspace.me.start_count
+  count       = data.coder_workspace.me.start_count
   resource_id = kubernetes_pod.dev[0].id
   item {
-    key = "description"
+    key   = "description"
     value = "This description will show up in the Coder dashboard."
   }
   item {
-    key = "pod_uid"
+    key   = "pod_uid"
     value = kubernetes_pod.dev[0].uid
   }
   item {
-    key = "public_key"
+    key   = "public_key"
     value = tls_private_key.example_key_pair.public_key_openssh
-     # The value of this item will be hidden from view by default
+    # The value of this item will be hidden from view by default
     sensitive = true
   }
 }
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -373,6 +373,35 @@ func New() *schema.Provider {
 						Optional:      true,
 						ConflictsWith: []string{"command"},
 					},
+					"healthcheck": {
+						Type:          schema.TypeSet,
+						Description:   "HTTP health checking to determine the application readiness.",
+						ForceNew:      true,
+						Optional:      true,
+						ConflictsWith: []string{"command"},
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"url": {
+									Type:        schema.TypeString,
+									Description: "HTTP address used determine the application readiness. A successful health check is a HTTP response code less than 500 returned before healthcheck.interval seconds.",
+									ForceNew:    true,
+									Required:    true,
+								},
+								"interval": {
+									Type:        schema.TypeInt,
+									Description: "Duration in seconds to wait between healthcheck requests.",
+									ForceNew:    true,
+									Required:    true,
+								},
+								"threshold": {
+									Type:        schema.TypeInt,
+									Description: "Number of consecutive heathcheck failures before returning an unhealthy status.",
+									ForceNew:    true,
+									Required:    true,
+								},
+							},
+						},
+					},
 				},
 			},
 			"coder_metadata": {
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
@@ -221,6 +221,11 @@ func TestApp(t *testing.T) {
 					icon = "builtin:vim"
 					relative_path = true
 					url = "http://localhost:13337"
+					healthcheck {
+						url = "http://localhost:13337/healthz"
+						interval = 5
+						threshold = 6
+					}
 				}
 				`,
 			Check: func(state *terraform.State) error {

Original file line number	Diff line number	Diff line change
`@@ -21,25 +21,25 @@ resource "kubernetes_pod" "dev" {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`resource "tls_private_key" "example_key_pair" {`
`24`		`- algorithm = "ECDSA"`
	`24`	`+ algorithm = "ECDSA"`
`25`	`25`	`ecdsa_curve = "P256"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`resource "coder_metadata" "pod_info" {`
`29`		`- count = data.coder_workspace.me.start_count`
	`29`	`+ count = data.coder_workspace.me.start_count`
`30`	`30`	`resource_id = kubernetes_pod.dev[0].id`
`31`	`31`	`item {`
`32`		`- key = "description"`
	`32`	`+ key = "description"`
`33`	`33`	`value = "This description will show up in the Coder dashboard."`
`34`	`34`	`}`
`35`	`35`	`item {`
`36`		`- key = "pod_uid"`
	`36`	`+ key = "pod_uid"`
`37`	`37`	`value = kubernetes_pod.dev[0].uid`
`38`	`38`	`}`
`39`	`39`	`item {`
`40`		`- key = "public_key"`
	`40`	`+ key = "public_key"`
`41`	`41`	`value = tls_private_key.example_key_pair.public_key_openssh`
`42`		`- # The value of this item will be hidden from view by default`
	`42`	`+ # The value of this item will be hidden from view by default`
`43`	`43`	`sensitive = true`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,25 +6,25 @@ resource "kubernetes_pod" "dev" {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`resource "tls_private_key" "example_key_pair" {`
`9`		`- algorithm = "ECDSA"`
	`9`	`+ algorithm = "ECDSA"`
`10`	`10`	`ecdsa_curve = "P256"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`resource "coder_metadata" "pod_info" {`
`14`		`- count = data.coder_workspace.me.start_count`
	`14`	`+ count = data.coder_workspace.me.start_count`
`15`	`15`	`resource_id = kubernetes_pod.dev[0].id`
`16`	`16`	`item {`
`17`		`- key = "description"`
	`17`	`+ key = "description"`
`18`	`18`	`value = "This description will show up in the Coder dashboard."`
`19`	`19`	`}`
`20`	`20`	`item {`
`21`		`- key = "pod_uid"`
	`21`	`+ key = "pod_uid"`
`22`	`22`	`value = kubernetes_pod.dev[0].uid`
`23`	`23`	`}`
`24`	`24`	`item {`
`25`		`- key = "public_key"`
	`25`	`+ key = "public_key"`
`26`	`26`	`value = tls_private_key.example_key_pair.public_key_openssh`
`27`		`- # The value of this item will be hidden from view by default`
	`27`	`+ # The value of this item will be hidden from view by default`
`28`	`28`	`sensitive = true`
`29`	`29`	`}`
`30`	`30`	`}`